- gerrit-log - lists.osmocom.org

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Remove local usb_cdc_notif_serial_state struct
by tnt 07 Mar '24

07 Mar '24

tnt has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36184?usp=email ) Change subject: icE1usb fw: Remove local usb_cdc_notif_serial_state struct ...................................................................... Abandoned merged into another change -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36184?usp=email 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: I1788a95eea7db5391f52e36ba4c39c6cddf194ba Gerrit-Change-Number: 36184 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2usb
by tnt 07 Mar '24

07 Mar '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email to look at the new patch set (#2). Change subject: gateware/cores: Update no2usb ...................................................................... gateware/cores: Update no2usb Mostly to get firmware code fixes Need some code adaptation in icE1usb firmware to remove local usb_cdc_notif_serial_state struct sine tt's included in no2usb cdc proto header now. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I13e186627077c57329e4a83da11acc01ca5dce35 --- M firmware/ice40-riscv/icE1usb/usb_gps.c M gateware/cores/no2usb 2 files changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/83/36183/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email 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: I13e186627077c57329e4a83da11acc01ca5dce35 Gerrit-Change-Number: 36183 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[L] Change in libosmo-sccp[master]: Revert "xua + ipa: Add support for I/O in OSMO_IO mode"
by laforge 07 Mar '24

