March 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmocom-bb[master]: modem: move GRR specific code into its own file
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31654 ) Change subject: modem: move GRR specific code into its own file ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: To me all this is not really grr, grr would be between LLC and RLC/MAC. This would be more something like lc1ctl_grr, since its between RLC/MAC and L1CTL :) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I25caa0bd01e3d090803512f5b13cad58439f44f8 Gerrit-Change-Number: 31654 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 16:22:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: modem: get rid of app_data.chan_req, use ms->rrlayer
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31653 ) Change subject: modem: get rid of app_data.chan_req, use ms->rrlayer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I77d0a834a73c511f157c6f1524b9e98df3f4def4 Gerrit-Change-Number: 31653 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 16:20:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31652 ) Change subject: modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib711a3b893c43c0875c431c90cd0a2ebfafe1926 Gerrit-Change-Number: 31652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 16:19:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23: implement Rx/Tx API for GPRS related messages
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31571 ) Change subject: layer23: implement Rx/Tx API for GPRS related messages ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b Gerrit-Change-Number: 31571 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 16:18:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31651 ) Change subject: trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iee5ee404f1eb77091c388a641d0a78d01a8d7e7f Gerrit-Change-Number: 31651 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 16:16:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: trxcon: move l1ctl_proto.h to 'include/osmocom/bb/'
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31333 ) Change subject: trxcon: move l1ctl_proto.h to 'include/osmocom/bb/' ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2101b20637f837038115497873bd905f95a3d0c2 Gerrit-Change-Number: 31333 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 15:57:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: support multiple BTS (in theory)
by pespin 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31649 ) Change subject: pcu_l1_if_phy: support multiple BTS (in theory) ...................................................................... Patch Set 5: (1 comment) File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/31649/comment/06f3e2a6_33053754 PS4, Line 735: LOGP(DL1IF, LOGL_ERROR, "more then one BTS regsitered at this PCU. This PCU has only been tested with one BTS! OS#5930\n"); > Done wtf, you only fixed the indentation..... -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I33518cbbe83f7f8c071afa5e995d30930099ba92 Gerrit-Change-Number: 31649 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 15:53:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
by fixeria 03 Mar '23

