- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: gscon clear: without SCCP conn, no need to wait for RLSD timeout
by fixeria 12 Jan '22

12 Jan '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26615 ) Change subject: gscon clear: without SCCP conn, no need to wait for RLSD timeout ...................................................................... gscon clear: without SCCP conn, no need to wait for RLSD timeout Skip the BSSMAP Clear and SCCP RLSD parts and immediately deallocate the gscon when there is no SCCP connection present. Before this patch, such conn would stick around for a minute before a timeout deallocates it. Related: OS#5337 Change-Id: I8c8537acf6b47b121903197608636c43ae601a57 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 1b5f372..2183b18 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -210,6 +210,10 @@ gscon_release_lchans(conn, true, bsc_gsm48_rr_cause_from_gsm0808_cause(conn->clear_cause)); osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint); + + /* If there is no SCCP connection at all, then no need to wait for an SCCP RLSD. */ + if (!conn->sccp.msc || conn->sccp.state != SUBSCR_SCCP_ST_CONNECTED) + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); } /* forward MO DTAP from RSL side to BSSAP side */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8c8537acf6b47b121903197608636c43ae601a57 Gerrit-Change-Number: 26615 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: fix gscon clear 3/n: separate state for SCCP RLSD
by fixeria 12 Jan '22

12 Jan '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26614 ) Change subject: fix gscon clear 3/n: separate state for SCCP RLSD ...................................................................... fix gscon clear 3/n: separate state for SCCP RLSD Properly implement the separate conn release stages in separate FSM states: x) sent Clear Request, wait for a Clear Command from the MSC. Timeout after a configurable 60s. y) after a Clear Command and sending a Clear Complete, wait for the SCCP RLSD. Timeout after a configurable 60s. z) terminate after the RLSD is received / after timeout. handover_test.c needs a little tweak to make the MGCP release work with its fake MGCP client, because cleanup now ensures to invoke gscon_forget_mgw_endpoint() in all cases. Related: I680ec4ed866aa5f0b1ff29e7e98322615cfb288d (osmo-ttcn3-hacks) Related: OS#5337 Change-Id: Ie975117d37f38ba853589dc7f8d3e94f8f9586b2 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c M tests/handover/handover_test.c 2 files changed, 75 insertions(+), 54 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index e33fe43..1b5f372 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -67,7 +67,8 @@ ST_ASSIGNMENT, ST_HANDOVER, /* BSSMAP CLEAR has been received */ - ST_CLEARING, + ST_WAIT_CLEAR_CMD, + ST_WAIT_SCCP_RLSD, }; static const struct value_string gscon_fsm_event_names[] = { @@ -95,7 +96,8 @@ struct osmo_tdef_state_timeout conn_fsm_timeouts[32] = { [ST_WAIT_CC] = { .T = -3210 }, - [ST_CLEARING] = { .T = -4 }, + [ST_WAIT_CLEAR_CMD] = { .T = -4 }, + [ST_WAIT_SCCP_RLSD] = { .T = -4 }, }; /* Transition to a state, using the T timer defined in conn_fsm_timeouts. @@ -143,44 +145,71 @@ { /* already clearing? */ switch (conn->fi->state) { - case ST_CLEARING: + case ST_WAIT_CLEAR_CMD: + case ST_WAIT_SCCP_RLSD: return; default: break; } conn->clear_cause = cause; - conn_fsm_state_chg(ST_CLEARING); + conn_fsm_state_chg(ST_WAIT_CLEAR_CMD); } -static void gscon_fsm_clearing_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +static void gscon_fsm_wait_clear_cmd_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct msgb *resp; int rc; struct gsm_subscriber_connection *conn = fi->priv; enum gsm0808_cause cause = conn->clear_cause; - if (conn->rx_clear_command) { - LOGPFSML(conn->fi, LOGL_DEBUG, "Not sending BSSMAP CLEAR REQUEST, already got CLEAR COMMAND from MSC\n"); - return; - } - if (!conn->sccp.msc) { LOGPFSML(fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message, no MSC for this conn\n"); - return; + goto nothing_sent; } LOGPFSML(fi, LOGL_DEBUG, "Tx BSSMAP CLEAR REQUEST(%s) to MSC\n", gsm0808_cause_name(cause)); resp = gsm0808_create_clear_rqst(cause); if (!resp) { LOGPFSML(fi, LOGL_ERROR, "Unable to compose BSSMAP Clear Request message\n"); - return; + goto nothing_sent; } rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST)); rc = osmo_bsc_sigtran_send(conn, resp); - if (rc < 0) + if (rc < 0) { LOGPFSML(conn->fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message\n"); + goto nothing_sent; + } + return; + +nothing_sent: + /* Normally, we request a CLEAR from the MSC and terminate as soon as the CLEAR COMMAND has been issued by the + * MSC. But if we are trying to clear without being able to send anything to the MSC, we might as well shut down + * the conn right away now. */ + conn_fsm_state_chg(ST_WAIT_SCCP_RLSD); +} + +void gscon_fsm_wait_sccp_rlsd_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gsm_subscriber_connection *conn = fi->priv; + + /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel + * release to be completed or for the guard timer to expire before returning the + * CLEAR COMPLETE message" */ + if (!gscon_sigtran_send(conn, gsm0808_create_clear_complete())) + rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE)); + + /* Give the handover_fsm a chance to book this as handover success before tearing down everything, + * making it look like a sudden death failure. */ + if (conn->ho.fi) + osmo_fsm_inst_dispatch(conn->ho.fi, HO_EV_CONN_RELEASING, NULL); + + if (conn->lcs.loc_req) + osmo_fsm_inst_dispatch(conn->lcs.loc_req->fi, LCS_LOC_REQ_EV_CONN_CLEAR, NULL); + + gscon_release_lchans(conn, true, bsc_gsm48_rr_cause_from_gsm0808_cause(conn->clear_cause)); + osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint); } /* forward MO DTAP from RSL side to BSSAP side */ @@ -682,13 +711,13 @@ .name = "INIT", .in_event_mask = S(GSCON_EV_MO_COMPL_L3) | S(GSCON_EV_A_CONN_IND) | S(GSCON_EV_HANDOVER_END), - .out_state_mask = S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_CLEARING), + .out_state_mask = S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), .action = gscon_fsm_init, }, [ST_WAIT_CC] = { .name = "WAIT_CC", .in_event_mask = S(GSCON_EV_A_CONN_CFM), - .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING), + .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), .action = gscon_fsm_wait_cc, }, [ST_ACTIVE] = { @@ -698,27 +727,32 @@ | S(GSCON_EV_LCS_LOC_REQ_END) | S(GSCON_EV_MO_COMPL_L3) , - .out_state_mask = S(ST_CLEARING) | S(ST_ASSIGNMENT) | + .out_state_mask = S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD) | S(ST_ASSIGNMENT) | S(ST_HANDOVER), .action = gscon_fsm_active, }, [ST_ASSIGNMENT] = { .name = "ASSIGNMENT", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_ASSIGNMENT_END), - .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING), + .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), .action = gscon_fsm_assignment, }, [ST_HANDOVER] = { .name = "HANDOVER", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_HANDOVER_END), - .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING), + .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), .action = gscon_fsm_handover, }, - [ST_CLEARING] = { - .name = "CLEARING", - .onenter = gscon_fsm_clearing_onenter, - /* dead end state */ - }, + [ST_WAIT_CLEAR_CMD] = { + .name = "WAIT_CLEAR_CMD", + .onenter = gscon_fsm_wait_clear_cmd_onenter, + .out_state_mask = S(ST_WAIT_SCCP_RLSD), + }, + [ST_WAIT_SCCP_RLSD] = { + .name = "WAIT_SCCP_RLSD", + .onenter = gscon_fsm_wait_sccp_rlsd_onenter, + .in_event_mask = S(GSCON_EV_HANDOVER_END), + }, }; void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan) @@ -848,44 +882,19 @@ static void gscon_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_subscriber_connection *conn = fi->priv; - const enum gsm0808_cause *cause_0808; const struct tlv_parsed *tp; struct osmo_mobile_identity mi_imsi; /* Regular allstate event processing */ switch (event) { case GSCON_EV_A_CLEAR_CMD: - conn->rx_clear_command = true; - - /* Give the handover_fsm a chance to book this as handover success before tearing down everything, - * making it look like a sudden death failure. */ - if (conn->ho.fi) - osmo_fsm_inst_dispatch(conn->ho.fi, HO_EV_CONN_RELEASING, NULL); - - if (conn->lcs.loc_req) - osmo_fsm_inst_dispatch(conn->lcs.loc_req->fi, LCS_LOC_REQ_EV_CONN_CLEAR, NULL); - OSMO_ASSERT(data); - cause_0808 = data; - /* MSC tells us to cleanly shut down */ - if (conn->fi->state != ST_CLEARING) - osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, -4); - LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true, bsc_gsm48_rr_cause_from_gsm0808_cause(*cause_0808)); - /* FIXME: Release all terestrial resources in ST_CLEARING */ - /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel - * release to be completed or for the guard timer to expire before returning the - * CLEAR COMPLETE message" */ - - /* Close MGCP connections */ - osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint); - - rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE)); - gscon_sigtran_send(conn, gsm0808_create_clear_complete()); + conn->clear_cause = *(const enum gsm0808_cause *)data; + conn_fsm_state_chg(ST_WAIT_SCCP_RLSD); break; case GSCON_EV_A_DISC_IND: - /* MSC or SIGTRAN network has hard-released SCCP connection, - * terminate the FSM now. */ + /* MSC or SIGTRAN network has hard-released SCCP connection, terminate the FSM now. + * Cleanup is done in gscon_pre_term() and gscon_cleanup(). */ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, data); break; case GSCON_EV_FORGET_MGW_ENDPOINT: @@ -975,6 +984,13 @@ osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint); conn->user_plane.mgw_endpoint = NULL; + conn->user_plane.mgw_endpoint = NULL; + + if (conn->ho.fi) + osmo_fsm_inst_dispatch(conn->ho.fi, HO_EV_CONN_RELEASING, NULL); + + if (conn->lcs.loc_req) + osmo_fsm_inst_dispatch(conn->lcs.loc_req->fi, LCS_LOC_REQ_EV_CONN_CLEAR, NULL); if (conn->lcls.fi) { /* request termination of LCLS FSM */ @@ -1013,8 +1029,9 @@ case -4: /* The MSC has sent a BSSMAP Clear Command, we acknowledged that, but the conn was never * disconnected. */ - LOGPFSML(fi, LOGL_ERROR, "Long after a BSSMAP Clear Command, the conn is still not" - " released. For sanity, discarding this conn now.\n"); + LOGPFSML(fi, LOGL_ERROR, "Long after expecting %s, the conn is still not" + " released. For sanity, discarding this conn now.\n", + fi->state == ST_WAIT_CLEAR_CMD ? "BSSMAP Clear Command" : "SCCP RLSD"); a_reset_conn_fail(conn->sccp.msc); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); break; diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 17bc048..dd2f16a 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1710,3 +1710,7 @@ }; return &ret; } +struct mgcp_client *osmo_mgcpc_ep_client(const struct osmo_mgcpc_ep *ep) +{ + return NULL; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie975117d37f38ba853589dc7f8d3e94f8f9586b2 Gerrit-Change-Number: 26614 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: fix gscon clear 3/n: separate state for SCCP RLSD
by fixeria 12 Jan '22

