<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned<br><br>Waiting until all other TRX are provisioned before really sending<br>POWERON helps avoiding race conditions where TRX!=0 are not yet fully<br>configured at the TRX side before POWERON is called.<br>This solves for instance the situation where after POWERON RSP the BTS<br>started ramping up on all TRX while on some NOMTXPOWER RSP was yet not<br>received...<br><br>Related: SYS#4920<br>Change-Id: I906be4714807c7a2793971cb6062120e24337d7b<br>---<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>M src/osmo-bts-trx/trx_provision_fsm.h<br>2 files changed, 58 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 611ec69..420ee24 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>@@ -205,7 +205,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Whether a given TRX is fully configured and can be powered on */</span><br><span style="color: hsl(0, 100%, 40%);">-static bool trx_can_be_powered_on(struct trx_l1h *l1h)</span><br><span style="color: hsl(120, 100%, 40%);">+static bool trx_is_provisioned(struct trx_l1h *l1h)</span><br><span> {</span><br><span> struct phy_instance *pinst = l1h->phy_inst;</span><br><span> if (l1h->config.enabled && l1h->config.rxtune_acked && l1h->config.txtune_acked &&</span><br><span>@@ -219,6 +219,37 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void trx_signal_ready_trx0(struct trx_l1h *l1h)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst = l1h->phy_inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst_it;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(pinst_it, &pinst->phy_link->instances, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1h_it->phy_inst->num != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(l1h_it->provision_fi, TRX_PROV_EV_OTHER_TRX_READY, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Called from TRX0 to check if other TRX are already configured and powered so POWERON can be sent */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool trx_other_trx0_ready(struct trx_l1h *l1h)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst = l1h->phy_inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst_it;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Don't POWERON until all trx are ready */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(pinst_it, &pinst->phy_link->instances, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1h_it->phy_inst->num == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1h_it->provision_fi->state != TRX_PROV_ST_OPEN_POWERON)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> //////////////////////////</span><br><span> // FSM STATE ACTIONS</span><br><span> //////////////////////////</span><br><span>@@ -256,6 +287,7 @@</span><br><span> uint16_t tsc;</span><br><span> int nominal_power;</span><br><span> int status;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool others_ready;</span><br><span> </span><br><span> switch(event) {</span><br><span> case TRX_PROV_EV_CFG_ENABLE:</span><br><span>@@ -332,20 +364,34 @@</span><br><span> l1h->config.setformat_sent = false;</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case TRX_PROV_EV_OTHER_TRX_READY:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pinst->num == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Do nothing here, we were triggered to see if we can finally poweron TRX0 below */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span> }</span><br><span> </span><br><span> l1if_provision_transceiver_trx(l1h);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* if we gathered all data and could go forward :*/</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx_can_be_powered_on(l1h)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (l1h->phy_inst->num == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1h->phy_inst->num == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ others_ready = trx_other_trx0_ready(l1h);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ others_ready = true; /* we don't care about others in TRX!=0 */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* if we gathered all data and could go forward. For TRX0, only after</span><br><span style="color: hsl(120, 100%, 40%);">+ * all other TRX are prepared, since it will send POWERON commad */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_is_provisioned(l1h) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ (l1h->phy_inst->num != 0 || others_ready)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1h->phy_inst->num != 0) {</span><br><span> trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Once we are powered on, signal TRX0 in case it was waiting for us */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_signal_ready_trx0(l1h);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying poweron, TRX attributes not yet configured:%s%s%s%s%s%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s\n",</span><br><span> l1h->config.enabled ? "" :" enable",</span><br><span> pinst->phy_link->u.osmotrx.use_legacy_setbsic ?</span><br><span> (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") :</span><br><span>@@ -353,7 +399,8 @@</span><br><span> l1h->config.arfcn_valid ? "" : " arfcn",</span><br><span> l1h->config.rxtune_acked ? "" : " rxtune-ack",</span><br><span> l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"),</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.setformat_acked ? "" : " setformat-ack"</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.setformat_acked ? "" : " setformat-ack",</span><br><span style="color: hsl(120, 100%, 40%);">+ (l1h->phy_inst->num != 0 || others_ready) ? "" : " other-trx"</span><br><span> );</span><br><span> }</span><br><span> }</span><br><span>@@ -505,6 +552,7 @@</span><br><span> },</span><br><span> [TRX_PROV_ST_OPEN_POWEROFF] = {</span><br><span> .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(TRX_PROV_EV_OTHER_TRX_READY) |</span><br><span> X(TRX_PROV_EV_CFG_ENABLE) |</span><br><span> X(TRX_PROV_EV_CFG_BSIC) |</span><br><span> X(TRX_PROV_EV_CFG_ARFCN) |</span><br><span>@@ -555,6 +603,7 @@</span><br><span> };</span><br><span> </span><br><span> const struct value_string trx_prov_fsm_event_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(TRX_PROV_EV_OTHER_TRX_READY),</span><br><span> OSMO_VALUE_STRING(TRX_PROV_EV_OPEN),</span><br><span> OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ENABLE),</span><br><span> OSMO_VALUE_STRING(TRX_PROV_EV_CFG_BSIC),</span><br><span>diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h</span><br><span>index 24eb268..1583270 100644</span><br><span>--- a/src/osmo-bts-trx/trx_provision_fsm.h</span><br><span>+++ b/src/osmo-bts-trx/trx_provision_fsm.h</span><br><span>@@ -38,6 +38,7 @@</span><br><span> };</span><br><span> </span><br><span> enum trx_provision_fsm_events {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRX_PROV_EV_OTHER_TRX_READY,</span><br><span> TRX_PROV_EV_OPEN,</span><br><span> TRX_PROV_EV_CFG_ENABLE,</span><br><span> TRX_PROV_EV_CFG_BSIC,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19368">change 19368</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/+/19368"/><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: I906be4714807c7a2793971cb6062120e24337d7b </div>
<div style="display:none"> Gerrit-Change-Number: 19368 </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-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>