<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25645">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Delay power ramp up until RCARRIER is ENABLED<br><br>Prior to this patch, the power ramping started when the PHY is<br>available, but that doesn't necessarily mean the RCARRIER is enabled.<br><br>Due to this, it was spotted a situation where BTS bootstrap failed after<br>PHY turning up, when RSL connection establishment failed. Hence<br>bts_shutdown_fsm triggered a shutdown while an active power ramping up<br>was ongoing...<br><br>Change-Id: I17208b74ea2649b1bbb717aee0aa355e42b7e860<br>---<br>M include/osmo-bts/signal.h<br>M src/common/oml.c<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>3 files changed, 37 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/signal.h b/include/osmo-bts/signal.h</span><br><span>index c8168a2..8359f02 100644</span><br><span>--- a/include/osmo-bts/signal.h</span><br><span>+++ b/include/osmo-bts/signal.h</span><br><span>@@ -15,4 +15,10 @@</span><br><span> S_NEW_NSVC_ATTR,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct nm_statechg_signal_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_abis_mo *mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t old_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t new_state;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index f841853..30caad5 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -355,12 +355,16 @@</span><br><span> mo->nm_state.availability = avail_state;</span><br><span> }</span><br><span> if (op_state != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_statechg_signal_data nsd;</span><br><span> LOGP(DOML, LOGL_INFO, "%s OPER STATE %s -> %s\n",</span><br><span> gsm_abis_mo_name(mo),</span><br><span> abis_nm_opstate_name(mo->nm_state.operational),</span><br><span> abis_nm_opstate_name(op_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd.mo = mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd.old_state = mo->nm_state.operational;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsd.new_state = op_state;</span><br><span> mo->nm_state.operational = op_state;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_GLOBAL, S_NEW_OP_STATE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_dispatch(SS_GLOBAL, S_NEW_OP_STATE, &nsd);</span><br><span> }</span><br><span> if (adm_state != -1) {</span><br><span> LOGP(DOML, LOGL_INFO, "%s ADMIN STATE %s -> %s\n",</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 39fb608..52736ad 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>@@ -34,6 +34,7 @@</span><br><span> #include <osmo-bts/bts.h></span><br><span> #include <osmo-bts/rsl.h></span><br><span> #include <osmo-bts/nm_common_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/signal.h></span><br><span> </span><br><span> #include "l1_if.h"</span><br><span> #include "trx_provision_fsm.h"</span><br><span>@@ -314,6 +315,30 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_prov_fsm_signal_cb(unsigned int subsys, unsigned int signal,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *hdlr_data, void *signal_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_statechg_signal_data *nsd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (subsys != SS_GLOBAL)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (signal != S_NEW_OP_STATE)</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%);">+ nsd = (struct nm_statechg_signal_data *)signal_data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsd->mo->obj_class != NM_OC_RADIO_CARRIER)</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%);">+ if (nsd->old_state != NM_OPSTATE_ENABLED && nsd->new_state == NM_OPSTATE_ENABLED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_objclass2obj(nsd->mo->bts, nsd->mo->obj_class, &nsd->mo->obj_inst);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_trx_start_power_ramp(trx, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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> //////////////////////////</span><br><span> // FSM STATE ACTIONS</span><br><span> //////////////////////////</span><br><span>@@ -511,13 +536,6 @@</span><br><span> if (rc == 0 && plink->state != PHY_LINK_CONNECTED) {</span><br><span> trx_sched_clock_started(pinst->trx->bts);</span><br><span> phy_link_state_set(plink, PHY_LINK_CONNECTED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Begin to ramp up the power on all TRX associated with this phy */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(pinst, &plink->instances, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span style="color: hsl(0, 100%, 40%);">- l1if_trx_start_power_ramp(pinst->trx, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON);</span><br><span> } else if (rc != 0 && plink->state != PHY_LINK_SHUTDOWN) {</span><br><span> trx_sched_clock_stopped(pinst->trx->bts);</span><br><span>@@ -709,4 +727,5 @@</span><br><span> static __attribute__((constructor)) void trx_prov_fsm_init(void)</span><br><span> {</span><br><span> OSMO_ASSERT(osmo_fsm_register(&trx_prov_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(osmo_signal_register_handler(SS_GLOBAL, trx_prov_fsm_signal_cb, NULL) == 0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25645">change 25645</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/+/25645"/><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: I17208b74ea2649b1bbb717aee0aa355e42b7e860 </div>
<div style="display:none"> Gerrit-Change-Number: 25645 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>