12 Jan '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26614 ) Change subject: fix gscon clear 3/n: separate state for SCCP RLSD ...................................................................... Patch Set 3: Code-Review+2 Re-applying my CR+1, summing up votes, merging. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie975117d37f38ba853589dc7f8d3e94f8f9586b2 Gerrit-Change-Number: 26614 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jan 2022 16:55:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: bsc: Fix test TC_rll_sapi_n_reject_dlci_cc expectancies
by pespin 12 Jan '22

12 Jan '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26890 ) Change subject: bsc: Fix test TC_rll_sapi_n_reject_dlci_cc expectancies ...................................................................... bsc: Fix test TC_rll_sapi_n_reject_dlci_cc expectancies Cause GSM0808_CAUSE_MS_NOT_EQUIPPED is to be transmitted only in the case BSC receives a RelInd from the MS/BTS. In this test, an ErrorInd is sent, as in TC_rll_err_ind_sapi_n_reject, so it is expected that the BSC will send the N_Reject message with cause GSM0808_CAUSE_BSS_NOT_EQUIPPED. Related: OS#4728 Related: SYS#5047 Fixes: 999ceb66373a93c0ab5adf14b313187789288c53 Change-Id: Ieebe3465b31d98fcae0e2c1993477c5021c99b3b --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/26890/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 7bfc387..0dd4440 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2591,7 +2591,7 @@ /* MS sends unexpected ERROR INDication on DCCH/ACCH SAPI=3 */ f_ipa_tx(0, ts_RSL_ERROR_IND(dt.rsl_chan_nr, ts_RslLinkID_DCCH(3), ''O)); - f_exp_sapi_n_reject(3, GSM0808_CAUSE_MS_NOT_EQUIPPED, '10'B); + f_exp_sapi_n_reject(3, GSM0808_CAUSE_BSS_NOT_EQUIPPED, '10'B); /* Clean up the connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieebe3465b31d98fcae0e2c1993477c5021c99b3b Gerrit-Change-Number: 26890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 6

