<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21787">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: send RSL_IE_{MS,BS}_POWER_PARAM on CHANnel ACTIVation<br><br>Change-Id: I586b1c9e16390757b015c2871a36abc3975e0fc4<br>Related: SYS#4918<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/abis_rsl.c<br>2 files changed, 65 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/21787/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index fc5ec40..97e2ff8 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -184,6 +184,9 @@</span><br><span> </span><br><span> void (*e1line_bind_ops)(struct e1inp_line *line);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* (Optional) encoding function for MS/BS Power Control paramaters */</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*enc_power_params)(struct msgb *msg, const struct gsm_power_ctrl_params *cp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts);</span><br><span> void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx);</span><br><span> void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts);</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index f8ea5a5..917726a 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -486,6 +486,59 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void add_power_control_params(struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_power_ctrl_dir dir)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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%);">+ uint8_t tag, msg_len, *ie_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dir == GSM_PWR_CTRL_DIR_UL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tag = 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%);">+ tag = RSL_IE_BS_POWER_PARAM;</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%);">+</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%);">+ switch (bts->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BTS_TYPE_NANOBTS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BTS_TYPE_OSMOBTS:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For both ip.access nanoBTS and osmoBTS we send MS/BS Power Control</span><br><span style="color: hsl(120, 100%, 40%);">+ * parameters once - right after the RSL connection is established.</span><br><span style="color: hsl(120, 100%, 40%);">+ * However, we may still need to send an empty IE here in order to</span><br><span style="color: hsl(120, 100%, 40%);">+ * indicate that dynamic power control is to be performed by BTS. */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, tag, 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Since IE {MS,BS}_POWER_PARAM content is operator dependent, it's not</span><br><span style="color: hsl(120, 100%, 40%);">+ * known if non-osmocom BTS models will support 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->enc_power_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%);">+ /* Put tag first, length will be updated later */</span><br><span style="color: hsl(120, 100%, 40%);">+ ie_len = msgb_tl_put(msg, tag);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_len = msgb_length(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bts->model->enc_power_params(msg, cp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 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", tag);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Chapter 8.4.1 */</span><br><span> int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref)</span><br><span> {</span><br><span>@@ -570,15 +623,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, bts, GSM_PWR_CTRL_DIR_DL);</span><br><span style="color: hsl(120, 100%, 40%);">+ add_power_control_params(msg, bts, GSM_PWR_CTRL_DIR_UL);</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: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>