<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21787">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: 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;">power_control: make use of MS/BS parameters in RSL messages<br><br>Change-Id: I586b1c9e16390757b015c2871a36abc3975e0fc4<br>Related: SYS#4918<br>---<br>M src/osmo-bsc/abis_rsl.c<br>1 file changed, 52 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index a803a03..2142219 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -185,6 +185,42 @@</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void add_power_control_params(struct msgb *msg, enum abis_rsl_ie iei,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_power_ctrl_params *cp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Since {MS,BS}_POWER_PARAM IE content is operator dependent, it's not</span><br><span style="color: hsl(120, 100%, 40%);">+ * known how different BTS models will interpret an empty IE, so let's</span><br><span style="color: hsl(120, 100%, 40%);">+ * better skip sending it unless we know for sure what each expects. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->power_ctrl_enc_rsl_params == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iei == RSL_IE_MS_POWER_PARAM)</span><br><span style="color: hsl(120, 100%, 40%);">+ cp = &bts->ms_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cp = &bts->bs_power_ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* These parameters are only valid for dynamic mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cp->mode != GSM_PWR_CTRL_MODE_DYN_BTS)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Put tag first, length will be updated later */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *ie_len = msgb_tl_put(msg, iei);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t msg_len = msgb_length(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->model->power_ctrl_enc_rsl_params(msg, cp) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "Failed to encode MS/BS Power Control "</span><br><span style="color: hsl(120, 100%, 40%);">+ "parameters, omitting this IE (tag 0x%02x)\n", iei);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_get(msg, msg_len - 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ /* Update length part of the containing IE */</span><br><span style="color: hsl(120, 100%, 40%);">+ *ie_len = msgb_length(msg) - msg_len;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Send a BCCH_INFO message as per Chapter 8.5.1 */</span><br><span> int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len)</span><br><span> {</span><br><span>@@ -281,6 +317,9 @@</span><br><span> </span><br><span> msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* BS Power Control Parameters (if supported by BTS model) */</span><br><span style="color: hsl(120, 100%, 40%);">+ add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msg->dst = lchan->ts->trx->rsl_link;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span>@@ -288,8 +327,6 @@</span><br><span> </span><br><span> int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan)</span><br><span> {</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 gsm_bts *bts = trx->bts;</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg;</span><br><span> uint8_t chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span>@@ -304,14 +341,11 @@</span><br><span> dh->chan_nr = chan_nr;</span><br><span> </span><br><span> msgb_tv_put(msg, RSL_IE_MS_POWER, lchan->ms_power);</span><br><span style="color: hsl(0, 100%, 40%);">- /* indicate MS power control to be performed by BTS: */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->type == GSM_BTS_TYPE_OSMOBTS)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tl_put(msg, RSL_IE_MS_POWER_PARAM);</span><br><span style="color: hsl(0, 100%, 40%);">- /* else: Since IE MS_POWER_PARAM content is operator dependent, it's not</span><br><span style="color: hsl(0, 100%, 40%);">- known if non-osmocom BTS models will support an empty IE, so let's</span><br><span style="color: hsl(0, 100%, 40%);">- better skip sending it unless we know for sure what each expects. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MS Power Control Parameters (if supported by BTS model) */</span><br><span style="color: hsl(120, 100%, 40%);">+ add_power_control_params(msg, RSL_IE_MS_POWER_PARAM, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = lchan->ts->trx->rsl_link;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -562,15 +596,16 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, RSL_IE_MS_POWER, lchan->ms_power);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->bs_power_ctrl.mode != GSM_PWR_CTRL_MODE_NONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->ms_power_ctrl.mode != GSM_PWR_CTRL_MODE_NONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, RSL_IE_MS_POWER, lchan->ms_power);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msgb_tv_put(msg, RSL_IE_TIMING_ADVANCE, ta);</span><br><span style="color: hsl(0, 100%, 40%);">- /* indicate MS power control to be performed by BTS: */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->type == GSM_BTS_TYPE_OSMOBTS)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tl_put(msg, RSL_IE_MS_POWER_PARAM);</span><br><span style="color: hsl(0, 100%, 40%);">- /* else: Since IE MS_POWER_PARAM content is operator dependent, it's not</span><br><span style="color: hsl(0, 100%, 40%);">- known if non-osmocom BTS models will support an empty IE, so let's</span><br><span style="color: hsl(0, 100%, 40%);">- better skip sending it unless we know for sure what each expects. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* BS/MS Power Control Parameters (if supported by BTS model) */</span><br><span style="color: hsl(120, 100%, 40%);">+ add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ add_power_control_params(msg, RSL_IE_MS_POWER_PARAM, lchan);</span><br><span> </span><br><span> mr_config_for_bts(lchan, msg);</span><br><span> rep_acch_cap_for_bts(lchan, msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21787">change 21787</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/+/21787"/><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: I586b1c9e16390757b015c2871a36abc3975e0fc4 </div>
<div style="display:none"> Gerrit-Change-Number: 21787 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>