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 <[email protected]>
Gerrit-MessageType: newchange
