<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20606">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lte: update UHD device args for MIMO usage<br><br>the USRP B210 device args were not ideal for MIMO configs for<br>both Amarisoft and srsLTE.<br><br>Change-Id: I3785bb96eb7c10a6b10b3d1a86fa71d1f787a7a3<br>---<br>M src/osmo_gsm_tester/obj/enb_amarisoft.py<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>3 files changed, 47 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/06/20606/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>index 5b8e05e..4495f47 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>@@ -183,16 +183,24 @@</span><br><span> rf_dev_args = values['enb'].get('rf_dev_args', '')</span><br><span> rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if self._num_prb < 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(0, 100%, 40%);">- elif self._num_prb == 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(0, 100%, 40%);">- elif self._num_prb > 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._txmode == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ # SISO config</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb < 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._num_prb == 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ''</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # MIMO config</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb == 6:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if self._num_prb > 50:</span><br><span style="color: hsl(0, 100%, 40%);">- # Reduce over the wire format to sc12</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += ',otw_format=sc12'</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb > 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Reduce over the wire format to sc12</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',otw_format=sc12'</span><br><span> </span><br><span> config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index ec2d1fc..ad92af5 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -207,12 +207,23 @@</span><br><span> rf_dev_args = values['enb'].get('rf_dev_args', '')</span><br><span> rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if self._num_prb < 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(0, 100%, 40%);">- elif self._num_prb == 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(0, 100%, 40%);">- elif self._num_prb > 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb == 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'master_clock_rate=15.36e6,'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._txmode <= 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ # SISO config</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb < 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._num_prb == 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ''</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # MIMO config</span><br><span> rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb > 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Reduce over the wire format to sc12</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',otw_format=sc12'</span><br><span> </span><br><span> config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 701794f..22e110d 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -306,12 +306,21 @@</span><br><span> rf_dev_args = values['ue'].get('rf_dev_args', '')</span><br><span> rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if self.enb.num_prb() < 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(0, 100%, 40%);">- elif self.enb.num_prb() == 25:</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(0, 100%, 40%);">- elif self.enb.num_prb() > 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_prb() == 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'master_clock_rate=15.36e6,'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_ports() == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ # SISO config</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_prb() < 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_prb() == 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ''</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # MIMO config</span><br><span> rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span style="color: hsl(120, 100%, 40%);">+ # For the UE the otw12 format doesn't seem to work very well</span><br><span> </span><br><span> config.overlay(values, dict(ue=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20606">change 20606</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-gsm-tester/+/20606"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3785bb96eb7c10a6b10b3d1a86fa71d1f787a7a3 </div>
<div style="display:none"> Gerrit-Change-Number: 20606 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>