Change in osmo-bsc[master]: fix gscon clear 3/n: separate state for SCCP RLSD
by pespin 12 Jan '22

12 Jan '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26614 ) Change subject: fix gscon clear 3/n: separate state for SCCP RLSD ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie975117d37f38ba853589dc7f8d3e94f8f9586b2 Gerrit-Change-Number: 26614 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jan 2022 16:50:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: fix gscon clear 3/n: separate state for SCCP RLSD
by fixeria 12 Jan '22

12 Jan '22

fixeria has uploaded a new patch set (#3) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26614 ) Change subject: fix gscon clear 3/n: separate state for SCCP RLSD ...................................................................... fix gscon clear 3/n: separate state for SCCP RLSD Properly implement the separate conn release stages in separate FSM states: x) sent Clear Request, wait for a Clear Command from the MSC. Timeout after a configurable 60s. y) after a Clear Command and sending a Clear Complete, wait for the SCCP RLSD. Timeout after a configurable 60s. z) terminate after the RLSD is received / after timeout. handover_test.c needs a little tweak to make the MGCP release work with its fake MGCP client, because cleanup now ensures to invoke gscon_forget_mgw_endpoint() in all cases. Related: I680ec4ed866aa5f0b1ff29e7e98322615cfb288d (osmo-ttcn3-hacks) Related: OS#5337 Change-Id: Ie975117d37f38ba853589dc7f8d3e94f8f9586b2 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c M tests/handover/handover_test.c 2 files changed, 75 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/26614/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie975117d37f38ba853589dc7f8d3e94f8f9586b2 Gerrit-Change-Number: 26614 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-hnbgw[master]: osmo-hnbgw.cfg: update example configuration
by dexter 12 Jan '22

12 Jan '22

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26798 ) Change subject: osmo-hnbgw.cfg: update example configuration ...................................................................... osmo-hnbgw.cfg: update example configuration The shipped example configuration lacks the configuration of the co-located MGW. Lets update the sample configu file. Change-Id: I1e2e4cf6f44cf0934123ca213acc3d98d0d463b3 Related: OS#5152 --- M doc/examples/osmo-hnbgw/osmo-hnbgw.cfg 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/98/26798/1 diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg index 9286b2a..3a1c670 100644 --- a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg @@ -23,3 +23,7 @@ iuh local-ip 0.0.0.0 hnbap-allow-tmsi 1 + mgcp + mgw remote-ip 127.0.0.1 + mgw remote-port 2427 + mgw reset-endpoint rtpbridge/* -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/26798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1e2e4cf6f44cf0934123ca213acc3d98d0d463b3 Gerrit-Change-Number: 26798 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 4

