<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17730">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: clarify EGPRS Packet Channel Request message support<br><br>According to 3GPP TS 44.060, section 12.24, GPRS Cell Options IE<br>contains two parameters related to 11 bit Access Burst support:<br><br> - ACCESS_BURST_TYPE - whether the 8 or 11 bit format shall be<br> used in the PACKET CHANNEL REQUEST message, the PTCCH/U block,<br> PACKET CONTROL ACKNOWLEDGMENT and the PS HANDOVER ACCESS<br> messages on the PRACH (if present).<br><br> - EGPRS_PACKET_CHANNEL_REQUEST - whether EGPRS capable MSs shall<br> use EGPRS PACKET CHANNEL REQUEST message for Uplink TBF<br> establishment on the RACH or on the PRACH (if present).<br><br>The VTY option 'gprs 11bit_rach_support_for_egprs' actually controls<br>the second parameter - EGPRS_PACKET_CHANNEL_REQUEST, though it may<br>be hard to understand this from its name and description.<br><br>This patch is actually a group of tightly related changes:<br><br> - deprecate 'gprs 11bit_rach_support_for_egprs (0|1)':<br> - update its description to avoid any possible confusion,<br> - print a warning if it's used in non-EGPRS mode,<br> - print a warning if it's still used;<br><br> - introduce '[no] gprs egprs-packet-channel-request':<br> - ensure that it can only set / printed in the EGPRS mode;<br><br> - take a chance to clean-up / rename the related struct members:<br> - 'supports_egprs_11bit_rach' -> bool 'egprs_pkt_chan_request',<br> - remove 'supports_egprs_11bit_rach' from 'gprs_cell_options'<br> because we already have 'ext_info.use_egprs_p_ch_req' there.<br><br>Change-Id: Ied5bd10a806aeeac65ef32339d4ab0e3700e5da9<br>---<br>M doc/manuals/vty/bsc_vty_reference.xml<br>M include/osmocom/bsc/gsm_data.h<br>M include/osmocom/bsc/rest_octets.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/rest_octets.c<br>M src/osmo-bsc/system_information.c<br>6 files changed, 76 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>index f2266e4..dac4ec5 100644</span><br><span>--- a/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>@@ -3370,12 +3370,17 @@</span><br><span> <param name='egprs' doc='EGPRS (EDGE) Enabled on this BTS' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='gprs 11bit_rach_support_for_egprs (0|1)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='no gprs egprs-packet-channel-request'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='no' doc='Negate a command or set its defaults' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='gprs' doc='GPRS Packet Network' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='egprs-packet-channel-request' doc='EGPRS Packet Channel Request support' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='gprs egprs-packet-channel-request'></span><br><span> <params></span><br><span> <param name='gprs' doc='GPRS Packet Network' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='11bit_rach_support_for_egprs' doc='11 bit RACH options' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='0' doc='Disable 11 bit RACH for EGPRS' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='1' doc='Enable 11 bit RACH for EGPRS' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='egprs-packet-channel-request' doc='EGPRS Packet Channel Request support' /></span><br><span> </params></span><br><span> </command></span><br><span> <command id='gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries|tsns-prov) <0-255>'></span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 2595174..9a1db07 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1150,7 +1150,6 @@</span><br><span> </span><br><span> /* Not entirely sure how ip.access specific this is */</span><br><span> struct {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t supports_egprs_11bit_rach;</span><br><span> enum bts_gprs_mode mode;</span><br><span> struct {</span><br><span> struct gsm_abis_mo mo;</span><br><span>@@ -1167,6 +1166,7 @@</span><br><span> uint8_t rac;</span><br><span> uint8_t net_ctrl_ord;</span><br><span> bool ctrl_ack_type_use_block;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool egprs_pkt_chan_request;</span><br><span> } gprs;</span><br><span> </span><br><span> /* threshold (in percent) when BTS shall send CCCH LOAD IND */</span><br><span>diff --git a/include/osmocom/bsc/rest_octets.h b/include/osmocom/bsc/rest_octets.h</span><br><span>index 2c1b162..7df66f7 100644</span><br><span>--- a/include/osmocom/bsc/rest_octets.h</span><br><span>+++ b/include/osmocom/bsc/rest_octets.h</span><br><span>@@ -82,7 +82,6 @@</span><br><span> uint32_t t3192; /* in milliseconds */</span><br><span> uint32_t drx_timer_max;/* in seconds */</span><br><span> uint32_t bs_cv_max;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t supports_egprs_11bit_rach;</span><br><span> bool ctrl_ack_type_use_block; /* use PACKET CONTROL ACKNOWLEDGMENT */</span><br><span> </span><br><span> uint8_t ext_info_present;</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index d3908be..f8bcee9 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -736,9 +736,6 @@</span><br><span> if (bts->gprs.mode == BTS_GPRS_NONE)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " gprs 11bit_rach_support_for_egprs %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.supports_egprs_11bit_rach, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> vty_out(vty, " gprs routing area %u%s", bts->gprs.rac,</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " gprs network-control-order nc%u%s",</span><br><span>@@ -772,6 +769,12 @@</span><br><span> vty_out(vty, " gprs nsvc %u remote ip %s%s", i,</span><br><span> inet_ntoa(ia), VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* EGPRS specific parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.mode == BTS_GPRS_EGPRS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.egprs_pkt_chan_request)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gprs egprs-packet-channel-request%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Write the model data if there is one */</span><br><span>@@ -3126,22 +3129,65 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_bts_gprs_11bit_rach_support_for_egprs,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_bts_gprs_11bit_rach_support_for_egprs,</span><br><span> cfg_bts_gprs_11bit_rach_support_for_egprs_cmd,</span><br><span> "gprs 11bit_rach_support_for_egprs (0|1)",</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_TEXT "11 bit RACH options\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Disable 11 bit RACH for EGPRS\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Enable 11 bit RACH for EGPRS\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_TEXT "EGPRS Packet Channel Request support\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable EGPRS Packet Channel Request support\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable EGPRS Packet Channel Request support\n")</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.supports_egprs_11bit_rach = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% 'gprs 11bit_rach_support_for_egprs' is now deprecated: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "use '[no] gprs egprs-packet-channel-request' instead%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE && bts->gprs.supports_egprs_11bit_rach) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.egprs_pkt_chan_request = (argv[0][0] == '1');</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.mode == BTS_GPRS_NONE && bts->gprs.egprs_pkt_chan_request) {</span><br><span> vty_out(vty, "%% (E)GPRS is not enabled (see 'gprs mode')%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.mode != BTS_GPRS_EGPRS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% EGPRS Packet Channel Request support requires "</span><br><span style="color: hsl(120, 100%, 40%);">+ "EGPRS mode to be enabled (see 'gprs mode')%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Do not return here, keep the old behaviour. */</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%);">+ return CMD_SUCCESS;</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%);">+DEFUN(cfg_bts_gprs_egprs_pkt_chan_req,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_gprs_egprs_pkt_chan_req_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "gprs egprs-packet-channel-request",</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_TEXT "EGPRS Packet Channel Request support")</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 (bts->gprs.mode != BTS_GPRS_EGPRS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% EGPRS Packet Channel Request support requires "</span><br><span style="color: hsl(120, 100%, 40%);">+ "EGPRS mode to be enabled (see 'gprs mode')%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ bts->gprs.egprs_pkt_chan_request = true;</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 style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bts_no_gprs_egprs_pkt_chan_req,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_no_gprs_egprs_pkt_chan_req_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no gprs egprs-packet-channel-request",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR GPRS_TEXT "EGPRS Packet Channel Request support")</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 (bts->gprs.mode != BTS_GPRS_EGPRS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% EGPRS Packet Channel Request support requires "</span><br><span style="color: hsl(120, 100%, 40%);">+ "EGPRS mode to be enabled (see 'gprs mode')%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ bts->gprs.egprs_pkt_chan_request = false;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -5406,6 +5452,8 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_radio_link_timeout_inf_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_mode_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_11bit_rach_support_for_egprs_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_no_gprs_egprs_pkt_chan_req_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_gprs_egprs_pkt_chan_req_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_ns_timer_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_rac_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_net_ctrl_ord_cmd);</span><br><span>diff --git a/src/osmo-bsc/rest_octets.c b/src/osmo-bsc/rest_octets.c</span><br><span>index 1d2279b..2238b08 100644</span><br><span>--- a/src/osmo-bsc/rest_octets.c</span><br><span>+++ b/src/osmo-bsc/rest_octets.c</span><br><span>@@ -822,13 +822,8 @@</span><br><span> /* EGPRS supported in the cell */</span><br><span> bitvec_set_bit(bv, 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 1bit EGPRS PACKET CHANNEL REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gco->supports_egprs_11bit_rach == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(bv,</span><br><span style="color: hsl(0, 100%, 40%);">- gco->ext_info.use_egprs_p_ch_req);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(bv, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1bit EGPRS PACKET CHANNEL REQUEST (inverted logic) */</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(bv, !gco->ext_info.use_egprs_p_ch_req);</span><br><span> </span><br><span> /* 4bit BEP PERIOD */</span><br><span> bitvec_set_uint(bv, gco->ext_info.bep_period, 4);</span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 6e58419..d5be3f2 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -1151,11 +1151,10 @@</span><br><span> .bs_cv_max = 15,</span><br><span> .ctrl_ack_type_use_block = true,</span><br><span> .ext_info_present = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .supports_egprs_11bit_rach = 0,</span><br><span> .ext_info = {</span><br><span> /* The values below are just guesses ! */</span><br><span> .egprs_supported = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .use_egprs_p_ch_req = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .use_egprs_p_ch_req = 0,</span><br><span> .bep_period = 5,</span><br><span> .pfc_supported = 0,</span><br><span> .dtm_supported = 0,</span><br><span>@@ -1197,8 +1196,12 @@</span><br><span> </span><br><span> /* Information about the other SIs */</span><br><span> si13_default.bcch_change_mark = bts->bcch_change_mark;</span><br><span style="color: hsl(0, 100%, 40%);">- si13_default.cell_opts.supports_egprs_11bit_rach =</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.supports_egprs_11bit_rach;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.egprs_pkt_chan_request)</span><br><span style="color: hsl(120, 100%, 40%);">+ si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0;</span><br><span> </span><br><span> ret = rest_octets_si13(si13->rest_octets, &si13_default);</span><br><span> if (ret < 0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17730">change 17730</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/+/17730"/><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: Ied5bd10a806aeeac65ef32339d4ab0e3700e5da9 </div>
<div style="display:none"> Gerrit-Change-Number: 17730 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>