<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18967">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Implement ramp up/down during ADM state change<br><br>Ramp down when BTS is administratevly locked, and ramp up when it<br>becomes unlocked again.<br><br>Af ramping down, bts_model_trx_deact_rf is called to make sure all<br>channels are released.<br><br>power_ramp_start() is dropped from inside bts_model_trx_deact_rf since<br>it's not the proper place. In there we simply want to instantaneously<br>drop RF.<br><br>Related: SYS#4920<br>Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70<br>---<br>M src/osmo-bts-trx/l1_if.c<br>1 file changed, 75 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index 638a674..4cdb108 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -41,10 +41,12 @@</span><br><span> #include <osmo-bts/amr.h></span><br><span> #include <osmo-bts/abis.h></span><br><span> #include <osmo-bts/scheduler.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/pcu_if.h></span><br><span> </span><br><span> #include "l1_if.h"</span><br><span> #include "trx_if.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define RF_DISABLED_mdB to_mdB(-10)</span><br><span> </span><br><span> static const uint8_t transceiver_chan_types[_GSM_PCHAN_MAX] = {</span><br><span> [GSM_PCHAN_NONE] = 8,</span><br><span>@@ -138,15 +140,15 @@</span><br><span> return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void l1if_trx_start_power_ramp(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb)</span><br><span> {</span><br><span> struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span> struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span> </span><br><span> if (l1h->config.forced_max_power_red == -1)</span><br><span style="color: hsl(0, 100%, 40%);">- power_ramp_start(trx, get_p_nominal_mdBm(trx), 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return power_ramp_start(trx, get_p_nominal_mdBm(trx), 0, ramp_compl_cb);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- power_ramp_start(trx, get_p_max_out_mdBm(trx) - to_mdB(l1h->config.forced_max_power_red), 1, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return power_ramp_start(trx, get_p_max_out_mdBm(trx) - to_mdB(l1h->config.forced_max_power_red), 1, ramp_compl_cb);</span><br><span> }</span><br><span> </span><br><span> /* Sets the nominal power, in dB */</span><br><span>@@ -162,13 +164,14 @@</span><br><span> trx->power_params.trx_p_max_out_mdBm);</span><br><span> </span><br><span> /* If TRX is not yet powered, delay ramping until it's ON */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nom_pwr_changed || !pinst->phy_link->u.osmotrx.powered)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nom_pwr_changed || !pinst->phy_link->u.osmotrx.powered ||</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span> return;</span><br><span> </span><br><span> /* We are already ON and we got new information about nominal power, so</span><br><span> * let's make sure we adapt the tx power to it</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- l1if_trx_start_power_ramp(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_trx_start_power_ramp(trx, NULL);</span><br><span> }</span><br><span> </span><br><span> static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc)</span><br><span>@@ -223,7 +226,8 @@</span><br><span> </span><br><span> /* Begin to ramp up the power on all TRX associated with this phy */</span><br><span> llist_for_each_entry(pinst, &plink->instances, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- l1if_trx_start_power_ramp(pinst->trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_trx_start_power_ramp(pinst->trx, NULL);</span><br><span> }</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>@@ -424,12 +428,6 @@</span><br><span> pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {</span><br><span> lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: There's currently no way to communicate to osmo-trx through</span><br><span style="color: hsl(0, 100%, 40%);">- * TRXC that a specific TRX processing shall be paused. Let's simply</span><br><span style="color: hsl(0, 100%, 40%);">- * make sure that at least we don't transmit with power on it by setting</span><br><span style="color: hsl(0, 100%, 40%);">- * a rather low value:</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- power_ramp_start(trx, to_mdB(-10), 1, NULL);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -505,7 +503,8 @@</span><br><span> /* Begin to ramp up the power if power reduction is set by OML and TRX</span><br><span> is already running. Otherwise skip, power ramping will be started</span><br><span> after TRX is running */</span><br><span style="color: hsl(0, 100%, 40%);">- if (plink->u.osmotrx.powered && l1h->config.forced_max_power_red == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (plink->u.osmotrx.powered && l1h->config.forced_max_power_red == -1 &&</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span> power_ramp_start(pinst->trx, get_p_nominal_mdBm(pinst->trx), 0, NULL);</span><br><span> </span><br><span> return 0;</span><br><span>@@ -866,12 +865,72 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void bts_model_chg_adm_state_ramp_compl_cb(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTRX(trx, DL1C, LOGL_INFO, "power ramp due to ADM STATE change finished\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->mo.procedure_pending = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->mo.nm_state.administrative == NM_STATE_LOCKED) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_model_trx_deact_rf(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_info_ind();</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> int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,</span><br><span> void *obj, uint8_t adm_state)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* blindly accept all state changes */</span><br><span style="color: hsl(0, 100%, 40%);">- mo->nm_state.administrative = adm_state;</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_mo_statechg_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i, rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mo->obj_class) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_OC_RADIO_CARRIER:</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = (struct gsm_bts_trx *) obj;</span><br><span style="color: hsl(120, 100%, 40%);">+ pinst = trx_phy_instance(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Begin to ramp the power if TRX is already running. Otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ * skip, power ramping will be started after TRX is running */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pinst->phy_link->u.osmotrx.powered)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mo->procedure_pending) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTRX(trx, DL1C, LOGL_ERROR, "Discarding adm change command: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "pending procedure on RC %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ((struct gsm_bts_trx *)obj)->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (adm_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_STATE_LOCKED:</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->procedure_pending = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = power_ramp_start(trx, RF_DISABLED_mdB, 1, bts_model_chg_adm_state_ramp_compl_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NM_STATE_UNLOCKED:</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->procedure_pending = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Activate timeslots in scheduler and start power ramp up */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_set_ts(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->nm_state.administrative = adm_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_info_ind();</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_mo_statechg_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ if (rc == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->nm_state.administrative = adm_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_mo_statechg_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_mo_statechg_nack(mo, NM_NACK_REQ_NOT_GRANT);</span><br><span> }</span><br><span> </span><br><span> int bts_model_oml_estab(struct gsm_bts *bts)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18967">change 18967</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/+/18967"/><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: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 </div>
<div style="display:none"> Gerrit-Change-Number: 18967 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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>