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

[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 2: This change is ready for review. -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 18:16:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

[L] Change in osmocom-bb[master]: l1gprs: implement TBF starting time support

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33223 ) Change subject: l1gprs: implement TBF starting time support ...................................................................... Patch Set 8: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I174e3c43d2f4c828a528710b284e62c9bb794122 Gerrit-Change-Number: 33223 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 18:05:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

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 posted comments on 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 ...................................................................... Patch Set 4: This change is ready for review. -- 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-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 18:04:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: l1gprs: Log slotmask when logging TBF

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34142 ) Change subject: l1gprs: Log slotmask when logging TBF ...................................................................... l1gprs: Log slotmask when logging TBF Change-Id: Ib96b01c591dbcc6aa9e0527e0be499ef8aee2863 --- M src/shared/l1gprs.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/42/34142/1 diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index ff726ae..81fef9c 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -48,9 +48,9 @@ #define LOG_TBF_CFG_REQ_ARGS(req) \ (req)->tbf_ref, (req)->slotmask, ntohl((req)->start_fn) -#define LOG_TBF_FMT "%cL-TBF#%03d" +#define LOG_TBF_FMT "%cL-TBF#%03d(slotmask=0x%02x)" #define LOG_TBF_ARGS(tbf) \ - (tbf)->uplink ? 'U' : 'D', tbf->tbf_ref + (tbf)->uplink ? 'U' : 'D', (tbf)->tbf_ref, (tbf)->slotmask #define TDMA_FN_INVALID 0xffffffff @@ -533,7 +533,7 @@ tbf = l1gprs_find_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); + __func__, 'U', req->tbf_ref, req->slotmask); return -ENOENT; } l1gprs_unregister_tbf(gprs, tbf); @@ -594,7 +594,7 @@ tbf = l1gprs_find_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); + __func__, 'D', req->tbf_ref, req->slotmask); return -ENOENT; } l1gprs_unregister_tbf(gprs, tbf); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib96b01c591dbcc6aa9e0527e0be499ef8aee2863 Gerrit-Change-Number: 34142 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/34140/1 diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index fd18e4e..3143331 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 << pdch->tn)) == (slotmask & (1 << pdch->tn))) + continue; /* No change, skip */ + + if (tbf->slotmask & (1 << pdch->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 TS%u " LOG_TBF_FMT "\n", + pdch->tn, 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 TS%u " LOG_TBF_FMT "\n", + pdch->tn, 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: l1gprs: Improve logging fn and tn in BLOCK.req

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34141 ) Change subject: l1gprs: Improve logging fn and tn in BLOCK.req ...................................................................... l1gprs: Improve logging fn and tn in BLOCK.req Change-Id: Iba29d88770e79fee0e4ac3c8f4e833907afa5b52 --- M src/shared/l1gprs.c 1 file changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/34141/1 diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index 878bc80..ff726ae 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -610,6 +610,7 @@ const struct l1ctl_gprs_ul_block_req *l1br = (void *)msg->l1h; const struct l1gprs_pdch *pdch = NULL; size_t data_len; + uint32_t fn; OSMO_ASSERT(l1br != NULL); @@ -619,10 +620,11 @@ msgb_l1len(msg), sizeof(*l1br)); return -EINVAL; } + fn = ntohl(l1br->hdr.fn); if (OSMO_UNLIKELY(l1br->hdr.tn >= ARRAY_SIZE(gprs->pdch))) { LOGP_GPRS(gprs, LOGL_ERROR, - "Rx malformed UL BLOCK.req (tn=%u)\n", - l1br->hdr.tn); + "Rx malformed UL BLOCK.req (fn=%u, tn=%u)\n", + fn, l1br->hdr.tn); return -EINVAL; } @@ -630,18 +632,19 @@ data_len = msgb_l1len(msg) - sizeof(*l1br); LOGP_PDCH(pdch, LOGL_DEBUG, - "Rx UL BLOCK.req (fn=%u, len=%zu): %s\n", - ntohl(l1br->hdr.fn), data_len, osmo_hexdump(l1br->data, data_len)); + "Rx UL BLOCK.req (fn=%u, tn=%u, len=%zu): %s\n", + fn, l1br->hdr.tn, data_len, osmo_hexdump(l1br->data, data_len)); if ((pdch->ul_tbf_count == 0) && (pdch->dl_tbf_count == 0)) { LOGP_PDCH(pdch, LOGL_ERROR, - "Rx UL BLOCK.req, but this PDCH has no configured TBFs\n"); + "Rx UL BLOCK.req (fn=%u, tn=%u, len=%zu), but this PDCH has no configured TBFs\n", + fn, l1br->hdr.tn, data_len); return -EINVAL; } *req = (struct l1gprs_prim_ul_block_req) { .hdr = { - .fn = ntohl(l1br->hdr.fn), + .fn = fn, .tn = l1br->hdr.tn, }, .data = &l1br->data[0], -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iba29d88770e79fee0e4ac3c8f4e833907afa5b52 Gerrit-Change-Number: 34141 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: get rid of _DT, _dt (Direct TLLI)

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 ) Change subject: PCUIF_Types: get rid of _DT, _dt (Direct TLLI) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 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: I15e754ce3ceed92a517586a073d3e3ed008b5eef Gerrit-Change-Number: 34138 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:54:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 ) Change subject: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 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: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d Gerrit-Change-Number: 34110 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:53:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Codec port, do not return fn in f_PCUIF_tx_imm_ass_pch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34109 ) Change subject: PCUIF_Codec port, do not return fn in f_PCUIF_tx_imm_ass_pch ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File library/PCUIF_CodecPort.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34109/comment/a484d86e_63ad… PS2, Line 187: return 0; If it's not useful, then change this function to return void. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34109 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: I0e5bad7a0d74e5032f2818f6fdf5b9b2ecb531cc Gerrit-Change-Number: 34109 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:53:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: rename tlli to msg_id

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34108 ) Change subject: PCUIF: rename tlli to msg_id ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34108 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: I1db29d5b1920e351c452b798c3260654c2cbe0cb Gerrit-Change-Number: 34108 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:51:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023