<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25436">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support configuring TA loop SACCH block rate<br><br>Similar to what is already provided for power control loops. However,<br>there's no existing way to communicate TA control parameters from the<br>BSC to the BTS, so implement them locally in BTS vty.<br><br>Related: SYS#5371<br>Change-Id: I9fa71f836bb9a79b0ef2567bfcfdf38ff217840b<br>---<br>M include/osmo-bts/bts_trx.h<br>M include/osmo-bts/gsm_data.h<br>M src/common/ta_control.c<br>M src/common/vty.c<br>M tests/osmo-bts.vty<br>M tests/ta_control/ta_control_test.c<br>6 files changed, 36 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h</span><br><span>index f033573..e1959c8 100644</span><br><span>--- a/include/osmo-bts/bts_trx.h</span><br><span>+++ b/include/osmo-bts/bts_trx.h</span><br><span>@@ -30,6 +30,7 @@</span><br><span> uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */</span><br><span> uint8_t c0_idle_power_red; /* in actual dB OC-2G only */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ta_ctrl_interval; /* 1 step is 2 SACCH periods */</span><br><span> </span><br><span> struct trx_power_params power_params;</span><br><span> struct gsm_power_ctrl_params *bs_dpc_params; /* BS Dynamic Power Control */</span><br><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index 0869426..9fe68d6 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -255,6 +255,8 @@</span><br><span> };</span><br><span> </span><br><span> struct lchan_ta_ctrl_state {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Number of SACCH blocks to skip */</span><br><span style="color: hsl(120, 100%, 40%);">+ int skip_block_num;</span><br><span> /* Currently requested TA */</span><br><span> uint8_t current;</span><br><span> };</span><br><span>diff --git a/src/common/ta_control.c b/src/common/ta_control.c</span><br><span>index fd49d60..025699c 100644</span><br><span>--- a/src/common/ta_control.c</span><br><span>+++ b/src/common/ta_control.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> /* Related specs: 3GPP TS 45.010 sections 5.5, 5.6 */</span><br><span> </span><br><span> #include <osmo-bts/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts_trx.h></span><br><span> #include <osmo-bts/logging.h></span><br><span> </span><br><span> /* 3GPP TS 45.010 sec 5.6.3 Delay assessment error:</span><br><span>@@ -48,7 +49,16 @@</span><br><span> int16_t new_ta;</span><br><span> /* Shall we skip current block based on configured interval? */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*TODO: implement P_CON_INTERVAL for TA loop */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TA control interval: how many blocks do we skip? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ta_ctrl.skip_block_num-- > 0)</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%);">+ /* Reset the number of SACCH blocks to be skipped:</span><br><span style="color: hsl(120, 100%, 40%);">+ * ctrl_interval=0 => 0 blocks to skip,</span><br><span style="color: hsl(120, 100%, 40%);">+ * ctrl_interval=1 => 1 blocks to skip,</span><br><span style="color: hsl(120, 100%, 40%);">+ * ctrl_interval=2 => 3 blocks to skip,</span><br><span style="color: hsl(120, 100%, 40%);">+ * so basically ctrl_interval * 2 - 1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1;</span><br><span> </span><br><span> int16_t delta_ta = toa256/256;</span><br><span> if (toa256 >= 0) {</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 62e2d70..f99881a 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -370,6 +370,8 @@</span><br><span> vty_out(vty, " ms-power-control %s%s",</span><br><span> trx->ms_pwr_ctl_soft ? "osmo" : "dsp",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ta-control interval %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ta_ctrl_interval, VTY_NEWLINE);</span><br><span> vty_out(vty, " phy %u instance %u%s", pinst->phy_link->num,</span><br><span> pinst->num, VTY_NEWLINE);</span><br><span> </span><br><span>@@ -1009,6 +1011,19 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ta_ctrl_interval, cfg_ta_ctrl_interval_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ta-control interval <0-31>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Timing Advance Control Parameters\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set TA control loop interval\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "As in P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds) (default=0, every SACCH block)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ta_ctrl_interval = atoi(argv[0]);</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> DEFUN(cfg_trx_phy, cfg_trx_phy_cmd,</span><br><span> "phy <0-255> instance <0-255>",</span><br><span> "Configure PHY Link+Instance for this TRX\n"</span><br><span>@@ -2487,6 +2502,7 @@</span><br><span> install_element(TRX_NODE, &cfg_trx_pr_step_size_cmd);</span><br><span> install_element(TRX_NODE, &cfg_trx_pr_step_interval_cmd);</span><br><span> install_element(TRX_NODE, &cfg_trx_ms_power_control_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(TRX_NODE, &cfg_ta_ctrl_interval_cmd);</span><br><span> install_element(TRX_NODE, &cfg_trx_phy_cmd);</span><br><span> </span><br><span> install_element(ENABLE_NODE, &bts_t_t_l_jitter_buf_cmd);</span><br><span>diff --git a/tests/osmo-bts.vty b/tests/osmo-bts.vty</span><br><span>index 4873030..fb74747 100644</span><br><span>--- a/tests/osmo-bts.vty</span><br><span>+++ b/tests/osmo-bts.vty</span><br><span>@@ -284,6 +284,7 @@</span><br><span> power-ramp step-size <1-100000> (dB|mdB)</span><br><span> power-ramp step-interval <1-100></span><br><span> ms-power-control (dsp|osmo)</span><br><span style="color: hsl(120, 100%, 40%);">+ ta-control interval <0-31></span><br><span> phy <0-255> instance <0-255></span><br><span> ...</span><br><span> OsmoBTS(trx)# ?</span><br><span>@@ -291,5 +292,6 @@</span><br><span> user-gain Inform BTS about additional, user-provided gain or attenuation at TRX output</span><br><span> power-ramp Power-Ramp settings</span><br><span> ms-power-control Mobile Station Power Level Control</span><br><span style="color: hsl(120, 100%, 40%);">+ ta-control Timing Advance Control Parameters</span><br><span> phy Configure PHY Link+Instance for this TRX</span><br><span> ...</span><br><span>diff --git a/tests/ta_control/ta_control_test.c b/tests/ta_control/ta_control_test.c</span><br><span>index 200fd31..253491a 100644</span><br><span>--- a/tests/ta_control/ta_control_test.c</span><br><span>+++ b/tests/ta_control/ta_control_test.c</span><br><span>@@ -26,10 +26,13 @@</span><br><span> #include <osmo-bts/logging.h></span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> #include <osmo-bts/ta_control.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts_trx.h></span><br><span> </span><br><span> void lchan_ms_ta_ctrl_test(int16_t toa256_start, unsigned int steps)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan lchan = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx trx = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts ts = { .trx = &trx };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan lchan = { .ts = &ts };</span><br><span> unsigned int i;</span><br><span> uint8_t rqd_ta_after;</span><br><span> uint8_t rqd_ta_before;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25436">change 25436</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/+/25436"/><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: I9fa71f836bb9a79b0ef2567bfcfdf38ff217840b </div>
<div style="display:none"> Gerrit-Change-Number: 25436 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>