<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18835">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">A-bis/RSL: refactor handling of BS Power IE (power reduction)<br><br>According to 3GPP TS 08.58, section 9.3.4, BS Power IE indicates<br>the transmission power attenuation on a particular channel:<br><br> +--------------+---------+-----------------+<br> | Reserved (3) | FPC (1) | Power level (4) |<br> +--------------+---------+-----------------+<br><br>so let's change handling of this IE as follows:<br><br> - s/bs_power/bs_power_red/g, so it reflects 'reduction';<br> - get rid of ms_power_ctrl.bts_tx_pwr, it's always 0 anyway;<br> - fix rsl_tx_meas_res(): use lchan->bs_power_red;<br> - always check if FPC (Fast Power Control) flag is set;<br> - we don't support it, so reject messages containing it;<br> - fix rsl_rx_chan_activ(): properly apply the bitmask.<br><br>Change-Id: I16cc50dfca102030380a06e16c234d5f6698f38f<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/rsl.c<br>M src/common/tx_power.c<br>M src/common/vty.c<br>4 files changed, 26 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/18835/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index 7cfbfeb..c3dba3c 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -193,8 +193,6 @@</span><br><span> uint8_t flags;</span><br><span> /* RSL measurement result number, 0 at lchan_act */</span><br><span> uint8_t res_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- /* current Tx power level of the BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bts_tx_pwr;</span><br><span> /* number of measurements stored in array below */</span><br><span> uint8_t num_ul_meas;</span><br><span> struct bts_ul_meas uplink[MAX_NUM_UL_MEAS];</span><br><span>@@ -267,8 +265,9 @@</span><br><span> uint8_t max;</span><br><span> bool fixed;</span><br><span> } ms_power_ctrl;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Power levels for BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bs_power;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* BTS power reduction (2 dB steps) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bs_power_red;</span><br><span> </span><br><span> struct msgb *pending_rel_ind_msg;</span><br><span> </span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index f057a89..b9c9695 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1001,7 +1001,7 @@</span><br><span> lchan->tch_mode = 0;</span><br><span> memset(&lchan->encr, 0, sizeof(lchan->encr));</span><br><span> memset(&lchan->ho, 0, sizeof(lchan->ho));</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->bs_power = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->bs_power_red = 0;</span><br><span> memset(&lchan->ms_power_ctrl, 0, sizeof(lchan->ms_power_ctrl));</span><br><span> lchan->rqd_ta = 0;</span><br><span> copy_sacch_si_to_lchan(lchan);</span><br><span>@@ -1146,8 +1146,15 @@</span><br><span> }</span><br><span> </span><br><span> /* 9.3.4 BS Power */</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1))</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*TLVP_VAL(&tp, RSL_IE_BS_POWER) & (1 << 4)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Fast Power Control is not supported\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return rsl_tx_chan_act_nack(lchan, RSL_ERR_SERV_OPT_UNIMPL);</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%);">+ lchan->bs_power_red = *TLVP_VAL(&tp, RSL_IE_BS_POWER) & 0x0f;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 9.3.13 MS Power */</span><br><span> if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {</span><br><span> lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;</span><br><span>@@ -1664,21 +1671,13 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* See TS 48.058 Section 9.3.4 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int bs_power_attenuation_dB(uint8_t bs_power)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* the lower nibble contains the number of 2dB steps that the BS power is reduced compared</span><br><span style="color: hsl(0, 100%, 40%);">- * to its nominal transmit power */</span><br><span style="color: hsl(0, 100%, 40%);">- return - ((bs_power & 0xF) *2);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 8.4.16 BS POWER CONTROL */</span><br><span> static int rsl_rx_bs_pwr_ctrl(struct msgb *msg)</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);</span><br><span> struct gsm_lchan *lchan = msg->lchan;</span><br><span> struct tlv_parsed tp;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t new_bs_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t old_bs_power_red;</span><br><span> </span><br><span> rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));</span><br><span> </span><br><span>@@ -1686,12 +1685,16 @@</span><br><span> if (!TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1))</span><br><span> return rsl_tx_error_report(msg->trx, RSL_ERR_MAND_IE_ERROR, &dch->chan_nr, NULL, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- new_bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*TLVP_VAL(&tp, RSL_IE_BS_POWER) & (1 << 4)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Fast Power Control is not supported\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return rsl_tx_error_report(msg->trx, RSL_ERR_SERV_OPT_UNIMPL, &dch->chan_nr, NULL, msg);</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%);">+ old_bs_power_red = lchan->bs_power_red;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->bs_power_red = *TLVP_VAL(&tp, RSL_IE_BS_POWER) & 0x0f;</span><br><span> </span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_INFO, "BS POWER CONTROL Attenuation %d -> %d dB\n",</span><br><span style="color: hsl(0, 100%, 40%);">- bs_power_attenuation_dB(lchan->bs_power), bs_power_attenuation_dB(new_bs_power));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->bs_power = new_bs_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ old_bs_power_red * 2, lchan->bs_power_red * 2);</span><br><span> </span><br><span> /* 9.3.31 MS Power Parameters (O) */</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_BS_POWER_PARAM)) {</span><br><span>@@ -2896,7 +2899,7 @@</span><br><span> msgb_tlv_put(msg, RSL_IE_UPLINK_MEAS, ie_len, meas_res);</span><br><span> lchan->meas.flags &= ~LC_UL_M_F_RES_VALID;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->meas.bts_tx_pwr);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power_red);</span><br><span> if (lchan->meas.flags & LC_UL_M_F_L1_VALID) {</span><br><span> msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, lchan->meas.l1_info);</span><br><span> lchan->meas.flags &= ~LC_UL_M_F_L1_VALID;</span><br><span>diff --git a/src/common/tx_power.c b/src/common/tx_power.c</span><br><span>index e418cec..de741f5 100644</span><br><span>--- a/src/common/tx_power.c</span><br><span>+++ b/src/common/tx_power.c</span><br><span>@@ -67,7 +67,7 @@</span><br><span> }</span><br><span> int get_p_target_mdBm_lchan(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return get_p_target_mdBm(lchan->ts->trx, lchan->bs_power);</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_p_target_mdBm(lchan->ts->trx, lchan->bs_power_red);</span><br><span> }</span><br><span> </span><br><span> /* calculate the actual total output power required, taking into account the</span><br><span>@@ -133,7 +133,7 @@</span><br><span> }</span><br><span> int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return get_p_trxout_target_mdBm(lchan->ts->trx, lchan->bs_power);</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_p_trxout_target_mdBm(lchan->ts->trx, lchan->bs_power_red);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 3dfd387..058ff30 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1183,7 +1183,7 @@</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " BS Power: %d dBm, MS Power: %u dBm%s",</span><br><span> lchan->ts->trx->nominal_power - lchan->ts->trx->max_power_red</span><br><span style="color: hsl(0, 100%, 40%);">- - lchan->bs_power*2,</span><br><span style="color: hsl(120, 100%, 40%);">+ - lchan->bs_power_red * 2,</span><br><span> ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.max),</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " Channel Mode / Codec: %s%s",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18835">change 18835</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/+/18835"/><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: I16cc50dfca102030380a06e16c234d5f6698f38f </div>
<div style="display:none"> Gerrit-Change-Number: 18835 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>