<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25164">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">early IMM ASS 1/n: add vty config option<br><br>This patch adds only the VTY config option without any effect, to ease<br>patch review.<br>The implementation follows in I56c25cde152040fb66bdba44399bd37671ae3df2<br><br>The new config option is written so that further variants of Immediate<br>Assignment sequencing may be added easily.<br>See also I19e6a3d614aa5ae24d64eed96caf53e6f0e8bb74.<br><br>Related: SYS#5559<br>Change-Id: I710343d1728153faf3db9758ff5a1ef26bb8d3d4<br>---<br>M include/osmocom/bsc/bts.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bts_vty.c<br>M tests/osmo-bsc.vty<br>4 files changed, 54 insertions(+), 0 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/64/25164/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 1d566f5..291ec10 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -566,6 +566,9 @@</span><br><span> </span><br><span> /* Is Fast return to LTE allowed during Chan Release in this BTS? */</span><br><span> bool srvcc_fast_return_allowed;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* At what point in the channel allocation sequence to dispatch the Immediate Assignment (Abis optimization) */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum imm_ass_time imm_ass_time;</span><br><span> };</span><br><span> </span><br><span> #define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i])</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 31711c7..4411555 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -601,6 +601,11 @@</span><br><span> static inline const char *lchan_activate_mode_name(enum lchan_activate_for activ_for)</span><br><span> { return get_value_string(lchan_activate_mode_names, activ_for); }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum imm_ass_time {</span><br><span style="color: hsl(120, 100%, 40%);">+ IMM_ASS_TIME_POST_CHAN_ACK = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ IMM_ASS_TIME_PRE_CHAN_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct lchan_activate_info {</span><br><span> enum lchan_activate_for activ_for;</span><br><span> struct gsm_subscriber_connection *for_conn;</span><br><span>diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c</span><br><span>index 3695d28..cba0bb0 100644</span><br><span>--- a/src/osmo-bsc/bts_vty.c</span><br><span>+++ b/src/osmo-bsc/bts_vty.c</span><br><span>@@ -2806,6 +2806,23 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_immediate_assignment, cfg_bts_immediate_assignment_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "immediate-assignment (post-chan-ack|pre-chan-ack)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure time of Immediate Assignment after ChanRqd RACH (Abis optimization)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Send the Immediate Assignment after the Channel Activation ACK (normal sequence)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Send the Immediate Assignment directly after Channel Activation (early), without waiting for the ACK;"</span><br><span style="color: hsl(120, 100%, 40%);">+ " This may help with double allocations on high latency Abis links\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "pre-chan-ack"))</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->imm_ass_time = IMM_ASS_TIME_PRE_CHAN_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->imm_ass_time = IMM_ASS_TIME_POST_CHAN_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define BS_POWER_CONTROL_CMD \</span><br><span> "bs-power-control"</span><br><span> #define MS_POWER_CONTROL_CMD \</span><br><span>@@ -3980,6 +3997,16 @@</span><br><span> if (!bts->srvcc_fast_return_allowed)</span><br><span> vty_out(vty, " srvcc fast-return forbid%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bts->imm_ass_time) {</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IMM_ASS_TIME_POST_CHAN_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* default value */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case IMM_ASS_TIME_PRE_CHAN_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " immediate-assignment pre-chan-ack%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* BS/MS Power Control parameters */</span><br><span> config_write_power_ctrl(vty, 2, &bts->bs_power_ctrl);</span><br><span> config_write_power_ctrl(vty, 2, &bts->ms_power_ctrl);</span><br><span>@@ -4150,6 +4177,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_avg_period_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_immediate_assignment_cmd);</span><br><span> </span><br><span> neighbor_ident_vty_init();</span><br><span> /* See also handover commands added on bts level from handover_vty.c */</span><br><span>diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty</span><br><span>index 7351056..b837d25 100644</span><br><span>--- a/tests/osmo-bsc.vty</span><br><span>+++ b/tests/osmo-bsc.vty</span><br><span>@@ -204,3 +204,21 @@</span><br><span> OsmoBSC(config-net-bts)# channel allocator allow-tch-for-signalling 1</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !channel allocator allow-tch-for-signalling</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# immediate-assignment?</span><br><span style="color: hsl(120, 100%, 40%);">+ immediate-assignment Configure time of Immediate Assignment after ChanRqd RACH (Abis optimization)</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# immediate-assignment ?</span><br><span style="color: hsl(120, 100%, 40%);">+ post-chan-ack Send the Immediate Assignment after the Channel Activation ACK (normal sequence)</span><br><span style="color: hsl(120, 100%, 40%);">+ pre-chan-ack Send the Immediate Assignment directly after Channel Activation (early), without waiting for the ACK; This may help with double allocations on high latency Abis links</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+... !immediate-assignment</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# immediate-assignment pre-chan-ack</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ immediate-assignment pre-chan-ack</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# immediate-assignment post-chan-ack</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+... !immediate-assignment</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25164">change 25164</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/+/25164"/><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: I710343d1728153faf3db9758ff5a1ef26bb8d3d4 </div>
<div style="display:none"> Gerrit-Change-Number: 25164 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>