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

[S] Change in osmocom-bb[master]: layer23: modem: Submit L1CTL-CCCH_READY.ind
by pespin 25 Jul '23

25 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33904 ) Change subject: layer23: modem: Submit L1CTL-CCCH_READY.ind ...................................................................... layer23: modem: Submit L1CTL-CCCH_READY.ind Signal RLC/MAC layer that the lower layers is in packet idle mode ready to use CCCH (such as packet-access-procedure). Change-Id: I05050e840a3b267b3b3a278588ee113b45bfbd4c --- M src/host/layer23/src/modem/grr.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index cf94695..f0bbf89 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -516,6 +516,10 @@ static void grr_st_packet_idle_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct osmocom_ms *ms = fi->priv; + struct osmo_gprs_rlcmac_prim *prim; + + prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_ready_ind(); + osmo_gprs_rlcmac_prim_lower_up(prim); modem_gprs_attach_if_needed(ms); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05050e840a3b267b3b3a278588ee113b45bfbd4c Gerrit-Change-Number: 33904 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: layer23: modem: Delay using cell until fully synced to it
by pespin 25 Jul '23

25 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33905 ) Change subject: layer23: modem: Delay using cell until fully synced to it ...................................................................... layer23: modem: Delay using cell until fully synced to it Change-Id: If306d82879281bb540c5cdee2eaf354858c8d24b --- M src/host/layer23/include/osmocom/bb/modem/modem.h M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/grr.c 3 files changed, 51 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/modem/modem.h b/src/host/layer23/include/osmocom/bb/modem/modem.h index 29d2571..7135bf7 100644 --- a/src/host/layer23/include/osmocom/bb/modem/modem.h +++ b/src/host/layer23/include/osmocom/bb/modem/modem.h @@ -4,6 +4,7 @@ int modem_start(void); int modem_gprs_attach_if_needed(struct osmocom_ms *ms); +int modem_sync_to_cell(struct osmocom_ms *ms); enum modem_state { MODEM_ST_IDLE, diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 6871384..08a1260 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -165,17 +165,38 @@ return 0; } +int modem_sync_to_cell(struct osmocom_ms *ms) +{ + struct gsm322_cellsel *cs = &ms->cellsel; + + if (cs->sync_pending) { + LOGP(DCS, LOGL_INFO, "Sync to ARFCN=%s, but there is a sync " + "already pending\n", gsm_print_arfcn(cs->arfcn)); + return 0; + } + + cs->sync_pending = true; + l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); + return l1ctl_tx_fbsb_req(ms, cs->arfcn, + L1CTL_FBSB_F_FB01SB, 100, 0, + cs->ccch_mode, dbm2rxlev(-85)); +} + static int global_signal_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { struct osmocom_ms *ms; + struct gsm322_cellsel *cs; + struct osmobb_fbsb_res *fr; if (subsys != SS_L1CTL) return 0; switch (signal) { case S_L1CTL_RESET: + LOGP(DCS, LOGL_NOTICE, "S_L1CTL_RESET\n"); ms = signal_data; + ms->cellsel.arfcn = ms->test_arfcn; if (ms->started) break; layer3_app_reset(); @@ -196,6 +217,22 @@ return l1ctl_tx_fbsb_req(ms, ms->test_arfcn, L1CTL_FBSB_F_FB01SB, 100, 0, CCCH_MODE_NONE, dbm2rxlev(-85)); + case S_L1CTL_FBSB_RESP: + LOGP(DCS, LOGL_NOTICE, "S_L1CTL_FBSB_RESP\n"); + fr = signal_data; + ms = fr->ms; + cs = &ms->cellsel; + cs->sync_pending = false; + break; + case S_L1CTL_FBSB_ERR: + LOGP(DCS, LOGL_NOTICE, "S_L1CTL_FBSB_ERR\n"); + fr = signal_data; + ms = fr->ms; + cs = &ms->cellsel; + cs->sync_pending = false; + /* Retry: */ + modem_sync_to_cell(ms); + break; } return 0; diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index f0bbf89..2047eef 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -482,6 +482,9 @@ const struct gsm322_cellsel *cs = &ms->cellsel; const struct gsm48_sysinfo *si = &cs->sel_si; + if (cs->sync_pending) /* FBSB in process */ + return false; + if (!si->si1 || !si->si3 || !si->si4 || !si->si13) return false; if (!si->gprs.supported) @@ -684,10 +687,7 @@ handle_pdch_block_ind(ms, (struct msgb *)data); break; case GRR_EV_PDCH_RELEASE_REQ: - l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); - l1ctl_tx_fbsb_req(ms, ms->test_arfcn, - L1CTL_FBSB_F_FB01SB, 100, 0, - ms->cellsel.ccch_mode, dbm2rxlev(-85)); + modem_sync_to_cell(ms); osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_IDLE, 0, 0); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If306d82879281bb540c5cdee2eaf354858c8d24b Gerrit-Change-Number: 33905 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Avoid direct transition ST_PACKET_TRANSFER->ST_PACKET...
by pespin 25 Jul '23