Change in osmo-e1-hardware[master]: icE1usb fw: Update E1 core start/stop procedure
by tnt 12 Jan '22

12 Jan '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26854 ) Change subject: icE1usb fw: Update E1 core start/stop procedure ...................................................................... icE1usb fw: Update E1 core start/stop procedure Previously we were just doing a hard reset, calling init again. And to stop, it was a bit harsh as well, just calling init with 0 as argument, not cleaning pending descriptors and such. Now, the HW is initialized once and there is proper startup and shutdown procedure, leaving things in the proper state. Init of e1 hardware (call to e1_init) is also delegated to usb_e1 since it's that module that handles all state changes and config so it makes sense it handles init too rather than calling it from fw_app.c Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I639f90ce3488a1a08e87854e74e0586010264f5d --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h M firmware/ice40-riscv/icE1usb/fw_app.c M firmware/ice40-riscv/icE1usb/usb_e1.c 4 files changed, 87 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/54/26854/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 964b0bc..d7b1577 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -226,10 +226,11 @@ // ---------- enum e1_pipe_state { - IDLE = 0, /* not yet initialized */ - BOOT = 1, /* after e1_init(), regiters are programmed */ - RUN = 2, /* normal operation */ - RECOVER = 3, /* after underflow, overflow or alignment error */ + IDLE = 0, /* not running */ + STARTING = 1, /* after e1_start(), waiting for priming */ + RUN = 2, /* normal operation */ + RECOVER = 3, /* after underflow, overflow or alignment error */ + SHUTDOWN = 4, /* after e1_stop(), waiting for shutdown */ }; struct e1_state { @@ -324,8 +325,8 @@ e1f_init(&e1->tx.fifo, (512 * port) + 256, 256); /* Flow state */ - e1->rx.state = BOOT; - e1->tx.state = BOOT; + e1->rx.state = IDLE; + e1->tx.state = IDLE; /* Set config registers */ e1->rx.cr.cfg = rx_cr & RXCR_PERMITTED; @@ -357,6 +358,48 @@ e1_regs->tx.csr = e1->tx.cr.val; } +void +e1_start(int port) +{ + volatile struct e1_core *e1_regs = _get_regs(port); + struct e1_state *e1 = _get_state(port); + + /* Checks */ + while ((e1->rx.state == SHUTDOWN) || (e1->tx.state == SHUTDOWN)) + e1_poll(port); + + if ((e1->rx.state != IDLE) || (e1->tx.state != IDLE)) + panic("Invalid E1 hardware state (port=%d, rxs=%d, txs=%d)", + port, e1->rx.state, e1->tx.state); + + /* Clear FIFOs */ + e1f_reset(&e1->rx.fifo); + e1f_reset(&e1->tx.fifo); + + /* Flow state */ + e1->rx.state = STARTING; + e1->tx.state = STARTING; + + /* Update CRs */ + _e1_update_cr_val(port); + + e1_regs->rx.csr = e1->rx.cr.val | E1_RX_CR_OVFL_CLR ; + e1_regs->tx.csr = e1->tx.cr.val | E1_TX_CR_UNFL_CLR ; +} + +void +e1_stop(int port) +{ + struct e1_state *e1 = _get_state(port); + + /* Flow state */ + e1->rx.state = SHUTDOWN; + e1->tx.state = SHUTDOWN; + + /* Nothing else to do, e1_poll will stop submitting data and + * transition to IDLE when everything in-flight is done */ +} + unsigned int e1_rx_need_data(int port, unsigned int usb_addr, unsigned int max_frames, unsigned int *pos) { @@ -512,7 +555,7 @@ } /* Boot procedure */ - if (e1->tx.state == BOOT) { + if (e1->tx.state == STARTING) { if (e1f_unseen_frames(&e1->tx.fifo) < (16 * 5)) return; /* HACK: LED flow status */ @@ -521,6 +564,20 @@ } /* Handle RX */ + /* Bypass if OFF */ + if (e1->rx.state == IDLE) + goto done_rx; + + /* Shutdown */ + if (e1->rx.state == SHUTDOWN) { + if (e1->rx.in_flight == 0) { + e1->rx.state = IDLE; + _e1_update_cr_val(port); + e1_regs->rx.csr = e1->rx.cr.val; + } + goto done_rx; + } + /* Misalign ? */ if (e1->rx.state == RUN) { if (!(e1_regs->rx.csr & E1_RX_SR_ALIGNED)) { @@ -562,6 +619,20 @@ done_rx: /* Handle TX */ + /* Bypass if OFF */ + if (e1->tx.state == IDLE) + return; + + /* Shutdown */ + if (e1->tx.state == SHUTDOWN) { + if (e1->tx.in_flight == 0) { + e1->tx.state = IDLE; + _e1_update_cr_val(port); + e1_regs->tx.csr = e1->tx.cr.val; + } + return; + } + /* Underflow ? */ if (e1->tx.state == RUN) { if (e1_regs->tx.csr & E1_TX_SR_UNFL) { diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index a44c319..0ed43c4 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -11,6 +11,9 @@ /* control */ void e1_init(int port, uint16_t rx_cr, uint16_t tx_cr); +void e1_start(int port); +void e1_stop(int port); + void e1_poll(int port); void e1_debug_print(int port, bool data); diff --git a/firmware/ice40-riscv/icE1usb/fw_app.c b/firmware/ice40-riscv/icE1usb/fw_app.c index f531d08..5e9812c 100644 --- a/firmware/ice40-riscv/icE1usb/fw_app.c +++ b/firmware/ice40-riscv/icE1usb/fw_app.c @@ -101,8 +101,6 @@ usb_e1_init(); /* Start */ - e1_init(0, 0, 0); - e1_init(1, 0, 0); led_state(true); usb_connect(); diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 9dc6f1d..96ca72a 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -289,15 +289,12 @@ switch (usb_e1->running) { case false: /* Disable E1 rx/tx */ - e1_init(port, 0, 0); + e1_stop(port); break; case true: /* Reset and Re-Enable E1 */ - e1_init(port, - _rx_config_reg(&rx_cfg_default), - _tx_config_reg(&tx_cfg_default) - ); + e1_start(port); /* Reset BDI */ usb_e1->in_bdi = 0; @@ -464,11 +461,15 @@ void usb_e1_init(void) { + uint32_t rx_cr = _rx_config_reg(&rx_cfg_default); + uint32_t tx_cr = _tx_config_reg(&tx_cfg_default); + for (int i=0; i<2; i++) { struct usb_e1_state *usb_e1 = _get_state(i); memset(usb_e1, 0x00, sizeof(struct usb_e1_state)); usb_e1->tx_cfg = tx_cfg_default; usb_e1->rx_cfg = rx_cfg_default; + e1_init(i, rx_cr, tx_cr); } usb_register_function_driver(&_e1_drv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I639f90ce3488a1a08e87854e74e0586010264f5d Gerrit-Change-Number: 26854 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange

