<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16062">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, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move and rename gsm_lchan.ms_power field<br><br>Make it clear that it contains the maximum MS power level (TS 05.05) and<br>not the one to be used. The one aimed at is in ms_power_ctrl.current.<br>Since it's used in related code, move it inside the ms_power_ctrl struct<br>too.<br><br>Related: OS#1851<br>Change-Id: Ib264ec7dac87355cef6415461ed74bd8e9c8ca52<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/power_control.c<br>M src/common/rsl.c<br>M src/common/vty.c<br>M src/osmo-bts-trx/loops.c<br>M src/osmo-bts-virtual/l1_if.c<br>6 files changed, 20 insertions(+), 21 deletions(-)<br><br></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 5061310..8a52fe9 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>@@ -199,9 +199,6 @@</span><br><span> /* State */</span><br><span> enum gsm_lchan_state state;</span><br><span> const char *broken_reason;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Power levels for MS and BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bs_power;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ms_power;</span><br><span> /* Encryption information */</span><br><span> struct {</span><br><span> uint8_t alg_id;</span><br><span>@@ -323,8 +320,11 @@</span><br><span> /* power handling */</span><br><span> struct {</span><br><span> uint8_t current;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max;</span><br><span> bool fixed;</span><br><span> } ms_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Power levels for BTS */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bs_power;</span><br><span> </span><br><span> struct msgb *pending_rel_ind_msg;</span><br><span> </span><br><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index f467cd5..38a7fb7 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -83,8 +83,8 @@</span><br><span> /* Don't ask for smaller ms power level than the one set</span><br><span> * by BSC upon RSL CHAN ACT</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_pwr < lchan->ms_power)</span><br><span style="color: hsl(0, 100%, 40%);">- new_pwr = lchan->ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_pwr < lchan->ms_power_ctrl.max)</span><br><span style="color: hsl(120, 100%, 40%);">+ new_pwr = lchan->ms_power_ctrl.max;</span><br><span> </span><br><span> if (lchan->ms_power_ctrl.current != new_pwr) {</span><br><span> lchan->ms_power_ctrl.current = new_pwr;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index f88d2d7..09a9217 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1002,7 +1002,6 @@</span><br><span> memset(&lchan->encr, 0, sizeof(lchan->encr));</span><br><span> memset(&lchan->ho, 0, sizeof(lchan->ho));</span><br><span> lchan->bs_power = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power = 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>@@ -1099,8 +1098,8 @@</span><br><span> gsm_lchans_name(lchan->state));</span><br><span> </span><br><span> /* Initialize channel defaults */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;</span><br><span> lchan->ms_power_ctrl.fixed = false;</span><br><span> </span><br><span> rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));</span><br><span>@@ -1151,8 +1150,8 @@</span><br><span> lchan->bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER);</span><br><span> /* 9.3.13 MS Power */</span><br><span> if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power = *TLVP_VAL(&tp, RSL_IE_MS_POWER);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;</span><br><span> lchan->ms_power_ctrl.fixed = false;</span><br><span> }</span><br><span> /* 9.3.24 Timing Advance */</span><br><span>@@ -1633,7 +1632,7 @@</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> pwr = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power = pwr;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max = pwr;</span><br><span> </span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Rx MS POWER CONTROL %" PRIu8 "\n", pwr);</span><br><span> </span><br><span>@@ -1647,20 +1646,20 @@</span><br><span> lchan->ms_power_ctrl.fixed = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Only set current to lchan->ms_power if actual value of current</span><br><span style="color: hsl(0, 100%, 40%);">- in dBm > value in dBm from lchan->ms_power, or if fixed. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only set current to max if actual value of current</span><br><span style="color: hsl(120, 100%, 40%);">+ in dBm > value in dBm from max, or if fixed. */</span><br><span> if (lchan->ms_power_ctrl.fixed) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- max_pwr = ms_pwr_dbm(bts->band, lchan->ms_power);</span><br><span style="color: hsl(120, 100%, 40%);">+ max_pwr = ms_pwr_dbm(bts->band, lchan->ms_power_ctrl.max);</span><br><span> curr_pwr = ms_pwr_dbm(bts->band, lchan->ms_power_ctrl.current);</span><br><span> if (max_pwr < 0 || curr_pwr < 0) {</span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_ERROR,</span><br><span> "Unable to calculate power levels to dBm: %" PRIu8 " -> %d, %" PRIu8 " -> %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power, max_pwr,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max, max_pwr,</span><br><span> lchan->ms_power_ctrl.current, curr_pwr);</span><br><span> } else if (curr_pwr > max_pwr) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;</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 fd9be40..514d120 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1173,7 +1173,7 @@</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> - lchan->bs_power*2,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power),</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> get_value_string(gsm48_cmode_names, lchan->tch_mode),</span><br><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index b2b163a..4b723a0 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -62,11 +62,11 @@</span><br><span> lchan->ms_power_ctrl.current, gsm_band_name(band));</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_max_dbm = ms_pwr_dbm(band, lchan->ms_power);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_max_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.max);</span><br><span> if (bsc_max_dbm < 0) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span> "Failed to calculate dBm for power ctl level %" PRIu8 " on band %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power, gsm_band_name(band));</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.max, gsm_band_name(band));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c</span><br><span>index 58f4781..ab2cb76 100644</span><br><span>--- a/src/osmo-bts-virtual/l1_if.c</span><br><span>+++ b/src/osmo-bts-virtual/l1_if.c</span><br><span>@@ -320,7 +320,7 @@</span><br><span> </span><br><span> DEBUGPFN(DMEAS, fn, "RX L1 frame %s chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS "</span><br><span> "ber=%.2f%% (%d/%d bits) L1_ta=%d rqd_ta=%d toa=%.2f\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.max),</span><br><span> rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info[1], lchan->rqd_ta, toa);</span><br><span> </span><br><span> l1if_fill_meas_res(&l1sap, chan_nr, lchan->rqd_ta + toa, ber, rssi, fn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16062">change 16062</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/+/16062"/><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: Ib264ec7dac87355cef6415461ed74bd8e9c8ca52 </div>
<div style="display:none"> Gerrit-Change-Number: 16062 </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: laforge <laforge@osmocom.org> </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>