laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38078?usp=email )
Change subject: Log unsupported PCUIF for bts > 255 ......................................................................
Log unsupported PCUIF for bts > 255
Since the "struct gsm_pcu_if"->bts_nr is still uint8_t, that means only the first 256 configured BTS can properly make use of the PCUIF interface and hence have gprs support.
This is not a major problem as long as the BTS connected to osmo-bsc are of type osmo-bts, since usually those use a BTS co-located osmo-pcu, hence on each one bts_nr=0.
But if we wanted to run them with osmo-bsc PCU co-located, (eg rbs2000), then we'd need to extend the PCUIF interface.
Related: OS#6565 Related: SYS#7062 Change-Id: If5a8cd94195422989de3daa04be7ffc858c0a8eb --- M src/osmo-bsc/pcu_sock.c 1 file changed, 14 insertions(+), 0 deletions(-)
Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 83513f6..02a3d84 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -367,6 +367,10 @@ return; if (!bsc_co_located_pcu(bts)) return; + if (bts->nr > 0xff) { /* OS#6565 */ + LOG_BTS(bts, DPCU, LOGL_ERROR, "bts id > 255 cannot be configured over PCUIF! GPRS won't work for this BTS!"); + return; + }
/* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the * PDCH before we announce the other BTS related parameters. */ @@ -429,6 +433,11 @@ return -EINVAL; }
+ if (bts->nr > 0xff) { /* OS#6565 */ + LOG_BTS(bts, DPCU, LOGL_ERROR, "CHAN RQD(GPRS) on bts id > 255 cannot be sent over PCUIF! GPRS won't work for this BTS!"); + return -EINVAL; + } + LOG_BTS(bts, DPCU, LOGL_INFO, "Sending RACH indication: qta=%d, ra=%d, " "fn=%d\n", qta, ra, fn);
@@ -887,6 +896,11 @@ struct gsm_bts_trx *trx; int j;
+ if (bts->nr > 0xff) { /* OS#6565 */ + LOG_BTS(bts, DPCU, LOGL_ERROR, "bts id > 255 cannot be configured over PCUIF! GPRS won't work for this BTS!"); + return; + } + /* activate PDCH */ llist_for_each_entry(trx, &bts->trx_list, list) { for (j = 0; j < ARRAY_SIZE(trx->ts); j++) {
-
laforge