<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18965">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Avoid selecting channels from administratively locked trx<br><br>Found while playing with "rf_locked 1" on a 2TRX setup with channel<br>allocator descend. After applying the setting, the 1st TRX is still used<br>to allocate the channels. After this patch is applied, the BSC correctly<br>allocates channels from TRX0.<br><br>Change-Id: I5201d2749363c9cbd0706177bde09117b163cbe3<br>---<br>M src/osmo-bsc/abis_nm.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M tests/handover/handover_test.c<br>4 files changed, 11 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index b6d1ec5..e17c6f5 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -848,9 +848,6 @@</span><br><span> </span><br><span> if (!trx_is_usable(trx))</span><br><span> return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->mo.nm_state.administrative == NM_STATE_LOCKED)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span> }</span><br><span> </span><br><span> return true;</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 2098f13..f790b90 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1459,10 +1459,13 @@</span><br><span> }</span><br><span> </span><br><span> bool nm_is_running(const struct gsm_nm_state *s) {</span><br><span style="color: hsl(0, 100%, 40%);">- return (s->operational == NM_OPSTATE_ENABLED) && (</span><br><span style="color: hsl(0, 100%, 40%);">- (s->availability == NM_AVSTATE_OK) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (s->availability == 0xff)</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s->operational != NM_OPSTATE_ENABLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((s->availability != NM_AVSTATE_OK) && (s->availability != 0xff))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s->administrative != NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span> }</span><br><span> </span><br><span> /* determine the logical channel type based on the physical channel type */</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 9eaaf2a..5fd02dd 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -306,7 +306,7 @@</span><br><span> * This ensures that RACH control in system information is configured correctly.</span><br><span> * TRX 0 should be usable and unlocked, otherwise starting ACC ramping is pointless.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx_is_usable(trx) && trx->mo.nm_state.administrative == NM_STATE_UNLOCKED)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_is_usable(trx))</span><br><span> acc_ramp_trigger(&trx->bts->acc_ramp);</span><br><span> </span><br><span> gsm_bts_trx_set_system_infos(trx);</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index b08e2a3..1a756cd 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -197,14 +197,17 @@</span><br><span> </span><br><span> bts->c0->mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span> bts->c0->mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> bts->c0->bb_transc.mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span> bts->c0->bb_transc.mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> </span><br><span> /* 4 full rate and 4 half rate channels */</span><br><span> for (i = 1; i <= 6; i++) {</span><br><span> bts->c0->ts[i].pchan_from_config = (i < 5) ? GSM_PCHAN_TCH_F : GSM_PCHAN_TCH_H;</span><br><span> bts->c0->ts[i].mo.nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span> bts->c0->ts[i].mo.nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->ts[i].mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(bts->c0->ts); i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18965">change 18965</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/+/18965"/><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: I5201d2749363c9cbd0706177bde09117b163cbe3 </div>
<div style="display:none"> Gerrit-Change-Number: 18965 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: 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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>