2 5

Change in osmo-e1-hardware[master]: icE1usb fw: E1 core config update depending on state
by tnt 12 Jan '22

12 Jan '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26853 ) Change subject: icE1usb fw: E1 core config update depending on state ...................................................................... icE1usb fw: E1 core config update depending on state Store Rx/Tx config separately so we can change some of the config bit depending on current state while still keeping what the user asked for. Not really used ATM since state is never IDLE, but for future use. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I0b4cbf88abc4af801054ba5d6779dede5649852a --- M firmware/ice40-riscv/icE1usb/e1.c 1 file changed, 50 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/53/26853/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 09bc6d2..964b0bc 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -234,14 +234,20 @@ struct e1_state { struct { - uint32_t cr; + struct { + uint32_t cfg; + uint32_t val; + } cr; struct e1_fifo fifo; int in_flight; enum e1_pipe_state state; } rx; struct { - uint32_t cr; + struct { + uint32_t cfg; + uint32_t val; + } cr; struct e1_fifo fifo; int in_flight; enum e1_pipe_state state; @@ -280,6 +286,30 @@ E1_TX_CR_LOOPBACK | \ E1_TX_CR_LOOPBACK_CROSS ) +static void +_e1_update_cr_val(int port) +{ + struct e1_state *e1 = _get_state(port); + + /* RX */ + if (e1->rx.state == IDLE) { + /* "Off" state: Force MFA mode to detect remote side */ + e1->rx.cr.val = (e1->rx.cr.cfg & ~E1_RX_CR_MODE_MASK) | E1_RX_CR_ENABLE | E1_RX_CR_MODE_MFA; + } else { + /* "On state: Enabled + User config */ + e1->rx.cr.val = e1->rx.cr.cfg | E1_RX_CR_ENABLE; + } + + /* TX */ + if (e1->tx.state == IDLE) { + /* "Off" state: We TX only OIS */ + e1->tx.cr.val = (e1->tx.cr.cfg & ~(E1_TX_CR_MODE_MASK | E1_TX_CR_ALARM)) | E1_TX_CR_ENABLE | E1_TX_CR_MODE_TRSP; + } else { + /* "On state: Enabled + User config */ + e1->tx.cr.val = e1->tx.cr.cfg | E1_TX_CR_ENABLE; + } +} + void e1_init(int port, uint16_t rx_cr, uint16_t tx_cr) { @@ -293,17 +323,18 @@ e1f_init(&e1->rx.fifo, (512 * port) + 0, 256); e1f_init(&e1->tx.fifo, (512 * port) + 256, 256); - /* Enable Rx */ - e1->rx.cr = E1_RX_CR_ENABLE | (rx_cr & RXCR_PERMITTED); - e1_regs->rx.csr = E1_RX_CR_OVFL_CLR | e1->rx.cr; - - /* Enable Tx */ - e1->tx.cr = E1_TX_CR_ENABLE | (tx_cr & TXCR_PERMITTED); - e1_regs->tx.csr = E1_TX_CR_UNFL_CLR | e1->tx.cr; - - /* State */ + /* Flow state */ e1->rx.state = BOOT; e1->tx.state = BOOT; + + /* Set config registers */ + e1->rx.cr.cfg = rx_cr & RXCR_PERMITTED; + e1->tx.cr.cfg = tx_cr & TXCR_PERMITTED; + + _e1_update_cr_val(port); + + e1_regs->rx.csr = e1->rx.cr.val; + e1_regs->tx.csr = e1->tx.cr.val; } void @@ -311,8 +342,9 @@ { volatile struct e1_core *e1_regs = _get_regs(port); struct e1_state *e1 = _get_state(port); - e1->rx.cr = (e1->rx.cr & ~RXCR_PERMITTED) | (cr & RXCR_PERMITTED); - e1_regs->rx.csr = e1->rx.cr; + e1->rx.cr.cfg = cr & RXCR_PERMITTED; + _e1_update_cr_val(port); + e1_regs->rx.csr = e1->rx.cr.val; } void @@ -320,8 +352,9 @@ { volatile struct e1_core *e1_regs = _get_regs(port); struct e1_state *e1 = _get_state(port); - e1->tx.cr = (e1->tx.cr & ~TXCR_PERMITTED) | (cr & TXCR_PERMITTED); - e1_regs->tx.csr = e1->tx.cr; + e1->tx.cr.cfg = cr & TXCR_PERMITTED; + _e1_update_cr_val(port); + e1_regs->tx.csr = e1->tx.cr.val; } unsigned int @@ -523,7 +556,7 @@ /* Clear overflow if needed */ if (e1->rx.state != RUN) { - e1_regs->rx.csr = e1->rx.cr | E1_RX_CR_OVFL_CLR; + e1_regs->rx.csr = e1->rx.cr.val | E1_RX_CR_OVFL_CLR; e1->rx.state = RUN; } done_rx: @@ -554,7 +587,7 @@ /* Clear underflow if needed */ if (e1->tx.state != RUN) { - e1_regs->tx.csr = e1->tx.cr | E1_TX_CR_UNFL_CLR; + e1_regs->tx.csr = e1->tx.cr.val | E1_TX_CR_UNFL_CLR; e1->tx.state = RUN; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I0b4cbf88abc4af801054ba5d6779dede5649852a Gerrit-Change-Number: 26853 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange

