Change in ...osmo-bts[master]: Move Access Burst link quality handling to L1SAP

[fixeria]

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/14687


Change subject: Move Access Burst link quality handling to L1SAP
......................................................................

Move Access Burst link quality handling to L1SAP

Change-Id: I893ec9c6c2ebad71ea68b2dc5f9f5094dfc43b78
Depends: (libosmocore) Ie2a66ebd040b61d6daf49e04bf8a84d3d64764ee
---
M src/common/l1sap.c
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-oc2g/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
M src/osmo-bts-trx/scheduler_trx.c
5 files changed, 14 insertions(+), 18 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/14687/1

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 79af8e2..f07e79c 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1272,6 +1272,14 @@
 		return false;
 	}
 
+	/* Link quality defined by C/I (Carrier-to-Interference ratio) */
+	if (rach_ind->lqual_cb < bts->min_qual_rach) {
+		LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring RACH request: "
+			"link quality (%d) below the minimum (%d)\n",
+			rach_ind->lqual_cb, bts->min_qual_rach);
+		return false;
+	}
+
 	return true;
 }
 
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 77b72bd..5c969f0 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -1003,12 +1003,6 @@
 	int rc;
 	struct ph_rach_ind_param rach_ind_param;
 
-	/* FIXME: this should be deprecated/obsoleted as it bypasses rach.busy counting */
-	if (ra_ind->measParam.fLinkQuality * 10 < bts->min_qual_rach) {
-		msgb_free(l1p_msg);
-		return 0;
-	}
-
 	dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);
 
 	if ((ra_ind->msgUnitParam.u8Size != 1) &&
@@ -1029,6 +1023,7 @@
 		.rssi = (int8_t) ra_ind->measParam.fRssi,
 		.ber10k = (unsigned int) (ra_ind->measParam.fBer * 10000.0),
 		.acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,
+		.lqual_cb = ra_ind->measParam.fLinkQuality * 10, /* centiBels */
 	};
 
 	lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ra_ind->hLayer2);
diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c
index 9affc89..7df4147 100644
--- a/src/osmo-bts-oc2g/l1_if.c
+++ b/src/osmo-bts-oc2g/l1_if.c
@@ -1059,12 +1059,6 @@
 	int rc;
 	struct ph_rach_ind_param rach_ind_param;
 
-	/* FIXME: this should be deprecated/obsoleted as it bypasses rach.busy counting */
-	if (ra_ind->measParam.fLinkQuality * 10 < bts->min_qual_rach) {
-		msgb_free(l1p_msg);
-		return 0;
-	}
-
 	dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);
 
 	if ((ra_ind->msgUnitParam.u8Size != 1) &&
@@ -1085,6 +1079,7 @@
 		.rssi = (int8_t) ra_ind->measParam.fRssi,
 		.ber10k = (unsigned int) (ra_ind->measParam.fBer * 10000.0),
 		.acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,
+		.lqual_cb = ra_ind->measParam.fLinkQuality * 10, /* centiBels */
 	};
 
 	lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ra_ind->hLayer2);
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 975bd34..9c28e3a 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -997,12 +997,6 @@
 	int rc;
 	struct ph_rach_ind_param rach_ind_param;
 
-	/* FIXME: this should be deprecated/obsoleted as it bypasses rach.busy counting */
-	if (ra_ind->measParam.fLinkQuality * 10 < bts->min_qual_rach) {
-		msgb_free(l1p_msg);
-		return 0;
-	}
-
 	dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);
 
 	if ((ra_ind->msgUnitParam.u8Size != 1) &&
@@ -1024,6 +1018,7 @@
 		.rssi = (int8_t) ra_ind->measParam.fRssi,
 		.ber10k = (unsigned int) (ra_ind->measParam.fBer * 10000.0),
 		.acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,
+		.lqual_cb = ra_ind->measParam.fLinkQuality * 10, /* centiBels */
 	};
 
 	lchan = l1if_hLayer_to_lchan(trx, ra_ind->hLayer2);
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index b10ca26..56483f3 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -816,6 +816,9 @@
 	l1sap.u.rach_ind.rssi = bi->rssi;
 	l1sap.u.rach_ind.fn = bi->fn;
 
+	/* FIXME: check for TRX_BI_F_CI_CB, and use the value from UL.ind */
+	l1sap.u.rach_ind.lqual_cb = l1t->trx->bts->min_qual_rach;
+
 	/* Decode RACH depending on its synch. sequence */
 	switch (synch_seq) {
 	case RACH_SYNCH_SEQ_TS1:

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14687
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I893ec9c6c2ebad71ea68b2dc5f9f5094dfc43b78
Gerrit-Change-Number: 14687
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190707/07ebec66/attachment.htm>