<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17448">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">virtphy: Delay response between L1SAP_PM_REQ and L1SAP_PM_CONF<br><br>Change-Id: I443b5512c4966c232107aeb73e1fd8b83335d63d<br>---<br>M src/host/virt_phy/include/virtphy/virt_l1_model.h<br>M src/host/virt_phy/src/virt_prim_pm.c<br>2 files changed, 29 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/17448/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/virt_phy/include/virtphy/virt_l1_model.h b/src/host/virt_phy/include/virtphy/virt_l1_model.h</span><br><span>index 99ad39f..ffed708 100644</span><br><span>--- a/src/host/virt_phy/include/virtphy/virt_l1_model.h</span><br><span>+++ b/src/host/virt_phy/include/virtphy/virt_l1_model.h</span><br><span>@@ -100,6 +100,12 @@</span><br><span> uint8_t arfcn_sig_lev_red_dbm[1024];</span><br><span> struct osmo_timer_list arfcn_sig_lev_timers[1024];</span><br><span> } meas;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn_from;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn_to;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* timer between receiving PM_REQ and responding with PM_CONF */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list timer;</span><br><span style="color: hsl(120, 100%, 40%);">+ } req;</span><br><span> } pm;</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/host/virt_phy/src/virt_prim_pm.c b/src/host/virt_phy/src/virt_prim_pm.c</span><br><span>index 6d11f49..561f6ce 100644</span><br><span>--- a/src/host/virt_phy/src/virt_prim_pm.c</span><br><span>+++ b/src/host/virt_phy/src/virt_prim_pm.c</span><br><span>@@ -84,25 +84,36 @@</span><br><span> struct l1_state_ms *l1s = &ms->state;</span><br><span> struct l1ctl_hdr *l1h = (struct l1ctl_hdr *) msg->data;</span><br><span> struct l1ctl_pm_req *pm_req = (struct l1ctl_pm_req *) l1h->data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* just parse the data from the request here */</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s->pm.req.band_arfcn_from = ntohs(pm_req->range.band_arfcn_from);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1s->pm.req.band_arfcn_to = ntohs(pm_req->range.band_arfcn_to);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPMS(DL1C, LOGL_INFO, ms, "Rx L1CTL_PM_REQ TYPE=%u, FROM=%d, TO=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pm_req->type, l1s->pm.req.band_arfcn_from, l1s->pm.req.band_arfcn_to);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* generating the response will happen delayed in a timer, as otherwise</span><br><span style="color: hsl(120, 100%, 40%);">+ * we will respond too fast, and 'mobile' will run havoc in a busy loop issuing</span><br><span style="color: hsl(120, 100%, 40%);">+ * endless PM_REQ until a cell eventually isfound */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&l1s->pm.req.timer, 0, 300000);</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%);">+static void pm_conf_timer_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1_model_ms *ms = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct l1_state_ms *l1s = &ms->state;</span><br><span> struct msgb *resp_msg = l1ctl_msgb_alloc(L1CTL_PM_CONF);</span><br><span> uint16_t arfcn_next;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* convert to host order */</span><br><span style="color: hsl(0, 100%, 40%);">- pm_req->range.band_arfcn_from = ntohs(pm_req->range.band_arfcn_from);</span><br><span style="color: hsl(0, 100%, 40%);">- pm_req->range.band_arfcn_to = ntohs(pm_req->range.band_arfcn_to);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPMS(DL1C, LOGL_INFO, ms, "Rx L1CTL_PM_REQ TYPE=%u, FROM=%d, TO=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pm_req->type, pm_req->range.band_arfcn_from, pm_req->range.band_arfcn_to);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (arfcn_next = pm_req->range.band_arfcn_from;</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_next <= pm_req->range.band_arfcn_to; ++arfcn_next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (arfcn_next = l1s->pm.req.band_arfcn_from;</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn_next <= l1s->pm.req.band_arfcn_to; ++arfcn_next) {</span><br><span> struct l1ctl_pm_conf *pm_conf = (struct l1ctl_pm_conf *) msgb_put(resp_msg, sizeof(*pm_conf));</span><br><span> pm_conf->band_arfcn = htons(arfcn_next);</span><br><span> /* set min and max to the value calculated for that</span><br><span> * arfcn (IGNORE UPLINKK AND PCS AND OTHER FLAGS) */</span><br><span> pm_conf->pm[0] = dbm2rxlev(l1s->pm.meas.arfcn_sig_lev_dbm[arfcn_next & ARFCN_NO_FLAGS_MASK]);</span><br><span> pm_conf->pm[1] = dbm2rxlev(l1s->pm.meas.arfcn_sig_lev_dbm[arfcn_next & ARFCN_NO_FLAGS_MASK]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (arfcn_next == pm_req->range.band_arfcn_to) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (arfcn_next == l1s->pm.req.band_arfcn_to) {</span><br><span> struct l1ctl_hdr *resp_l1h = msgb_l1(resp_msg);</span><br><span> resp_l1h->flags |= L1CTL_F_DONE;</span><br><span> }</span><br><span>@@ -137,6 +148,7 @@</span><br><span> l1s->pm.meas.arfcn_sig_lev_timers[i].cb = prim_pm_timer_cb;</span><br><span> l1s->pm.meas.arfcn_sig_lev_timers[i].data = &l1s->pm.meas.arfcn_sig_lev_dbm[i];</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&l1s->pm.req.timer, pm_conf_timer_cb, model);</span><br><span> }</span><br><span> </span><br><span> void prim_pm_exit(struct l1_model_ms *model)</span><br><span>@@ -146,4 +158,5 @@</span><br><span> </span><br><span> for (i = 0; i < 1024; ++i)</span><br><span> osmo_timer_del(&l1s->pm.meas.arfcn_sig_lev_timers[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&l1s->pm.req.timer);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17448">change 17448</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/osmocom-bb/+/17448"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I443b5512c4966c232107aeb73e1fd8b83335d63d </div>
<div style="display:none"> Gerrit-Change-Number: 17448 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>