2 2

Change in osmo-e1-hardware[master]: icE1usb fw: Add _MASK version for multibit fields in config regs
by tnt 12 Jan '22

12 Jan '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26847 ) Change subject: icE1usb fw: Add _MASK version for multibit fields in config regs ...................................................................... icE1usb fw: Add _MASK version for multibit fields in config regs This is a bit cleaner when masking in/out those rather than using the specific vaue that has all bits set. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: If2ca8efff37cb8fd1f1841656537ea8ad11ef55c --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1_hw.h 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/47/26847/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index af59f14..a9feea0 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -290,11 +290,11 @@ } #define TXCR_PERMITTED ( \ - E1_TX_CR_MODE_TS0_CRC_E | \ - E1_TX_CR_TICK_REMOTE | \ - E1_TX_CR_ALARM | \ + E1_TX_CR_MODE_MASK | \ + E1_TX_CR_TICK_MASK | \ + E1_TX_CR_ALARM | \ E1_TX_CR_LOOPBACK | \ - E1_TX_CR_LOOPBACK_CROSS ) + E1_TX_CR_LOOPBACK_CROSS ) void e1_tx_config(int port, uint16_t cr) @@ -306,7 +306,7 @@ } #define RXCR_PERMITTED ( \ - E1_RX_CR_MODE_MFA ) + E1_RX_CR_MODE_MASK ) void e1_rx_config(int port, uint16_t cr) diff --git a/firmware/ice40-riscv/icE1usb/e1_hw.h b/firmware/ice40-riscv/icE1usb/e1_hw.h index 9227cc7..73cbd88 100644 --- a/firmware/ice40-riscv/icE1usb/e1_hw.h +++ b/firmware/ice40-riscv/icE1usb/e1_hw.h @@ -27,6 +27,7 @@ #define E1_RX_CR_MODE_BYTE (1 << 1) /* Request byte-level alignment */ #define E1_RX_CR_MODE_BFA (2 << 1) /* Request Basic Frame Alignment */ #define E1_RX_CR_MODE_MFA (3 << 1) /* Request Multi-Frame Alignment */ +#define E1_RX_CR_MODE_MASK (3 << 1) #define E1_RX_CR_OVFL_CLR (1 << 12) /* Clear Rx overflow condition */ /* E1 receiver status register */ @@ -44,8 +45,10 @@ #define E1_TX_CR_MODE_TS0 (1 << 1) /* Generate TS0 in framer */ #define E1_TX_CR_MODE_TS0_CRC (2 << 1) /* Generate TS0 + CRC4 in framer */ #define E1_TX_CR_MODE_TS0_CRC_E (3 << 1) /* Generate TS0 + CRC4 + E-bits (based on Rx) in framer */ +#define E1_TX_CR_MODE_MASK (3 << 1) #define E1_TX_CR_TICK_LOCAL (0 << 3) /* use local clock for Tx */ #define E1_TX_CR_TICK_REMOTE (1 << 3) /* use recovered remote clock for Tx */ +#define E1_TX_CR_TICK_MASK (1 << 3) #define E1_TX_CR_ALARM (1 << 4) /* indicate ALARM to remote */ #define E1_TX_CR_LOOPBACK (1 << 5) /* external loopback enable/diasble */ #define E1_TX_CR_LOOPBACK_CROSS (1 << 6) /* source of loopback: local (0) or other (1) port */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: If2ca8efff37cb8fd1f1841656537ea8ad11ef55c Gerrit-Change-Number: 26847 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 4

2026

2025

2024

2023

2022

gerrit-log