07 Mar '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36187?usp=email ) Change subject: Revert "xua + ipa: Add support for I/O in OSMO_IO mode" ...................................................................... Revert "xua + ipa: Add support for I/O in OSMO_IO mode" This reverts commit d4ec8e7f9f90c99e3d01765ee63d21a158ec67dd which caused severe regressions in the TTCN-3 tests: All STP_Tests_M3UA are failing, as are STP_Tests.* and SCCP_Tests_RAW.TC_process_rx_ludt Change-Id: I708a5fe0481b14e1b0cdc86149ffc86ee7b5be59 --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 4 files changed, 248 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/87/36187/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0c3e87e..7785711 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,4 +17,3 @@ libosmo-sigtran API added osmo_ss7_asp_get_trans_proto() libosmo-sigtran API added osmo_ss7_asp_{find2,find_or_create2}() libosmo-sigtran API added osmo_ss7_xua_server_{find2,create2}() -libosmo-netif >1.4.0 osmo_io SCTP support diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index c5a2fc5..5bab5ff 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -601,11 +601,10 @@ talloc_free(asp); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); -static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int xua_cli_read_cb(struct osmo_stream_cli *conn); +static int ipa_cli_read_cb(struct osmo_stream_cli *conn); +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn); static int xua_cli_connect_cb(struct osmo_stream_cli *cli); -static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp) { @@ -643,27 +642,22 @@ osmo_stream_cli_set_proto(asp->client, asp->cfg.trans_proto); osmo_stream_cli_set_reconnect_timeout(asp->client, 5); osmo_stream_cli_set_connect_cb(asp->client, xua_cli_connect_cb); - osmo_stream_cli_set_disconnect_cb(asp->client, xua_cli_close_and_reconnect); switch (asp->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_TCP); - osmo_stream_cli_set_read_cb2(asp->client, ipa_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_read_cb(asp->client, ipa_cli_read_cb); break; case OSMO_SS7_ASP_PROT_M3UA: - if (asp->cfg.trans_proto == IPPROTO_SCTP) { - osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, NULL); - } else if (asp->cfg.trans_proto == IPPROTO_TCP) { - osmo_stream_cli_set_read_cb2(asp->client, m3ua_tcp_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, xua_tcp_segmentation_cb); - } else + if (asp->cfg.trans_proto == IPPROTO_SCTP) + osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); + else if (asp->cfg.trans_proto == IPPROTO_TCP) + osmo_stream_cli_set_read_cb(asp->client, m3ua_tcp_cli_read_cb); + else OSMO_ASSERT(0); break; default: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_SCTP); - osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); break; } osmo_stream_cli_set_data(asp->client, asp); @@ -795,11 +789,33 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn) { int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct msgb *msg = NULL; + int rc; + OSMO_ASSERT(fd >= 0); + + /* read IPA message from socket and process it */ + rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); + LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", + __func__, rc); + if (rc <= 0) { + if (rc == -EAGAIN) { + /* more data needed */ + return 0; + } + osmo_stream_srv_destroy(conn); + return rc; + } + if (osmo_ipa_process_msg(msg) < 0) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); + osmo_stream_srv_destroy(conn); + msgb_free(msg); + return -1; + } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -808,14 +824,19 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct msgb *msg = m3ua_msgb_alloc("xUA Server Rx"); unsigned int ppid; int flags; - int rc = 0; + int rc; - /* process the received xUA message */ + if (!msg) + return -ENOMEM; + + /* read xUA message from socket and process it */ + rc = osmo_stream_srv_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", @@ -834,6 +855,22 @@ default: break; } + + if (rc == 0) { + osmo_stream_srv_destroy(conn); + rc = -EBADF; + } else { + rc = 0; + } + goto out; + } + if (rc < 0) { + osmo_stream_srv_destroy(conn); + rc = -EBADF; + goto out; + } else if (rc == 0) { + osmo_stream_srv_destroy(conn); + rc = -EBADF; goto out; } @@ -853,38 +890,73 @@ return rc; } -int xua_tcp_segmentation_cb(struct msgb *msg) -{ - const struct xua_common_hdr *hdr; - size_t msg_length; - - if (msgb_length(msg) < sizeof(*hdr)) - return -EAGAIN; - - hdr = (const struct xua_common_hdr *) msg->data; - msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - - return msg_length; -} - /* netif code tells us we can read something from the socket */ -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + int fd = osmo_stream_srv_get_fd(conn); + struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; + size_t msg_length; int rc; + OSMO_ASSERT(fd >= 0); + + if (msg == NULL) { + msg = m3ua_msgb_alloc(__func__); + asp->pending_msg = msg; + } + + /* read message header first */ + if (msg->len < sizeof(*hdr)) { + errno = 0; + rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); + if (rc <= 0) { + if (errno == EAGAIN || errno == EINTR) + return 0; /* need more data */ + osmo_stream_srv_destroy(conn); + asp->pending_msg = NULL; + msgb_free(msg); + return rc; + } + + msgb_put(msg, rc); + if (msg->len < sizeof(*hdr)) + return 0; /* need more data */ + } + + hdr = (const struct xua_common_hdr *)msg->data; + msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ + + /* read the rest of the message */ + if (msg->len < msg_length) { + errno = 0; + rc = recv(fd, msg->tail, msg_length - msg->len, 0); + if (rc <= 0) { + if (errno == EAGAIN || errno == EINTR) + return 0; /* need more data */ + osmo_stream_srv_destroy(conn); + asp->pending_msg = NULL; + msgb_free(msg); + return rc; + } + + msgb_put(msg, rc); + if (msg->len < msg_length) + return 0; /* need more data */ + } + msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* spoof SCTP Stream ID */ - hdr = (const struct xua_common_hdr *)msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; rc = m3ua_rx_msg(asp, msg); + asp->pending_msg = NULL; msgb_free(msg); return rc; @@ -937,19 +1009,40 @@ xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_RELEASE, PRIM_OP_INDICATION); } -static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) +static void xua_cli_close_and_reconnect(struct osmo_stream_cli *cli) { xua_cli_close(cli); osmo_stream_cli_reconnect(cli); - return 0; } /* read call-back for IPA/SCCPlite socket */ -static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) +static int ipa_cli_read_cb(struct osmo_stream_cli *conn) { int fd = osmo_stream_cli_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + struct msgb *msg = NULL; + int rc; + OSMO_ASSERT(fd >= 0); + + /* read IPA message from socket and process it */ + rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); + LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", + __func__, rc); + if (rc <= 0) { + if (rc == -EAGAIN) { + /* more data needed */ + return 0; + } + xua_cli_close_and_reconnect(conn); + return rc; + } + if (osmo_ipa_process_msg(msg) < 0) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); + xua_cli_close_and_reconnect(conn); + msgb_free(msg); + return -1; + } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -958,34 +1051,94 @@ } /* read call-back for M3UA-over-TCP socket */ -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn) { + struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + int fd = osmo_stream_cli_get_fd(conn); + struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; + size_t msg_length; + int rc; - /* spoof SCTP PPID */ - msgb_sctp_ppid(msg) = M3UA_PPID; + OSMO_ASSERT(fd >= 0); + + if (msg == NULL) { + msg = m3ua_msgb_alloc(__func__); + asp->pending_msg = msg; + } + + /* read message header first */ + if (msg->len < sizeof(*hdr)) { + errno = 0; + rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); + if (rc <= 0) { + if (errno == EAGAIN || errno == EINTR) + return 0; /* need more data */ + xua_cli_close_and_reconnect(conn); + asp->pending_msg = NULL; + msgb_free(msg); + return rc; + } + + msgb_put(msg, rc); + if (msg->len < sizeof(*hdr)) + return 0; /* need more data */ + } + + hdr = (const struct xua_common_hdr *)msg->data; + msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ + + /* read the rest of the message */ + if (msg->len < msg_length) { + errno = 0; + rc = recv(fd, msg->tail, msg_length - msg->len, 0); + if (rc <= 0) { + if (errno == EAGAIN || errno == EINTR) + return 0; /* need more data */ + xua_cli_close_and_reconnect(conn); + asp->pending_msg = NULL; + msgb_free(msg); + return rc; + } + + msgb_put(msg, rc); + if (msg->len < msg_length) + return 0; /* need more data */ + } + + msg->dst = asp; + rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* spoof SCTP Stream ID */ - hdr = (const struct xua_common_hdr *) msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; - return xua_cli_read_cb(conn, msg); + rc = m3ua_rx_msg(asp, msg); + asp->pending_msg = NULL; + msgb_free(msg); + + return rc; } -static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) +static int xua_cli_read_cb(struct osmo_stream_cli *conn) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + struct msgb *msg = m3ua_msgb_alloc("xUA Client Rx"); unsigned int ppid; int flags; int rc; + if (!msg) + return -ENOMEM; + + /* read xUA message from socket and process it */ + rc = osmo_stream_cli_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", - __func__, msgb_length(msg), flags); + __func__, rc, flags); if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); @@ -1000,6 +1153,17 @@ default: break; } + + if (rc == 0) + xua_cli_close_and_reconnect(conn); + rc = 0; + goto out; + } + if (rc < 0) { + xua_cli_close_and_reconnect(conn); + goto out; + } else if (rc == 0) { + xua_cli_close_and_reconnect(conn); goto out; } diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index e8e01b3..6da7b7a 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -67,11 +67,32 @@ struct osmo_ss7_asp *asp; char *sock_name = osmo_sock_get_name(link, fd); const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); + int (*read_cb)(struct osmo_stream_srv *conn) = NULL; int rc = 0; LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); - srv = osmo_stream_srv_create2(oxs, link, fd, NULL); + switch (oxs->cfg.proto) { + case OSMO_SS7_ASP_PROT_IPA: + OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_TCP); + read_cb = &ss7_asp_ipa_srv_conn_cb; + break; + case OSMO_SS7_ASP_PROT_M3UA: + if (oxs->cfg.trans_proto == IPPROTO_SCTP) + read_cb = &ss7_asp_xua_srv_conn_cb; + else if (oxs->cfg.trans_proto == IPPROTO_TCP) + read_cb = &ss7_asp_m3ua_tcp_srv_conn_cb; + else + OSMO_ASSERT(0); + break; + default: + OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); + read_cb = &ss7_asp_xua_srv_conn_cb; + break; + } + + srv = osmo_stream_srv_create(oxs, link, fd, read_cb, + &ss7_asp_xua_srv_conn_closed_cb, NULL); if (!srv) { LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " "for connection\n", sock_name); @@ -80,28 +101,6 @@ return -1; } - switch (oxs->cfg.proto) { - case OSMO_SS7_ASP_PROT_IPA: - osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb); - osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb); - break; - case OSMO_SS7_ASP_PROT_M3UA: - if (oxs->cfg.trans_proto == IPPROTO_SCTP) - osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); - else if (oxs->cfg.trans_proto == IPPROTO_TCP) { - osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_cb); - osmo_stream_srv_set_segmentation_cb(srv, xua_tcp_segmentation_cb); - } else - OSMO_ASSERT(0); - break; - default: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); - osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); - osmo_stream_srv_set_segmentation_cb(srv, NULL); - break; - } - osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); - asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 67c0ee3..758da90 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -24,9 +24,9 @@ bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto); -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn); +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn); +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); @@ -38,8 +38,6 @@ bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); -int xua_tcp_segmentation_cb(struct msgb *msg); - enum ss7_as_ctr { SS7_AS_CTR_RX_MSU_TOTAL, SS7_AS_CTR_TX_MSU_TOTAL, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36187?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I708a5fe0481b14e1b0cdc86149ffc86ee7b5be59 Gerrit-Change-Number: 36187 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2usb
by tnt 06 Mar '24

