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

[M] Change in libosmo-netif[master]: stream: Refactor sctp_recvmsg_wrapper() logging

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34081 to look at the new patch set (#5). Change subject: stream: Refactor sctp_recvmsg_wrapper() logging ...................................................................... stream: Refactor sctp_recvmsg_wrapper() logging *Move the helper function to stream.c and pass a logging prefix string so that it can be used by both client and server. * Adapt log level based on message type. * Rework logging code to log everything in one line Change-Id: I0ed84cc2effb71b6ef1f6efb3f8b663c602a5a31 --- M include/osmocom/netif/stream_private.h M src/stream.c M src/stream_srv.c 3 files changed, 99 insertions(+), 73 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/81/34081/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I0ed84cc2effb71b6ef1f6efb3f8b663c602a5a31 Gerrit-Change-Number: 34081 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 11 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Add osmo_sock_init flag to enable SCTP ASCONF features

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34113 ) Change subject: socket: Add osmo_sock_init flag to enable SCTP ASCONF features ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iac07031927b66a9d32d2bb2faab817e4c922a359 Gerrit-Change-Number: 34113 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 21 Aug 2023 08:28:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Add osmo_sock_init flag to enable SCTP ASCONF features

by pespin

Attention is currently required from: laforge, pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34113 to look at the new patch set (#3). Change subject: socket: Add osmo_sock_init flag to enable SCTP ASCONF features ...................................................................... socket: Add osmo_sock_init flag to enable SCTP ASCONF features The SCTP_ASCONF_SUPPORTED sockopt, which enables ASCONF features for the SCTP associations managed by the SCTP socket, gets its default value from to sysctl "net.sctp.addip_enable", which, at least up to current kernel 6.4.8 is set to "0" (disabled) by default. As a result, ASCONF related features such as setsockopt(SCTP_SET_PEER_PRIMARY_ADDR) fail with -EPERM since ASNCONF extensions where not negotiated during the SCTP init handshake. This commit adds support for setting SCTP_ASCONF_SUPPORTED=1 during socket creation, since that needs to be applied before the first bind()/connect() (before first assoc is created). Furthermore, for ASCONF features to work properly, the assoc also needs to announce/use the AUTH extension, as per RFC5061 section 4.2.7. Otherwise, the peer receiving an SCTP INIT with ExtensionFeatures=ASCONF,ASCONF_ACK but without AUTH, will reject the assoc with an ABORT since it's not complying with spec (this behavior can be tweaked through sysctl "net.sctp.addip_noauth_enable"). The AUTH extension is enabled through sockopt SCTP_AUTH_SUPPORTED, and its default value is that of sysctl "net.sctp.auth_enable", which is also disabled (0) by default. Kernel support for those is relatively new: SCTP_FUTURE_ASSOC added in: 80df2704a375bb4b3c9c5cce9c00052361b16d61 Follows: v5.0-rc4 Precedes: v5.1-rc1 SCTP_ASCONF_SUPPORTED added in: df2c71ffdfae58961981d7cbcccea93688fc4e96 Follows: v5.3-rc5 Precedes: v5.4-rc1 SCTP_AUTH_SUPPORTED added in: 56dd525abd56f7acd7b44a52935726e3ada4916c Follows: v5.3-rc5 Precedes: v5.4-rc1 Related: OS#6076 Change-Id: Iac07031927b66a9d32d2bb2faab817e4c922a359 --- M include/osmocom/core/socket.h M src/core/socket.c 2 files changed, 101 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/34113/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iac07031927b66a9d32d2bb2faab817e4c922a359 Gerrit-Change-Number: 34113 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: README.md: upade the list of libraries

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34148 ) Change subject: README.md: upade the list of libraries ...................................................................... README.md: upade the list of libraries Change-Id: I0572e9435330c15469f6609505867c21be9c3483 --- M README.md 1 file changed, 16 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/README.md b/README.md index c857f66..b88c581 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,13 @@ This project is a home for several libraries providing common GPRS routines: -* libosmo-csn1 - CSN.1 (Concrete Syntax Notation 1) codec, -* libosmo-gprs-llc - LLC (Logical Link Control) layer, -* libosmo-gprs-rlcmac - RLC/MAC message definitions. + +* libosmo-csn1 - CSN.1 (Concrete Syntax Notation 1) codec; +* libosmo-gprs-rlcmac - RLC/MAC as per 3GPP TS 44.060, TS 44.018; +* libosmo-gprs-llc - LLC (Logical Link Control) as per 3GPP TS 44.064; +* libosmo-gprs-gmm - GMM (GPRS Mobility Management) as per 3GPP TS 24.008 section 9.4; +* libosmo-gprs-sm - SM (GPRS Session Management) as per 3GPP TS 24.008 section 9.5; +* libosmo-gprs-sndcp - SNDCP (Subnetwork Dependent Convergence Protocol) as per 3GPP TS 44.065. Homepage -------- -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0572e9435330c15469f6609505867c21be9c3483 Gerrit-Change-Number: 34148 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: README.md: upade the list of libraries

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34148 ) Change subject: README.md: upade the list of libraries ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0572e9435330c15469f6609505867c21be9c3483 Gerrit-Change-Number: 34148 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Aug 2023 07:38:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmocom-bb[master]: l1gprs: Fix slotmask update on already registered tbf

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34140 ) Change subject: l1gprs: Fix slotmask update on already registered tbf ...................................................................... l1gprs: Fix slotmask update on already registered tbf Change-Id: I5d64488d2aa740e91e01fad17f2af3ded24b12ef --- M src/shared/l1gprs.c 1 file changed, 85 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index fd18e4e..1c3dba8 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -127,19 +127,57 @@ LOG_TBF_ARGS(tbf)); } -static void l1gprs_unregister_tbf(struct l1gprs_state *gprs, - bool uplink, uint8_t tbf_ref) +static void l1gprs_update_tbf(struct l1gprs_state *gprs, struct l1gprs_tbf *tbf, uint8_t slotmask) { - struct l1gprs_tbf *tbf; + OSMO_ASSERT(tbf->slotmask != 0x00); + OSMO_ASSERT(slotmask != 0x00); - tbf = l1gprs_find_tbf(gprs, uplink, tbf_ref); - if (tbf == NULL) { - LOGP_GPRS(gprs, LOGL_ERROR, - "%s(): " LOG_TBF_FMT " not found\n", - __func__, uplink ? 'U' : 'D', tbf_ref); - return; + if (tbf->slotmask == slotmask) + return; /* No change at all, skip */ + + /* Update the PDCH states */ + for (unsigned int tn = 0; tn < ARRAY_SIZE(gprs->pdch); tn++) { + struct l1gprs_pdch *pdch = &gprs->pdch[tn]; + + if ((tbf->slotmask & (1 << tn)) == (slotmask & (1 << tn))) + continue; /* No change, skip */ + + if (tbf->slotmask & (1 << tn)) { + /* slot previously set, remove it */ + if (tbf->uplink) { + OSMO_ASSERT(pdch->ul_tbf_count > 0); + pdch->ul_tbf_count--; + } else { + OSMO_ASSERT(pdch->dl_tbf_count > 0); + pdch->dl_tbf_count--; + pdch->dl_tfi_mask &= ~(1 << tbf->dl_tfi); + } + LOGP_PDCH(pdch, LOGL_DEBUG, "Unlinked " LOG_TBF_FMT "\n", + LOG_TBF_ARGS(tbf)); + } else { + /* Slot was not set, add it */ + if (tbf->uplink) { + pdch->ul_tbf_count++; + } else { + pdch->dl_tbf_count++; + pdch->dl_tfi_mask |= (1 << tbf->dl_tfi); + } + LOGP_PDCH(pdch, LOGL_DEBUG, "Linked " LOG_TBF_FMT "\n", + LOG_TBF_ARGS(tbf)); + } } + LOGP_GPRS(gprs, LOGL_INFO, + LOG_TBF_FMT " slotmask updated 0x%02x -> 0x%02x\n", + LOG_TBF_ARGS(tbf), tbf->slotmask, slotmask); + + tbf->slotmask = slotmask; +} + +static void l1gprs_unregister_tbf(struct l1gprs_state *gprs, struct l1gprs_tbf *tbf) +{ + OSMO_ASSERT(tbf->slotmask != 0x00); + /* Update the PDCH states */ for (unsigned int tn = 0; tn < ARRAY_SIZE(gprs->pdch); tn++) { struct l1gprs_pdch *pdch = &gprs->pdch[tn]; @@ -289,11 +327,22 @@ "Rx Uplink TBF config: tbf_ref=%u, slotmask=0x%02x\n", req->tbf_ref, req->slotmask); + tbf = l1gprs_find_tbf(gprs, true, req->tbf_ref); + if (req->slotmask != 0x00) { - tbf = l1gprs_tbf_alloc(gprs, true, req->tbf_ref, req->slotmask); - l1gprs_register_tbf(gprs, tbf); + if (tbf) { + l1gprs_update_tbf(gprs, tbf, req->slotmask); + } else { + tbf = l1gprs_tbf_alloc(gprs, true, req->tbf_ref, req->slotmask); + l1gprs_register_tbf(gprs, tbf); + } } else { - l1gprs_unregister_tbf(gprs, true, req->tbf_ref); + if (tbf == NULL) { + LOGP_GPRS(gprs, LOGL_ERROR, "%s(): " LOG_TBF_FMT " not found\n", + __func__, 'U', req->tbf_ref); + return -ENOENT; + } + l1gprs_unregister_tbf(gprs, tbf); } return 0; @@ -324,12 +373,23 @@ return -EINVAL; } + tbf = l1gprs_find_tbf(gprs, false, req->tbf_ref); + if (req->slotmask != 0x00) { - tbf = l1gprs_tbf_alloc(gprs, false, req->tbf_ref, req->slotmask); - tbf->dl_tfi = req->dl_tfi; - l1gprs_register_tbf(gprs, tbf); + if (tbf) { + l1gprs_update_tbf(gprs, tbf, req->slotmask); + } else { + tbf = l1gprs_tbf_alloc(gprs, false, req->tbf_ref, req->slotmask); + tbf->dl_tfi = req->dl_tfi; + l1gprs_register_tbf(gprs, tbf); + } } else { - l1gprs_unregister_tbf(gprs, false, req->tbf_ref); + if (tbf == NULL) { + LOGP_GPRS(gprs, LOGL_ERROR, "%s(): " LOG_TBF_FMT " not found\n", + __func__, 'D', req->tbf_ref); + return -ENOENT; + } + l1gprs_unregister_tbf(gprs, tbf); } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5d64488d2aa740e91e01fad17f2af3ded24b12ef Gerrit-Change-Number: 34140 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34139 ) Change subject: trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req ...................................................................... trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req Change-Id: I4c2ff25217fba0b6b4704f023071b86ed9afb55c Related: OS#5500 --- M include/l1gprs.h M src/host/trxcon/src/trxcon_fsm.c M src/shared/l1gprs.c 3 files changed, 74 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/l1gprs.h b/include/l1gprs.h index bbd654d..060366e 100644 --- a/include/l1gprs.h +++ b/include/l1gprs.h @@ -2,6 +2,7 @@ #include <stdint.h> #include <stdbool.h> +#include <stddef.h> #include <osmocom/core/linuxlist.h> @@ -34,6 +35,14 @@ uint32_t dl_tfi_mask; }; +static inline size_t l1gprs_pdch_use_count(const struct l1gprs_pdch *pdch) +{ + return pdch->ul_tbf_count + pdch->dl_tbf_count; +} + + +typedef void (*l1gprs_pdch_changed_t)(struct l1gprs_pdch *pdch, bool active); + struct l1gprs_state { /*! PDCH state for each timeslot */ struct l1gprs_pdch pdch[8]; @@ -43,11 +52,14 @@ char *log_prefix; /*! Some private data for API user */ void *priv; + /*! Callback triggered to signal lower layers when a PDCH TS has to be activated/deactivated */ + l1gprs_pdch_changed_t pdch_changed_cb; }; void l1gprs_logging_init(int logc); struct l1gprs_state *l1gprs_state_alloc(void *ctx, const char *log_prefix, void *priv); void l1gprs_state_free(struct l1gprs_state *gprs); +void l1gprs_state_set_pdch_changed_cb(struct l1gprs_state *gprs, l1gprs_pdch_changed_t pdch_changed_cb); int l1gprs_handle_ul_tbf_cfg_req(struct l1gprs_state *gprs, const struct msgb *msg); int l1gprs_handle_dl_tbf_cfg_req(struct l1gprs_state *gprs, const struct msgb *msg); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index eabab3d..e7c60f2 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -517,6 +517,30 @@ } } +static void handle_tbf_cfg_req(struct trxcon_inst *trxcon, uint8_t tn, bool active) +{ + struct l1sched_state *sched = trxcon->sched; + + if (active) { + if (sched->ts[tn] != NULL) /* already enabled */ + return; + if (l1sched_configure_ts(sched, tn, GSM_PCHAN_PDCH) != 0) + return; + OSMO_ASSERT(sched->ts[tn] != NULL); + + l1sched_activate_lchan(sched->ts[tn], L1SCHED_PDTCH); + l1sched_activate_lchan(sched->ts[tn], L1SCHED_PTCCH); + /* FIXME: set TSC for both lchans */ + } else { + l1sched_del_ts(sched, tn); + } +} + +static void trxcon_l1gprs_state_changed_cb(struct l1gprs_pdch *pdch, bool active) +{ + handle_tbf_cfg_req(pdch->gprs->priv, pdch->tn, active); +} + static void trxcon_st_packet_data_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { @@ -524,6 +548,7 @@ OSMO_ASSERT(trxcon->gprs == NULL); trxcon->gprs = l1gprs_state_alloc(trxcon, trxcon->log_prefix, trxcon); + l1gprs_state_set_pdch_changed_cb(trxcon->gprs, trxcon_l1gprs_state_changed_cb); OSMO_ASSERT(trxcon->gprs != NULL); } diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index 1c3dba8..bae13d2 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -118,6 +118,12 @@ LOGP_PDCH(pdch, LOGL_DEBUG, "Linked " LOG_TBF_FMT "\n", LOG_TBF_ARGS(tbf)); + + /* If just got first use: */ + if (l1gprs_pdch_use_count(pdch) == 1) { + if (gprs->pdch_changed_cb) + gprs->pdch_changed_cb(pdch, true); + } } llist_add_tail(&tbf->list, &gprs->tbf_list); @@ -154,6 +160,11 @@ } LOGP_PDCH(pdch, LOGL_DEBUG, "Unlinked " LOG_TBF_FMT "\n", LOG_TBF_ARGS(tbf)); + /* If not more in use: */ + if (l1gprs_pdch_use_count(pdch) == 0) { + if (gprs->pdch_changed_cb) + gprs->pdch_changed_cb(pdch, false); + } } else { /* Slot was not set, add it */ if (tbf->uplink) { @@ -164,6 +175,11 @@ } LOGP_PDCH(pdch, LOGL_DEBUG, "Linked " LOG_TBF_FMT "\n", LOG_TBF_ARGS(tbf)); + /* If just got first use: */ + if (l1gprs_pdch_use_count(pdch) == 1) { + if (gprs->pdch_changed_cb) + gprs->pdch_changed_cb(pdch, true); + } } } @@ -197,6 +213,12 @@ LOGP_PDCH(pdch, LOGL_DEBUG, "Unlinked " LOG_TBF_FMT "\n", LOG_TBF_ARGS(tbf)); + + /* If not more in use: */ + if (l1gprs_pdch_use_count(pdch) == 0) { + if (gprs->pdch_changed_cb) + gprs->pdch_changed_cb(pdch, false); + } } LOGP_GPRS(gprs, LOGL_INFO, @@ -309,6 +331,11 @@ talloc_free(gprs); } +void l1gprs_state_set_pdch_changed_cb(struct l1gprs_state *gprs, l1gprs_pdch_changed_t pdch_changed_cb) +{ + gprs->pdch_changed_cb = pdch_changed_cb; +} + int l1gprs_handle_ul_tbf_cfg_req(struct l1gprs_state *gprs, const struct msgb *msg) { const struct l1ctl_gprs_ul_tbf_cfg_req *req = (void *)msg->l1h; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c2ff25217fba0b6b4704f023071b86ed9afb55c Gerrit-Change-Number: 34139 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in osmocom-bb[master]: l1ctl_proto: add 'start_fn' field to UL/DL TBF CFG.req messages

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33222 ) Change subject: l1ctl_proto: add 'start_fn' field to UL/DL TBF CFG.req messages ...................................................................... l1ctl_proto: add 'start_fn' field to UL/DL TBF CFG.req messages Change-Id: Ibb6a05165fe1c81268fb0e3674adae4065e78171 Related: OS#5500 --- M include/l1ctl_proto.h M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/modem/grr.c 4 files changed, 29 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 3512424..f0bc56d 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -350,6 +350,7 @@ uint8_t tbf_ref; uint8_t slotmask; uint8_t padding[2]; + uint32_t start_fn; /* TBF Starting Time (absolute Fn) */ } __attribute__((packed)); /* payload of L1CTL_GPRS_DL_TBF_CFG_REQ */ @@ -358,6 +359,7 @@ uint8_t slotmask; uint8_t dl_tfi; uint8_t padding[1]; + uint32_t start_fn; /* TBF Starting Time (absolute Fn) */ } __attribute__((packed)); /* part of L1CTL_GPRS_{UL,DL}_BLOCK_{REQ,IND} */ diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 25bc6e8..40b3159 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -81,10 +81,11 @@ /* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */ int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask); + uint8_t slotmask, uint32_t start_fn); /* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */ int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask, uint8_t dl_tfi); + uint8_t slotmask, uint32_t start_fn, + uint8_t dl_tfi); #endif diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index b2ad505..38510d8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -1011,7 +1011,7 @@ /* Transmit L1CTL_GPRS_UL_TBF_CFG_REQ */ int l1ctl_tx_gprs_ul_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask) + uint8_t slotmask, uint32_t start_fn) { struct l1ctl_gprs_ul_tbf_cfg_req *req; struct msgb *msg; @@ -1024,17 +1024,20 @@ *req = (struct l1ctl_gprs_ul_tbf_cfg_req) { .tbf_ref = tbf_ref, .slotmask = slotmask, + .start_fn = htonl(start_fn), }; - DEBUGP(DL1C, "Tx GPRS UL TBF CFG (tbf_ref=%u, slotmask=0x%02x)\n", - tbf_ref, slotmask); + DEBUGP(DL1C, "Tx GPRS UL TBF CFG: " + "tbf_ref=%u, slotmask=0x%02x, start_fn=%u\n", + tbf_ref, slotmask, start_fn); return osmo_send_l1(ms, msg); } /* Transmit L1CTL_GPRS_DL_TBF_CFG_REQ */ int l1ctl_tx_gprs_dl_tbf_cfg_req(struct osmocom_ms *ms, uint8_t tbf_ref, - uint8_t slotmask, uint8_t dl_tfi) + uint8_t slotmask, uint32_t start_fn, + uint8_t dl_tfi) { struct l1ctl_gprs_dl_tbf_cfg_req *req; struct msgb *msg; @@ -1047,11 +1050,13 @@ *req = (struct l1ctl_gprs_dl_tbf_cfg_req) { .tbf_ref = tbf_ref, .slotmask = slotmask, + .start_fn = htonl(start_fn), .dl_tfi = dl_tfi, }; - DEBUGP(DL1C, "Tx GPRS DL TBF CFG (tbf_ref=%u, slotmask=0x%02x, dl_tfi=%u)\n", - tbf_ref, slotmask, dl_tfi); + DEBUGP(DL1C, "Tx GPRS DL TBF CFG: " + "tbf_ref=%u, slotmask=0x%02x, start_fn=%u, dl_tfi=%u)\n", + tbf_ref, slotmask, start_fn, dl_tfi); return osmo_send_l1(ms, msg); } diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index 12d7059..e4fd23c 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -661,7 +661,8 @@ const struct osmo_gprs_rlcmac_l1ctl_prim *lp = data; l1ctl_tx_gprs_ul_tbf_cfg_req(ms, lp->cfg_ul_tbf_req.ul_tbf_nr, - lp->cfg_ul_tbf_req.ul_slotmask); + lp->cfg_ul_tbf_req.ul_slotmask, + 0xffffffff /* TODO: start Fn */); break; } case GRR_EV_PDCH_DL_TBF_CFG_REQ: @@ -670,6 +671,7 @@ l1ctl_tx_gprs_dl_tbf_cfg_req(ms, lp->cfg_dl_tbf_req.dl_tbf_nr, lp->cfg_dl_tbf_req.dl_slotmask, + 0xffffffff, /* TODO: start Fn */ lp->cfg_dl_tbf_req.dl_tfi); break; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibb6a05165fe1c81268fb0e3674adae4065e78171 Gerrit-Change-Number: 33222 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmocom-bb[master]: trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34139 ) Change subject: trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c2ff25217fba0b6b4704f023071b86ed9afb55c Gerrit-Change-Number: 34139 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 20 Aug 2023 14:38:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmocom-bb[master]: l1gprs: Fix slotmask update on already registered tbf

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34140 ) Change subject: l1gprs: Fix slotmask update on already registered tbf ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5d64488d2aa740e91e01fad17f2af3ded24b12ef Gerrit-Change-Number: 34140 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 20 Aug 2023 14:37:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023