<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16072">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Drop low layer MS Power Control Loop algo<br><br>Let's drop it instead of having code duplication from common code in a<br>lower layer, and maintain only the one in l1sap for all BTS models.<br>As a result, osmo-bts-trx loses feature BTS_FEAT_MS_PWR_CTRL_DSP and<br>will only be able to use "ms-power-control osmo" in VTY, which will be<br>enabled by default (meaning: change of behavior, now MS Power Control is<br>enabled by default in osmo-bts-trx and can only by disabled by BSC).<br>Old bts-trx specific VTY command "(no) osmotrx ms-power-loop" is marked<br>as deprecated but still working for more usual case (1 TRX configured)<br>to avoid breaking backward compatibility.<br><br>TA low level loop is still kept in loops.c and will be moved to l1sap at<br>some point too.<br><br>Related: OS#1851<br>Change-Id: I0d8b0c981d9ead91d93999df6e45fb06e426aeb9<br>---<br>M include/osmo-bts/phy_link.h<br>M include/osmo-bts/scheduler.h<br>M src/osmo-bts-trx/loops.c<br>M src/osmo-bts-trx/loops.h<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>M src/osmo-bts-trx/trx_vty.c<br>7 files changed, 9 insertions(+), 214 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index 316a1ba..b2e7c0e 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -45,8 +45,6 @@</span><br><span> uint16_t base_port_remote;</span><br><span> struct osmo_fd trx_ofd_clk;</span><br><span> bool trx_ta_loop;</span><br><span style="color: hsl(0, 100%, 40%);">- bool trx_ms_power_loop;</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t trx_target_rssi;</span><br><span> uint32_t clock_advance;</span><br><span> uint32_t rts_advance;</span><br><span> bool use_legacy_setbsic;</span><br><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index 3100a1d..fed3f04 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -121,11 +121,6 @@</span><br><span> </span><br><span> /* measurements */</span><br><span> struct {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t clock; /* cyclic clock counter */</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t rssi[32]; /* last RSSI values */</span><br><span style="color: hsl(0, 100%, 40%);">- int rssi_count; /* received RSSI values */</span><br><span style="color: hsl(0, 100%, 40%);">- int rssi_valid_count; /* number of stored value */</span><br><span style="color: hsl(0, 100%, 40%);">- int rssi_got_burst; /* any burst received so far */</span><br><span> int32_t toa256_sum; /* sum of TOA values (1/256 symbol) */</span><br><span> int toa_num; /* number of TOA value */</span><br><span> } meas;</span><br><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index 47e9cf3..eb25f64 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -36,162 +36,12 @@</span><br><span> #include "loops.h"</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * MS Power loop</span><br><span style="color: hsl(120, 100%, 40%);">+ * Timing Advance loop</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param lchan logical channel for which to compute (and in which to store) new power value.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] diff input delta value (in dB). How many dBs measured power</span><br><span style="color: hsl(0, 100%, 40%);">- * should be increased (+) or decreased (-) to reach expected power.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ms_power_diff(struct gsm_lchan *lchan, int8_t diff)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_band band = trx->bts->band;</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t new_power; /* TS 05.05 power level */</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t new_dbm, current_dbm, bsc_max_dbm;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* power levels change in steps of 2 dB, so a smaller diff will end up in no change */</span><br><span style="color: hsl(0, 100%, 40%);">- if (diff < 2 && diff > -2)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- current_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.current);</span><br><span style="color: hsl(0, 100%, 40%);">- if (current_dbm < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "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_ctrl.current, gsm_band_name(band));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_max_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.max);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc_max_dbm < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "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_ctrl.max, gsm_band_name(band));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* don't ever change more than MS_{LOWER,RAISE}_MAX_DBM during one loop iteration, i.e.</span><br><span style="color: hsl(0, 100%, 40%);">- * reduce the speed at which the MS transmit power can change */</span><br><span style="color: hsl(0, 100%, 40%);">- /* a higher value means a lower level (and vice versa) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (diff > MS_RAISE_MAX_DB)</span><br><span style="color: hsl(0, 100%, 40%);">- diff = MS_RAISE_MAX_DB;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (diff < -MS_LOWER_MAX_DB)</span><br><span style="color: hsl(0, 100%, 40%);">- diff = -MS_LOWER_MAX_DB;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- new_dbm = current_dbm + diff;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on</span><br><span style="color: hsl(0, 100%, 40%);">- cope with any unsigned dbm value, regardless of band minimal value. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_dbm < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- new_dbm = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Don't ask for smaller ms power level than the one set by BSC upon RSL CHAN ACT */</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_dbm > bsc_max_dbm)</span><br><span style="color: hsl(0, 100%, 40%);">- new_dbm = bsc_max_dbm;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- new_power = ms_pwr_ctl_lvl(band, new_dbm);</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_power < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "Failed to retrieve power level for %" PRId8 " dBm on band %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- new_dbm, band);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ms_power_ctrl.current == new_power) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- new_power, ms_pwr_dbm(band, new_power));</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (diff > 0) ? "Raising" : "Lowering",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current),</span><br><span style="color: hsl(0, 100%, 40%);">- new_power, ms_pwr_dbm(band, new_power));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* store the resulting new MS power level in the lchan */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = new_power;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! Input a new RSSI value into the MS power control loop for the given logical channel.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param lchan logical channel</span><br><span style="color: hsl(0, 100%, 40%);">- * \param chan_state L1 channel state of the logical channel.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param rssi Received Signal Strength Indication (in dBm) */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ms_power_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int8_t rssi)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* ignore inserted dummy frames, treat as lost frames */</span><br><span style="color: hsl(0, 100%, 40%);">- if (rssi < -127)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.rssi_count++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.rssi_got_burst = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* store and process RSSI */</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->meas.rssi_valid_count == ARRAY_SIZE(chan_state->meas.rssi))</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! Process a single clock tick of the MS power control loop.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param lchan Logical channel to which the clock tick applies */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ms_power_clock(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span style="color: hsl(0, 100%, 40%);">- int rssi;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* skip every second clock, to prevent oscillating due to roundtrip</span><br><span style="color: hsl(0, 100%, 40%);">- * delay */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(chan_state->meas.clock & 1))</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.rssi_count);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* wait for initial burst */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!chan_state->meas.rssi_got_burst)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* if no burst was received from MS at clock */</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->meas.rssi_count == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "LOST SACCH frame, so we raise MS power output\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_diff(lchan, MS_RAISE_MAX_DB);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* reset total counter */</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.rssi_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* check the minimum level received after MS acknowledged the ordered</span><br><span style="color: hsl(0, 100%, 40%);">- * power level */</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->meas.rssi_valid_count == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- for (rssi = 999, i = 0; i < chan_state->meas.rssi_valid_count; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (rssi > chan_state->meas.rssi[i])</span><br><span style="color: hsl(0, 100%, 40%);">- rssi = chan_state->meas.rssi[i];</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* reset valid counter */</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.rssi_valid_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* change RSSI */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current "</span><br><span style="color: hsl(0, 100%, 40%);">- "MS power: %d (%d dBm)\n", rssi,</span><br><span style="color: hsl(0, 100%, 40%);">- pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current));</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_diff(lchan, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 90% of one bit duration in 1/256 symbols: 256*0.9 */</span><br><span> #define TOA256_9OPERCENT 230</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * Timing Advance loop</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void ta_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int16_t toa256)</span><br><span> {</span><br><span> /* check if the current L1 header acks to the current ordered TA */</span><br><span>@@ -231,42 +81,17 @@</span><br><span> * \param[in] rssi Receive Signal Strength Indication</span><br><span> * \param[in] toa256 Time of Arrival in 1/256 symbol periods */</span><br><span> void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa256)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1sched_chan_state *chan_state, int16_t toa256)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)]</span><br><span> .lchan[l1sap_chan2ss(chan_nr)];</span><br><span> struct phy_instance *pinst = trx_phy_instance(l1t->trx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* if common upper layer MS power control loop is disabled</span><br><span style="color: hsl(0, 100%, 40%);">- and lower layer MS power control loop is enabled, handle it */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!l1t->trx->ms_pwr_ctl_soft && pinst->phy_link->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_val(lchan, chan_state, rssi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* if TA loop is enabled, handle it */</span><br><span> if (pinst->phy_link->u.osmotrx.trx_ta_loop)</span><br><span> ta_val(lchan, chan_state, toa256);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Called once every downlink SACCH block needs to be sent. */</span><br><span style="color: hsl(0, 100%, 40%);">-void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)]</span><br><span style="color: hsl(0, 100%, 40%);">- .lchan[l1sap_chan2ss(chan_nr)];</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(l1t->trx);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ms_power_ctrl.fixed)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* if common upper layer MS power control loop is disabled</span><br><span style="color: hsl(0, 100%, 40%);">- and lower layer MS power control loop is enabled, handle it */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!l1t->trx->ms_pwr_ctl_soft && pinst->phy_link->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_clock(lchan, chan_state);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* count the number of SACCH clocks */</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->meas.clock++;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state,</span><br><span> int n_errors, int n_bits_total)</span><br><span>diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/loops.h</span><br><span>index 978cb7e..bc87860 100644</span><br><span>--- a/src/osmo-bts-trx/loops.h</span><br><span>+++ b/src/osmo-bts-trx/loops.h</span><br><span>@@ -7,19 +7,12 @@</span><br><span> * calibration of loops</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* how much power levels do we raise/lower as maximum (1 level = 2 dB) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define MS_RAISE_MAX_DB 4</span><br><span style="color: hsl(0, 100%, 40%);">-#define MS_LOWER_MAX_DB 8</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*</span><br><span> * loops api</span><br><span> */</span><br><span> </span><br><span> void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1sched_chan_state *chan_state, int16_t toa);</span><br><span> </span><br><span> void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr,</span><br><span> struct l1sched_chan_state *chan_state,</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 9a29b3b..00280ce 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -116,7 +116,6 @@</span><br><span> gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR);</span><br><span> gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR);</span><br><span> gsm_bts_set_feature(bts, BTS_FEAT_CBCH);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_set_feature(bts, BTS_FEAT_MS_PWR_CTRL_DSP);</span><br><span> </span><br><span> bts_model_vty_init(bts);</span><br><span> </span><br><span>@@ -137,8 +136,6 @@</span><br><span> plink->u.osmotrx.clock_advance = 20;</span><br><span> plink->u.osmotrx.rts_advance = 5;</span><br><span> plink->u.osmotrx.trx_ta_loop = true;</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_ms_power_loop = false;</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_target_rssi = -10;</span><br><span> /* attempt use newest TRXD version by default: */</span><br><span> plink->u.osmotrx.trxd_hdr_ver_max = TRX_DATA_FORMAT_VER;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index 07ee9da..c3608bf 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -148,8 +148,6 @@</span><br><span> {</span><br><span> struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span> struct gsm_bts_trx_ts *ts = &l1t->trx->ts[tn];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t link_id = trx_chan_desc[chan].link_id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr = trx_chan_desc[chan].chan_nr | tn;</span><br><span> struct msgb *msg = NULL; /* make GCC happy */</span><br><span> ubit_t *burst, **bursts_p = &l1ts->chan_state[chan].dl_bursts;</span><br><span> static ubit_t bits[GSM_BURST_LEN];</span><br><span>@@ -161,10 +159,6 @@</span><br><span> goto send_burst;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* send clock information to loops process */</span><br><span style="color: hsl(0, 100%, 40%);">- if (L1SAP_IS_LINK_SACCH(link_id))</span><br><span style="color: hsl(0, 100%, 40%);">- trx_loop_sacch_clock(l1t, chan_nr, &l1ts->chan_state[chan]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* get mac block from queue */</span><br><span> msg = _sched_dequeue_prim(l1t, tn, fn, chan);</span><br><span> if (msg)</span><br><span>@@ -959,7 +953,7 @@</span><br><span> /* send burst information to loops process */</span><br><span> if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) {</span><br><span> trx_loop_sacch_input(l1t, trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state, bi->rssi, bi->toa256);</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state, bi->toa256);</span><br><span> }</span><br><span> </span><br><span> /* wait until complete set of bursts */</span><br><span>diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c</span><br><span>index 86f5712..5c5e477 100644</span><br><span>--- a/src/osmo-bts-trx/trx_vty.c</span><br><span>+++ b/src/osmo-bts-trx/trx_vty.c</span><br><span>@@ -160,26 +160,23 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_phy_ms_power_loop, cfg_phy_ms_power_loop_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_phy_ms_power_loop, cfg_phy_ms_power_loop_cmd,</span><br><span> "osmotrx ms-power-loop <-127-127>", OSMOTRX_STR</span><br><span> "Enable MS power control loop\nTarget RSSI value (transceiver specific, "</span><br><span> "should be 6dB or more above noise floor)\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_link *plink = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out (vty, "'osmotrx ms-power-loop' is deprecated, use 'uplink-power-target' instead%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_target_rssi = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_ms_power_loop = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_bts->ul_power_target = atoi(argv[0]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_phy_no_ms_power_loop, cfg_phy_no_ms_power_loop_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_phy_no_ms_power_loop, cfg_phy_no_ms_power_loop_cmd,</span><br><span> "no osmotrx ms-power-loop",</span><br><span> NO_STR OSMOTRX_STR "Disable MS power control loop\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_link *plink = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_ms_power_loop = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out (vty, "'no osmotrx ms-power-loop' is deprecated, use of BTS control loop is managed by BSC%s", VTY_NEWLINE);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -525,10 +522,6 @@</span><br><span> vty_out(vty, " osmotrx ip remote %s%s",</span><br><span> plink->u.osmotrx.remote_ip, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (plink->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmotrx ms-power-loop %d%s", plink->u.osmotrx.trx_target_rssi, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no osmotrx ms-power-loop%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " %sosmotrx timing-advance-loop%s", (plink->u.osmotrx.trx_ta_loop) ? "" : "no ", VTY_NEWLINE);</span><br><span> </span><br><span> if (plink->u.osmotrx.base_port_local)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16072">change 16072</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/+/16072"/><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: I0d8b0c981d9ead91d93999df6e45fb06e426aeb9 </div>
<div style="display:none"> Gerrit-Change-Number: 16072 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </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>