06 Mar '24

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email ) Change subject: gateware/cores: Update no2usb ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Fails because it needs some of the following changes to make sense ... expected. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email 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: I13e186627077c57329e4a83da11acc01ca5dce35 Gerrit-Change-Number: 36183 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 06 Mar 2024 20:02:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2usb
by tnt 06 Mar '24

06 Mar '24

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email ) Change subject: gateware/cores: Update no2usb ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email 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: I13e186627077c57329e4a83da11acc01ca5dce35 Gerrit-Change-Number: 36183 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Ensure alignement of the structure for the usb_data_write
by tnt 06 Mar '24

06 Mar '24

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36186?usp=email ) Change subject: icE1usb fw: Ensure alignement of the structure for the usb_data_write ...................................................................... icE1usb fw: Ensure alignement of the structure for the usb_data_write Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id80468ef95bb908cf34b6eeca04c83f1285fd2f5 --- M firmware/ice40-riscv/icE1usb/usb_gps.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/86/36186/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_gps.c b/firmware/ice40-riscv/icE1usb/usb_gps.c index ad893a5..0fe5c98 100644 --- a/firmware/ice40-riscv/icE1usb/usb_gps.c +++ b/firmware/ice40-riscv/icE1usb/usb_gps.c @@ -138,7 +138,7 @@ { /* Default request */ /* Put as static to work around gcc aliasing bug ... */ - static struct usb_cdc_notif_serial_state notif = { + static struct usb_cdc_notif_serial_state __attribute__((aligned(4))) notif = { .hdr = { .bmRequestType = USB_REQ_READ | USB_REQ_TYPE_CLASS | USB_REQ_RCPT_INTF, .bRequest = USB_NOTIF_CDC_SERIAL_STATE, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36186?usp=email 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: Id80468ef95bb908cf34b6eeca04c83f1285fd2f5 Gerrit-Change-Number: 36186 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2usb
by tnt 06 Mar '24

06 Mar '24

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email ) Change subject: gateware/cores: Update no2usb ...................................................................... gateware/cores: Update no2usb Mostly to get firmware code fixes Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I13e186627077c57329e4a83da11acc01ca5dce35 --- M gateware/cores/no2usb 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/83/36183/1 diff --git a/gateware/cores/no2usb b/gateware/cores/no2usb index fdf42a6..9a3e752 160000 --- a/gateware/cores/no2usb +++ b/gateware/cores/no2usb @@ -1 +1 @@ -Subproject commit fdf42a6571a4ae49556626e6fffca1582796f7e8 +Subproject commit 9a3e752eab17c8f12a3a1dd6cf291368eaf3161d -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36183?usp=email 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: I13e186627077c57329e4a83da11acc01ca5dce35 Gerrit-Change-Number: 36183 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Use proper length for struct usb_cdc_notif_serial_state
by tnt 06 Mar '24

06 Mar '24

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36185?usp=email ) Change subject: icE1usb fw: Use proper length for struct usb_cdc_notif_serial_state ...................................................................... icE1usb fw: Use proper length for struct usb_cdc_notif_serial_state Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I30d451e76ebd192f037653179b6485b2b43b6dbc --- M firmware/ice40-riscv/icE1usb/usb_gps.c 1 file changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/85/36185/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_gps.c b/firmware/ice40-riscv/icE1usb/usb_gps.c index db188b1..ad893a5 100644 --- a/firmware/ice40-riscv/icE1usb/usb_gps.c +++ b/firmware/ice40-riscv/icE1usb/usb_gps.c @@ -148,6 +148,7 @@ }, .bits = 0x00 }; + const int notif_len = sizeof(struct usb_cdc_notif_serial_state); /* Check if PPS occurred */ uint32_t pps_now = time_pps_read(); @@ -159,8 +160,8 @@ /* Queue CD Set */ notif.bits = 1; - usb_data_write(ep_regs->bd[0].ptr, &notif, 12); - ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(10); + usb_data_write(ep_regs->bd[0].ptr, &notif, notif_len); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(notif_len); /* Need to clear in the future */ g_usb_gps.pps.set = true; @@ -169,8 +170,8 @@ { /* Queue CD Clear */ notif.bits = 0; - usb_data_write(ep_regs->bd[0].ptr, &notif, 12); - ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(10); + usb_data_write(ep_regs->bd[0].ptr, &notif, notif_len); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(notif_len); /* Cleared */ g_usb_gps.pps.set = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36185?usp=email 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: I30d451e76ebd192f037653179b6485b2b43b6dbc Gerrit-Change-Number: 36185 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Remove local usb_cdc_notif_serial_state struct
by tnt 06 Mar '24

06 Mar '24

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36184?usp=email ) Change subject: icE1usb fw: Remove local usb_cdc_notif_serial_state struct ...................................................................... icE1usb fw: Remove local usb_cdc_notif_serial_state struct It's included in no2usb cdc proto header now Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I1788a95eea7db5391f52e36ba4c39c6cddf194ba --- M firmware/ice40-riscv/icE1usb/usb_gps.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/84/36184/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_gps.c b/firmware/ice40-riscv/icE1usb/usb_gps.c index e219cf8..db188b1 100644 --- a/firmware/ice40-riscv/icE1usb/usb_gps.c +++ b/firmware/ice40-riscv/icE1usb/usb_gps.c @@ -46,12 +46,6 @@ } g_usb_gps; -struct usb_cdc_notif_serial_state { - struct usb_ctrl_req hdr; - uint16_t bits; -} __attribute__((packed,aligned(4))); - - static void _usb_gps_set_active(bool active) { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36184?usp=email 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: I1788a95eea7db5391f52e36ba4c39c6cddf194ba Gerrit-Change-Number: 36184 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_authinfo_twice
by pespin 06 Mar '24