25 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33906 ) Change subject: layer23: modem: Avoid direct transition ST_PACKET_TRANSFER->ST_PACKET_IDLE ...................................................................... layer23: modem: Avoid direct transition ST_PACKET_TRANSFER->ST_PACKET_IDLE Right now the existing code is switching to state IDLE and hence running grr_st_packet_idle_onenter() which attempts stuff like starting an attach. This is all done while the L1CTL RESET + FBSB is still in progress. We should instead wait to receive confirmation from those. As an easy implementation for now, simply switch to the GRR_ST_PACKET_NOT_READY state, which will move to GRR_ST_PACKET_IDLE once it starts receiving CCCH blocks (aka it will already have gone through L1CTL RESET + FBSB completely). Change-Id: Ie797b36701d10c6052500c637a08b061bb1e4bd7 --- M src/host/layer23/src/modem/grr.c 1 file changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index 2047eef..12d7059 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -688,7 +688,7 @@ break; case GRR_EV_PDCH_RELEASE_REQ: modem_sync_to_cell(ms); - osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_IDLE, 0, 0); + osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_NOT_READY, 0, 0); break; default: OSMO_ASSERT(0); @@ -717,8 +717,7 @@ }, [GRR_ST_PACKET_TRANSFER] = { .name = "PACKET_TRANSFER", - .out_state_mask = S(GRR_ST_PACKET_NOT_READY) - | S(GRR_ST_PACKET_IDLE), + .out_state_mask = S(GRR_ST_PACKET_NOT_READY), .in_event_mask = S(GRR_EV_PDCH_UL_TBF_CFG_REQ) | S(GRR_EV_PDCH_DL_TBF_CFG_REQ) | S(GRR_EV_PDCH_BLOCK_REQ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie797b36701d10c6052500c637a08b061bb1e4bd7 Gerrit-Change-Number: 33906 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in osmocom-bb[master]: layer23: modem: implement GPRS-RR FSM
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33901 ) Change subject: layer23: modem: implement GPRS-RR FSM ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a7d85df7b07d85ac86e0b7e340f6bbacc65e1bc Gerrit-Change-Number: 33901 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:20:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Avoid direct transition ST_PACKET_TRANSFER->ST_PACKET...
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33906 ) Change subject: layer23: modem: Avoid direct transition ST_PACKET_TRANSFER->ST_PACKET_IDLE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie797b36701d10c6052500c637a08b061bb1e4bd7 Gerrit-Change-Number: 33906 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:20:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23: modem: Delay using cell until fully synced to it
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33905 ) Change subject: layer23: modem: Delay using cell until fully synced to it ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If306d82879281bb540c5cdee2eaf354858c8d24b Gerrit-Change-Number: 33905 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:19:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Submit L1CTL-CCCH_READY.ind
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33904 ) Change subject: layer23: modem: Submit L1CTL-CCCH_READY.ind ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05050e840a3b267b3b3a278588ee113b45bfbd4c Gerrit-Change-Number: 33904 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:19:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: trxcon: trx_if_cmd_poweron(): send CMD POWERON unconditionally
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33903 ) Change subject: trxcon: trx_if_cmd_poweron(): send CMD POWERON unconditionally ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I967ce047eb198f1eaf8446bb4c1f87a98d3de264 Gerrit-Change-Number: 33903 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:19:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: handle OSMO_GPRS_RLCMAC_L1CTL_PDCH_{ESTABLISH,RELEASE}
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33902 ) Change subject: modem: handle OSMO_GPRS_RLCMAC_L1CTL_PDCH_{ESTABLISH,RELEASE} ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic39ce696834943dc661c85cbf3d54ccd598b60ce Gerrit-Change-Number: 33902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:19:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmocom-bb[master]: layer23: modem: implement GPRS-RR FSM
by pespin 25 Jul '23

25 Jul '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33901 ) Change subject: layer23: modem: implement GPRS-RR FSM ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a7d85df7b07d85ac86e0b7e340f6bbacc65e1bc Gerrit-Change-Number: 33901 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jul 2023 08:19:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0