<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/14896">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Introduce VTY command osmotrx trxd-max-version<br><br>This command allows setting a maximum TRXD format version to negotiate<br>with TRX. osmo-bts-trx will hence end up using that version if supported<br>by TRX, or a lower one otherwise (or fail if TRX doesn't support any of<br>them).<br>Since now the maximum version can be 0, avoid going through SETFORMAT<br>negotiation in that case, since 0 is the default version. This way we<br>keep backward compatibility with TRX implementations that exit upon<br>receival of unknown commands (such as SC5 current one).<br><br>The VTY command is located in the "phy" node instead of the "phy<br>instance" node because instances of same phy are expected to use same<br>host with same implementation, so TRXD version to use should be the same<br>for both.<br><br>Related: OS#4006<br>Change-Id: I5eb1fdc002f9d7f4acf475356d8fc998dc8f6326<br>---<br>M include/osmo-bts/phy_link.h<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/trx_vty.c<br>4 files changed, 36 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index 273103c..3bf5159 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -50,6 +50,7 @@</span><br><span> uint32_t clock_advance;</span><br><span> uint32_t rts_advance;</span><br><span> bool use_legacy_setbsic;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trxd_hdr_ver_max; /* Maximum TRXD header version to negotiate */</span><br><span> } osmotrx;</span><br><span> struct {</span><br><span> char *mcast_dev; /* Network device for multicast */</span><br><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index 9c1dc18..22ef2d7 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -185,6 +185,7 @@</span><br><span> int l1if_provision_transceiver_trx(struct trx_l1h *l1h)</span><br><span> {</span><br><span> uint8_t tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_link *plink = l1h->phy_inst->phy_link;</span><br><span> </span><br><span> if (!transceiver_available)</span><br><span> return -EIO;</span><br><span>@@ -208,10 +209,11 @@</span><br><span> l1h->config.bsic_sent = 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Ask transceiver to use the newest TRXD header version */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!l1h->config.setformat_sent) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx_if_cmd_setformat(l1h, TRX_DATA_FORMAT_VER);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.trxd_hdr_ver_req = TRX_DATA_FORMAT_VER;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ask transceiver to use the newest TRXD header version if not using it yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!l1h->config.setformat_sent &&</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max;</span><br><span> l1h->config.setformat_sent = 1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 9529190..b1fa207 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -134,6 +134,8 @@</span><br><span> plink->u.osmotrx.trx_ta_loop = true;</span><br><span> plink->u.osmotrx.trx_ms_power_loop = false;</span><br><span> plink->u.osmotrx.trx_target_rssi = -10;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* attempt use newest TRXD version by default: */</span><br><span style="color: hsl(120, 100%, 40%);">+ plink->u.osmotrx.trxd_hdr_ver_max = TRX_DATA_FORMAT_VER;</span><br><span> }</span><br><span> </span><br><span> void bts_model_phy_instance_set_defaults(struct phy_instance *pinst)</span><br><span>diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c</span><br><span>index b9af445..c52908e 100644</span><br><span>--- a/src/osmo-bts-trx/trx_vty.c</span><br><span>+++ b/src/osmo-bts-trx/trx_vty.c</span><br><span>@@ -496,6 +496,29 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_phy_trxd_max_version, cfg_phy_trxd_max_version_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "osmotrx trxd-max-version (latest|<0-15>)", OSMOTRX_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set maximum TRXD format version to negotiate with TRX\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Use latest supported TRXD format version (default)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Maximum TRXD format version number\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_link *plink = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ int max_ver;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], "latest") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ max_ver = TRX_DATA_FORMAT_VER;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ max_ver = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (max_ver > TRX_DATA_FORMAT_VER) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Format version %d is not supported, maximum supported is %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ max_ver, TRX_DATA_FORMAT_VER, 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%);">+ plink->u.osmotrx.trxd_hdr_ver_max = max_ver;</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> void bts_model_config_write_phy(struct vty *vty, struct phy_link *plink)</span><br><span> {</span><br><span> if (plink->u.osmotrx.local_ip)</span><br><span>@@ -525,6 +548,9 @@</span><br><span> </span><br><span> if (plink->u.osmotrx.use_legacy_setbsic)</span><br><span> vty_out(vty, " osmotrx legacy-setbsic%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (plink->u.osmotrx.trxd_hdr_ver_max != TRX_DATA_FORMAT_VER)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmotrx trxd-max-version %d%s", plink->u.osmotrx.trxd_hdr_ver_max, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> void bts_model_config_write_phy_inst(struct vty *vty, struct phy_instance *pinst)</span><br><span>@@ -584,6 +610,7 @@</span><br><span> install_element(PHY_NODE, &cfg_phy_osmotrx_ip_cmd);</span><br><span> install_element(PHY_NODE, &cfg_phy_setbsic_cmd);</span><br><span> install_element(PHY_NODE, &cfg_phy_no_setbsic_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(PHY_NODE, &cfg_phy_trxd_max_version_cmd);</span><br><span> </span><br><span> install_element(PHY_INST_NODE, &cfg_phyinst_rxgain_cmd);</span><br><span> install_element(PHY_INST_NODE, &cfg_phyinst_tx_atten_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/14896">change 14896</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/+/14896"/><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: I5eb1fdc002f9d7f4acf475356d8fc998dc8f6326 </div>
<div style="display:none"> Gerrit-Change-Number: 14896 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>