06 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36178?usp=email ) Change subject: epdg: Introduce test TC_authinfo_twice ...................................................................... epdg: Introduce test TC_authinfo_twice Related: OS#6391 Change-Id: I86ef2bf9a0676735343d5a5c0f4ff12f552216d2 --- M epdg/EPDG_Tests.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 45d7a1d..164f14b 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -928,6 +928,20 @@ setverdict(pass); } +/* Emulate UE doing MAR+MAA, then repeating and continuing. */ +private function f_TC_authinfo_twice(charstring id) runs on EPDG_ConnHdlr { + f_GSUP_AI_success(); + f_initial_attach(); +} +testcase TC_authinfo_twice() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_twice), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_ho_lte_to_wifi(charstring id) runs on EPDG_ConnHdlr { f_initial_attach(); /* Whenever UE comes from 3GPP, PGW may activate a dedicated S2b bearer @@ -1064,6 +1078,7 @@ control { execute ( TC_authinfo_normal() ); execute ( TC_authinfo_MAA_unknown_user() ); + execute ( TC_authinfo_twice() ); execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); execute ( TC_s2b_CreateSession_rejected() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36178?usp=email 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: I86ef2bf9a0676735343d5a5c0f4ff12f552216d2 Gerrit-Change-Number: 36178 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log