<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25529">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">phy_link: Introduce bts_model_phy_link_close() and use it in bts-trx<br><br>This step is required while turning off the BTS without killing the<br>process. Right now only osmo-bts-trx supports this feature, so this<br>function is only available and used by osmo-bts-trx.<br>Later on, when the feature is support more generally, we can move call<br>to this function to common place like bts_shutdown_fsm or alike.<br><br>Change-Id: I3253112700a31b85db82dc7ccadec8542bac745e<br>---<br>M doc/manuals/chapters/architecture.adoc<br>M include/osmo-bts/phy_link.h<br>M src/osmo-bts-trx/trx_if.c<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>4 files changed, 24 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/29/25529/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/architecture.adoc b/doc/manuals/chapters/architecture.adoc</span><br><span>index a0e66cd..30eab7a 100644</span><br><span>--- a/doc/manuals/chapters/architecture.adoc</span><br><span>+++ b/doc/manuals/chapters/architecture.adoc</span><br><span>@@ -88,6 +88,7 @@</span><br><span> | common | abis_open() | Start of the A-bis connection to BSC</span><br><span> | common | phy_links_open() | Iterate over list of configured PHY links</span><br><span> | bts-specific | bts_model_phy_link_open() | Open each of the configured PHY links</span><br><span style="color: hsl(120, 100%, 40%);">+| bts-specific | bts_model_phy_link_close() | Close each of the configured PHY links</span><br><span> | common | write_pid_file() | Generate the pid file</span><br><span> | common | osmo_daemonize() | Fork as daemon in background (if configured)</span><br><span> | common | bts_main() | Run main loop until global variable quit >= 2</span><br><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index 78fe6b9..ac38c28 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -174,6 +174,7 @@</span><br><span> }</span><br><span> </span><br><span> int bts_model_phy_link_open(struct phy_link *plink);</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_phy_link_close(struct phy_link *plink);</span><br><span> </span><br><span> #define LOGPPHL(plink, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_link_name(plink), ##args)</span><br><span> #define LOGPPHI(pinst, section, lvl, fmt, args...) LOGP(section, lvl, "%s: " fmt, phy_instance_name(pinst), ##args)</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 29a3663..b0965de 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -1340,6 +1340,25 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! close the PHY link using TRX protocol */</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_phy_link_close(struct phy_link *plink)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ bool clock_stopped = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(pinst, &plink->instances, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!clock_stopped) {</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_stopped = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_clock_stopped(pinst->trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pinst->u.osmotrx.hdl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_if_close(pinst->u.osmotrx.hdl);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_udp_close(&plink->u.osmotrx.trx_ofd_clk);</span><br><span style="color: hsl(120, 100%, 40%);">+ phy_link_state_set(plink, PHY_LINK_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! determine if the TRX for given handle is powered up */</span><br><span> int trx_if_powered(struct trx_l1h *l1h)</span><br><span> {</span><br><span>diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>index 6041073..7f42b47 100644</span><br><span>--- a/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>+++ b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>@@ -592,14 +592,13 @@</span><br><span> case TRX_PROV_EV_POWEROFF_CNF:</span><br><span> rc = (uint16_t)(intptr_t)data;</span><br><span> if (plink->state != PHY_LINK_SHUTDOWN) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_clock_stopped(pinst->trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- phy_link_state_set(plink, PHY_LINK_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_model_phy_link_close(plink);</span><br><span> </span><br><span> /* Notify TRX close on all TRX associated with this phy */</span><br><span> llist_for_each_entry(pinst, &plink->instances, list) {</span><br><span> bts_model_trx_close_cb(pinst->trx, rc);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_prov_fsm_state_chg(fi, TRX_PROV_ST_CLOSED);</span><br><span> }</span><br><span> break;</span><br><span> default:</span><br><span>@@ -661,7 +660,7 @@</span><br><span> .in_event_mask =</span><br><span> X(TRX_PROV_EV_POWEROFF_CNF),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(0, 100%, 40%);">- X(TRX_PROV_ST_OPEN_POWEROFF),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(TRX_PROV_ST_CLOSED),</span><br><span> .name = "OPEN_WAIT_POWEROFF_CNF",</span><br><span> .action = st_open_wait_poweroff_cnf,</span><br><span> },</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25529">change 25529</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/25529"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3253112700a31b85db82dc7ccadec8542bac745e </div>
<div style="display:none"> Gerrit-Change-Number: 25529 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>