03 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 to look at the new patch set (#3). Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... modem: route L1CTL prims to/from libosmo-gprs-rlcmac Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Related: OS#5500 --- M src/host/layer23/src/modem/rlcmac.c 1 file changed, 71 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/31572/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmocom-bb[master]: modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel
by fixeria 03 Mar '23

03 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31652 ) Change subject: modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel ...................................................................... modem: get rid of app_data.{ccch_mode,si}, use ms->cellsel Change-Id: Ib711a3b893c43c0875c431c90cd0a2ebfafe1926 Related: OS#5500 --- M src/host/layer23/src/modem/app_modem.c 1 file changed, 37 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/31652/1 diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index b55768f..17ba59e 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -60,8 +60,6 @@ static struct { struct osmocom_ms *ms; - enum ccch_mode ccch_mode; - struct gsm48_sysinfo si; /* TODO: use mobile->rrlayer API instead */ struct { @@ -132,19 +130,20 @@ static int modem_tx_chan_req(struct osmocom_ms *ms, bool single_block) { + struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_rrlayer *rr = &ms->rrlayer; OSMO_ASSERT(rr->state == GSM48_RR_ST_IDLE); - if (!app_data.si.si1 || !app_data.si.si13) + if (!cs->sel_si.si1 || !cs->sel_si.si13) return -EAGAIN; - if (!app_data.si.gprs.supported) + if (!cs->sel_si.gprs.supported) return -ENOTSUP; rr->cr_ra = gen_chan_req(single_block); LOGP(DRR, LOGL_NOTICE, "Sending CHANNEL REQUEST (0x%02x)\n", rr->cr_ra); l1ctl_tx_rach_req(ms, RSL_CHAN_RACH, 0x00, rr->cr_ra, 0, - app_data.ccch_mode == CCCH_MODE_COMBINED); + cs->ccch_mode == CCCH_MODE_COMBINED); rr->state = GSM48_RR_ST_CONN_PEND; return 0; @@ -152,14 +151,15 @@ static int handle_si1(struct osmocom_ms *ms, struct msgb *msg) { + struct gsm322_cellsel *cs = &ms->cellsel; int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si1_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si1_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo1(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo1(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) { LOGP(DRR, LOGL_ERROR, "Failed to decode SI1 message\n"); return rc; @@ -170,75 +170,78 @@ static int handle_si3(struct osmocom_ms *ms, struct msgb *msg) { + struct gsm322_cellsel *cs = &ms->cellsel; int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si3_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si3_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo3(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo3(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) { LOGP(DRR, LOGL_ERROR, "Failed to decode SI3 message\n"); return rc; } - if (app_data.ccch_mode == CCCH_MODE_NONE) { - if (app_data.si.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) - app_data.ccch_mode = CCCH_MODE_COMBINED; + if (cs->ccch_mode == CCCH_MODE_NONE) { + if (cs->sel_si.ccch_conf == RSL_BCCH_CCCH_CONF_1_C) + cs->ccch_mode = CCCH_MODE_COMBINED; else - app_data.ccch_mode = CCCH_MODE_NON_COMBINED; - l1ctl_tx_ccch_mode_req(ms, app_data.ccch_mode); + cs->ccch_mode = CCCH_MODE_NON_COMBINED; + l1ctl_tx_ccch_mode_req(ms, cs->ccch_mode); } - if (!app_data.si.gprs.supported) { + if (!cs->sel_si.gprs.supported) { LOGP(DRR, LOGL_NOTICE, "SI3 Rest Octets IE contains no GPRS Indicator\n"); return 0; } LOGP(DRR, LOGL_NOTICE, "Found GPRS Indicator (RA Colour %u, SI13 on BCCH %s)\n", - app_data.si.gprs.ra_colour, app_data.si.gprs.si13_pos ? "Ext" : "Norm"); + cs->sel_si.gprs.ra_colour, cs->sel_si.gprs.si13_pos ? "Ext" : "Norm"); return 0; } static int handle_si4(struct osmocom_ms *ms, struct msgb *msg) { + struct gsm322_cellsel *cs = &ms->cellsel; int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si4_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si4_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo4(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo4(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) { LOGP(DRR, LOGL_ERROR, "Failed to decode SI4 message\n"); return rc; } - if (!app_data.si.gprs.supported) { + if (!cs->sel_si.gprs.supported) { LOGP(DRR, LOGL_NOTICE, "SI4 Rest Octets IE contains no GPRS Indicator\n"); return 0; } LOGP(DRR, LOGL_NOTICE, "Found GPRS Indicator (RA Colour %u, SI13 on BCCH %s)\n", - app_data.si.gprs.ra_colour, app_data.si.gprs.si13_pos ? "Ext" : "Norm"); + cs->sel_si.gprs.ra_colour, cs->sel_si.gprs.si13_pos ? "Ext" : "Norm"); return 0; } static int handle_si13(struct osmocom_ms *ms, struct msgb *msg) { - int rc; struct osmo_gprs_rlcmac_prim *rlcmac_prim; + struct gsm322_cellsel *cs = &ms->cellsel; + int rc; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; - if (!memcmp(&app_data.si.si13_msg[0], msgb_l3(msg), msgb_l3len(msg))) + if (!memcmp(&cs->sel_si.si13_msg[0], msgb_l3(msg), msgb_l3len(msg))) return 0; /* this message is already handled */ - rc = gsm48_decode_sysinfo13(&app_data.si, msgb_l3(msg), msgb_l3len(msg)); + rc = gsm48_decode_sysinfo13(&cs->sel_si, msgb_l3(msg), msgb_l3len(msg)); if (rc != 0) return rc; @@ -332,7 +335,7 @@ unsigned int arfcn = i & 1023; unsigned int k; - if (~app_data.si.freq[arfcn].mask & 0x01) + if (~ms->cellsel.sel_si.freq[arfcn].mask & 0x01) continue; k = ia->mob_alloc_len - (j >> 3) - 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib711a3b893c43c0875c431c90cd0a2ebfafe1926 Gerrit-Change-Number: 31652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC
by fixeria 03 Mar '23

03 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31651 ) Change subject: trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC ...................................................................... trxcon: do not send DATA.cnf for L1SCHED_DT_TRAFFIC The event TRXCON_EV_TX_DATA_CNF is not premitted in state TRXCON_ST_PACKET_DATA, and is not of any use for l1gprs. Change-Id: Iee5ee404f1eb77091c388a641d0a78d01a8d7e7f Related: OS#5500 --- M src/host/trxcon/src/trxcon_shim.c 1 file changed, 18 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/31651/1 diff --git a/src/host/trxcon/src/trxcon_shim.c b/src/host/trxcon/src/trxcon_shim.c index f8b1872..dbf4962 100644 --- a/src/host/trxcon/src/trxcon_shim.c +++ b/src/host/trxcon/src/trxcon_shim.c @@ -151,7 +151,6 @@ const struct l1sched_lchan_desc *lchan_desc; struct l1sched_state *sched = lchan->ts->sched; struct trxcon_inst *trxcon = sched->priv; - bool is_traffic = false; const uint8_t *data; uint8_t ra_buf[2]; size_t data_len; @@ -160,14 +159,15 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; switch (dt) { - case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - is_traffic = true; - /* fall-through */ + data_len = lchan->prim->payload_len; + data = lchan->prim->payload; + break; /* do not send DATA.cnf */ case L1SCHED_DT_SIGNALING: + case L1SCHED_DT_TRAFFIC: { struct trxcon_param_tx_data_cnf cnf = { - .traffic = is_traffic, + .traffic = (dt == L1SCHED_DT_TRAFFIC), .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, .band_arfcn = trxcon->l1p.band_arfcn, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iee5ee404f1eb77091c388a641d0a78d01a8d7e7f Gerrit-Change-Number: 31651 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0