<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25412">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_fsm: Avoid inheriting bs_power from old lchan<br><br>So far we were inherting the bs_power in used when activating an lchan<br>for an MS for which we already had previous lchan. For instance, when an<br>MS is first assigned an SDCCH, and later on, it is assigned a TCH to<br>place a voice call.<br>Doing so is, however, not correct because current and old lchans may be<br>placed on different TS or even on different TRX, which means they will<br>have different BS Power restrictions. In the scenario described above,<br>for instance, an SDCCH could have been assigned on C0 and hence have<br>a bs_power of 0, and later on, whenever the TCH lchan as created, it<br>would have inherited the C0 bs_power despite it may have been possible<br>to use a different (lower) max bs power.<br>Furthermore, the lchan->bs_power_db basically stores the *maximum* bs<br>power reduction. Hence it makes not sense at all to copy over the value,<br>since it is anyway not updated from MS measurement reports so far<br>anyway.<br><br>Fixes: 997a257f8dabe5dd940a1271e56e676a871896d7<br>Related: SYS#4919<br>Change-Id: I4a7736aa9a1395e0cc118b98b69896bd0f1e94e6<br>---<br>M src/osmo-bsc/lchan_fsm.c<br>1 file changed, 9 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index a18cba5..d06dbac 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -681,7 +681,7 @@</span><br><span> struct osmo_mgcpc_ep_ci *use_mgwep_ci;</span><br><span> struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan;</span><br><span> struct lchan_activate_info *info = &lchan->activate.info;</span><br><span style="color: hsl(0, 100%, 40%);">- int ms_power_dbm;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ms_power_dbm = bts->ms_max_power;</span><br><span> </span><br><span> if (lchan->release.requested) {</span><br><span> lchan_fail("Release requested while activating");</span><br><span>@@ -691,23 +691,17 @@</span><br><span> lchan->conn = info->for_conn;</span><br><span> </span><br><span> /* If there is a previous lchan, and the new lchan is on the same cell as previous one,</span><br><span style="color: hsl(0, 100%, 40%);">- * take over power values. Otherwise, use max power. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * take over MS power values. Otherwise, use configured MS max power. */</span><br><span> if (old_lchan && old_lchan->ts->trx->bts == bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_dbm = ms_pwr_dbm(bts->band, old_lchan->ms_power);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_update_ms_power_ctrl_level(lchan, ms_power_dbm >= 0 ? ms_power_dbm : bts->ms_max_power);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->bs_power_db = old_lchan->bs_power_db;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_update_ms_power_ctrl_level(lchan, bts->ms_max_power);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Upon last entering the UNUSED state, from lchan_reset():</span><br><span style="color: hsl(0, 100%, 40%);">- * - bs_power_db is still zero, 0dB reduction, output power = Pn. */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Default BS Power reduction value (in dB) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->bs_power_ctrl.mode == GSM_PWR_CTRL_MODE_DYN_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->bs_power_db = bts->bs_power_ctrl.bs_power_max_db;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->bs_power_db = bts->bs_power_ctrl.bs_power_val_db;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((ms_power_dbm = ms_pwr_dbm(bts->band, old_lchan->ms_power)) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_dbm = bts->ms_max_power;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_update_ms_power_ctrl_level(lchan, ms_power_dbm);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Default BS Power reduction value (in dB) */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->bs_power_db = (bts->bs_power_ctrl.mode == GSM_PWR_CTRL_MODE_DYN_BTS) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bs_power_ctrl.bs_power_max_db :</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bs_power_ctrl.bs_power_val_db;</span><br><span> /* BS Power Control is generally not allowed on the BCCH/CCCH carrier.</span><br><span> * However, we allow it in the BCCH carrier power reduction mode of operation. */</span><br><span> if (lchan->ts->trx == bts->c0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25412">change 25412</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-bsc/+/25412"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4a7736aa9a1395e0cc118b98b69896bd0f1e94e6 </div>
<div style="display:none"> Gerrit-Change-Number: 25412 </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: 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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>