November 2022 - gerrit-log - lists.osmocom.org

Change in osmo-hnodeb[master]: configure: don't turn some warnings into errors

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26213 ) Change subject: configure: don't turn some warnings into errors ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Can we still rebase this patch on top of the master branch and get it merged? this is blocked by https://osmocom.org/issues/4462#note-1, see previous patch in this patchset -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I783035fcded73f9c3938c4110ccb84eddc36a274 Gerrit-Change-Number: 26213 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Nov 2022 08:40:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/master…-dahdi: don't use multiple scms plugin

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30074 ) Change subject: jobs/master…-dahdi: don't use multiple scms plugin ...................................................................... jobs/master…-dahdi: don't use multiple scms plugin Related: OS#5763 Change-Id: If115116c0d6920c86a50dc43d57a8a925f6db064 --- M jobs/master-builds-dahdi.yml 1 file changed, 9 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml index a404487..e7c85b7 100644 --- a/jobs/master-builds-dahdi.yml +++ b/jobs/master-builds-dahdi.yml @@ -29,21 +29,9 @@ <b>Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY!</b> scm: - - git: - basedir: 'dahdi-linux' - url: 'https://gerrit.osmocom.org/dahdi-linux' - credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d - branches: - - 'origin/master' - # When the gerrit git repository is configured to wipe-workspace, the - # linux.git clone gets removed as well. Cloning the linux repo takes a - # long time, so only clean both repos, don't remove them. - wipe-workspace: false - clean: - before: true - skip-tag: true - submodule: - recursive: true + # Let jenkins clone the big linux repository and keep it between builds + # (wipe-workspace is false). Clone dahdi-linux with code from gerrit in + # the shell part below. - git: basedir: 'linux' url: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' @@ -60,6 +48,12 @@ builders: - shell: | + rm -rf dahdi-linux + git clone \ + --depth=1 \ + https://gerrit.osmocom.org/dahdi-linux + git -C dahdi-linux log --oneline + docker run \ --rm=true \ -e "KSRC=/linux" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If115116c0d6920c86a50dc43d57a8a925f6db064 Gerrit-Change-Number: 30074 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-binpkgs: don't use multiple-scm plugin

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30072 ) Change subject: jobs/gerrit-binpkgs: don't use multiple-scm plugin ...................................................................... jobs/gerrit-binpkgs: don't use multiple-scm plugin Change the default branch from origin/master to master, as the git clone command expects just the branch name without a remote name. Related: OS#5763 Change-Id: Ia5a17c6d25bf811a992ab495a2531ae613cb144f --- M jobs/gerrit-binpkgs.yml 1 file changed, 10 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/gerrit-binpkgs.yml b/jobs/gerrit-binpkgs.yml index 5c72a41..8408950 100644 --- a/jobs/gerrit-binpkgs.yml +++ b/jobs/gerrit-binpkgs.yml @@ -33,7 +33,7 @@ name: BRANCH_CI description: | osmo-ci.git branch - default: 'origin/master' + default: 'master' - string: name: GERRIT_REPO_URL description: set by gerrit verification pipeline job @@ -61,13 +61,6 @@ skip-tag: true submodule: recursive: false - - git: - basedir: 'osmo-ci' - url: 'https://gerrit.osmocom.org/osmo-ci' - credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d - branches: - - '$BRANCH_CI' - wipe-workspace: true builders: - shell: |- @@ -80,6 +73,15 @@ exit 0 fi + # Clone osmo-ci.git + rm -rf osmo-ci + git clone \ + --depth=1 \ + --branch="$BRANCH_CI" \ + https://gerrit.osmocom.org/osmo-ci \ + osmo-ci + git -C osmo-ci log --oneline + # Get distro from type case "{type}" in deb) distro="debian:11" ;; -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia5a17c6d25bf811a992ab495a2531ae613cb144f Gerrit-Change-Number: 30072 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit…-dahdi: don't use multiple scms plugin

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30073 ) Change subject: jobs/gerrit…-dahdi: don't use multiple scms plugin ...................................................................... jobs/gerrit…-dahdi: don't use multiple scms plugin Don't use the deprecated plugin. Let jenkins clone the big linux repository and clone the code from gerrit in the shell section of the script. Since we can't directly clone $GERRIT_REFSPEC, create an empty git repository and fetch it. Related: OS#5763 Change-Id: I52314f55e7e55382b4e8fcd63d3aba306b401447 --- M jobs/gerrit-verifications-dahdi.yml 1 file changed, 14 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index a117ff3..5343096 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -29,23 +29,9 @@ <b>Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY!</b> scm: - - git: - basedir: 'dahdi-linux' - url: 'https://gerrit.osmocom.org/dahdi-linux' - credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d - branches: - - $GERRIT_BRANCH - refspec: $GERRIT_REFSPEC - choosing-strategy: gerrit - # When the gerrit git repository is configured to wipe-workspace, the - # linux.git clone gets removed as well. Cloning the linux repo takes a - # long time, so only clean both repos, don't remove them. - wipe-workspace: false - clean: - before: true - skip-tag: true - submodule: - recursive: true + # Let jenkins clone the big linux repository and keep it between builds + # (wipe-workspace is false). Clone dahdi-linux with code from gerrit in + # the shell part below. - git: basedir: 'linux' url: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' @@ -80,6 +66,17 @@ builders: - shell: | + rm -rf dahdi-linux + git init dahdi-linux + cd dahdi-linux + git config advice.detachedHead false + git fetch \ + --depth=1 \ + https://gerrit.osmocom.org/dahdi-linux \ + "$GERRIT_REFSPEC" + git checkout FETCH_HEAD + cd .. + docker run \ --rm=true \ -e "KSRC=/linux" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I52314f55e7e55382b4e8fcd63d3aba306b401447 Gerrit-Change-Number: 30073 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't use multiple-scm plugin

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30071 ) Change subject: jobs/gerrit-lint: don't use multiple-scm plugin ...................................................................... jobs/gerrit-lint: don't use multiple-scm plugin Clone osmo-ci.git in the shell script part to avoid using the no-longer maintained multiple-scm plugin. Related: OS#5763 Change-Id: I3e9bdfbbf00a234cd559bbf142432a788cfe8f75 --- M jobs/gerrit-lint.yml 1 file changed, 11 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 819d17d..847096b 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -57,22 +57,24 @@ branches: - $GERRIT_BRANCH refspec: $GERRIT_REFSPEC - name: choosing-strategy: gerrit wipe-workspace: false skip-tag: true submodule: recursive: false - - git: - basedir: 'osmo-ci' - url: 'https://gerrit.osmocom.org/osmo-ci' - credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d - branches: - - '$BRANCH_CI' - wipe-workspace: true builders: - - shell: 'cd code-from-gerrit && ../osmo-ci/lint/lint_diff.sh HEAD~1' + - shell: | + rm -rf osmo-ci + git clone \ + --depth=1 \ + --branch="$BRANCH_CI" \ + https://gerrit.osmocom.org/osmo-ci \ + osmo-ci + git -C osmo-ci log --oneline + + cd code-from-gerrit + ../osmo-ci/lint/lint_diff.sh HEAD~1 wrappers: - ansicolor: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e9bdfbbf00a234cd559bbf142432a788cfe8f75 Gerrit-Change-Number: 30071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/master…-dahdi: don't use multiple scms plugin

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30074 ) Change subject: jobs/master…-dahdi: don't use multiple scms plugin ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If115116c0d6920c86a50dc43d57a8a925f6db064 Gerrit-Change-Number: 30074 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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: Fri, 11 Nov 2022 08:32:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit…-dahdi: don't use multiple scms plugin

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30073 ) Change subject: jobs/gerrit…-dahdi: don't use multiple scms plugin ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I52314f55e7e55382b4e8fcd63d3aba306b401447 Gerrit-Change-Number: 30073 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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: Fri, 11 Nov 2022 08:31:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-binpkgs: don't use multiple-scm plugin

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30072 ) Change subject: jobs/gerrit-binpkgs: don't use multiple-scm plugin ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia5a17c6d25bf811a992ab495a2531ae613cb144f Gerrit-Change-Number: 30072 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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: Fri, 11 Nov 2022 08:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't use multiple-scm plugin

by osmith

Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30071 ) Change subject: jobs/gerrit-lint: don't use multiple-scm plugin ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e9bdfbbf00a234cd559bbf142432a788cfe8f75 Gerrit-Change-Number: 30071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Nov 2022 08:31:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: maintain full power scan state in the trxcon_fsm

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30054 ) Change subject: trxcon: maintain full power scan state in the trxcon_fsm ...................................................................... trxcon: maintain full power scan state in the trxcon_fsm Currently the trxcon_fsm is simply passing start and stop ARFCN values (as received from the L1CTL peer) over the PHYIF, and expecting the PHY to perform the measurements within the given range. This approach requires the PHY implementation to maintain some state internally. Let's simplify the job of the PHY implementation(s) by maintaining the power scan state in the trxcon_fsm and sending a PHYIF_CMDT_MEASURE command for each ARFCN in the given start/stop boundaries separately. Change-Id: Ic5f724a11e225b439ec10aed7697e3e03b7929e5 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/phyif.h M src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 7 files changed, 71 insertions(+), 41 deletions(-) Approvals: fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h b/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h index ae272dd..a92cb89 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h @@ -42,13 +42,11 @@ /* param of PHYIF_CMDT_MEASURE (command) */ struct phyif_cmdp_measure { - uint16_t band_arfcn_start; - uint16_t band_arfcn_stop; + uint16_t band_arfcn; }; /* param of PHYIF_CMDT_MEASURE (response) */ struct phyif_rspp_measure { - bool last; uint16_t band_arfcn; int dbm; }; diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h index bfab0ad..92de3b0 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -29,10 +29,6 @@ uint32_t prev_state; bool powered_up; - /* GSM L1 specific */ - uint16_t pm_band_arfcn_start; - uint16_t pm_band_arfcn_stop; - /* Some private data */ void *priv; }; diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index ad00a05..fbbd9e6 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -19,6 +19,9 @@ /* L2 interface (e.g. L1CTL) */ void *l2if; + /* State specific data of trxcon_fsm */ + void *fi_data; + /* L1 parameters */ struct { uint16_t band_arfcn; diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h index e1ab84d..bb57d25 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h @@ -47,7 +47,6 @@ /* param of TRXCON_EV_FULL_POWER_SCAN_RES */ struct trxcon_param_full_power_scan_res { - bool last_result; uint16_t band_arfcn; int dbm; }; diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 928ad5d..77001ac 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -354,15 +354,11 @@ { uint16_t freq10; - /* Update ARFCN range for measurement */ - trx->pm_band_arfcn_start = cmdp->band_arfcn_start; - trx->pm_band_arfcn_stop = cmdp->band_arfcn_stop; - /* Calculate a frequency for current ARFCN (DL) */ - freq10 = gsm_arfcn2freq10(cmdp->band_arfcn_start, 0); + freq10 = gsm_arfcn2freq10(cmdp->band_arfcn, 0); if (freq10 == 0xffff) { LOGPFSML(trx->fi, LOGL_ERROR, - "ARFCN %d not defined\n", cmdp->band_arfcn_start); + "ARFCN %d not defined\n", cmdp->band_arfcn); return -ENOTSUP; } @@ -379,36 +375,22 @@ sscanf(resp, "%u %d", &freq10, &dbm); freq10 /= 100; - /* Check received ARFCN against expected */ band_arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); - if (band_arfcn != trx->pm_band_arfcn_start) { - LOGPFSML(trx->fi, LOGL_ERROR, "Power measurement error: " - "response ARFCN=%u doesn't match expected ARFCN=%u\n", - band_arfcn & ~ARFCN_FLAG_MASK, - trx->pm_band_arfcn_start & ~ARFCN_FLAG_MASK); + if (band_arfcn == 0xffff) { + LOGPFSML(trx->fi, LOGL_ERROR, + "Failed to parse ARFCN from RSP MEASURE: %s\n", resp); return; } const struct phyif_rsp rsp = { .type = PHYIF_CMDT_MEASURE, .param.measure = { - .last = band_arfcn == trx->pm_band_arfcn_stop, .band_arfcn = band_arfcn, .dbm = dbm, }, }; phyif_handle_rsp(trx, &rsp); - - /* Schedule a next measurement */ - if (band_arfcn != trx->pm_band_arfcn_stop) { - const struct phyif_cmdp_measure cmdp = { - .band_arfcn_start = ++band_arfcn, - .band_arfcn_stop = trx->pm_band_arfcn_stop, - }; - - trx_if_cmd_measure(trx, &cmdp); - } } /* diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 4eea55a..838bb6a 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -188,7 +188,6 @@ { const struct phyif_rspp_measure *meas = &rsp->param.measure; struct trxcon_param_full_power_scan_res res = { - .last_result = meas->last, .band_arfcn = meas->band_arfcn, .dbm = meas->dbm, }; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 38b95ec..0919315 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -53,6 +53,7 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); break; case TRXCON_EV_RESET_FULL_REQ: + TALLOC_FREE(trxcon->fi_data); if (fi->state != TRXCON_ST_RESET) osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); l1sched_reset(trxcon->sched, true); @@ -125,16 +126,26 @@ const struct trxcon_param_full_power_scan_req *req) { struct trxcon_inst *trxcon = fi->priv; - const struct phyif_cmd phycmd = { - .type = PHYIF_CMDT_MEASURE, - .param.measure = { - .band_arfcn_start = req->band_arfcn_start, - .band_arfcn_stop = req->band_arfcn_stop, - }, - }; + enum gsm_band band_start, band_stop; + if (trxcon->fi_data != NULL) { + LOGPFSML(fi, LOGL_ERROR, "Full power scan is already in progress\n"); + return; + } + + /* The start and stop ARFCNs must be in the same band */ + if (gsm_arfcn2band_rc(req->band_arfcn_start, &band_start) != 0 || + gsm_arfcn2band_rc(req->band_arfcn_stop, &band_stop) != 0 || + band_start != band_stop) { + LOGPFSML(fi, LOGL_ERROR, "Full power scan request has invalid params\n"); + return; + } + + trxcon->fi_data = talloc_memdup(fi, req, sizeof(*req)); + OSMO_ASSERT(trxcon->fi_data != NULL); + + /* trxcon_st_full_power_scan_onenter() sends the initial PHYIF_CMDT_MEASURE */ osmo_fsm_inst_state_chg(fi, TRXCON_ST_FULL_POWER_SCAN, 0, 0); /* TODO: timeout */ - phyif_handle_cmd(trxcon->phyif, &phycmd); } static void trxcon_st_reset_action(struct osmo_fsm_inst *fi, @@ -179,6 +190,23 @@ } } +static void trxcon_st_full_power_scan_onenter(struct osmo_fsm_inst *fi, + uint32_t prev_state) +{ + const struct trxcon_inst *trxcon = fi->priv; + const struct trxcon_param_full_power_scan_req *req = trxcon->fi_data; + + /* req->band_arfcn_start holds the current ARFCN */ + const struct phyif_cmd phycmd = { + .type = PHYIF_CMDT_MEASURE, + .param.measure = { + .band_arfcn = req->band_arfcn_start, + }, + }; + + phyif_handle_cmd(trxcon->phyif, &phycmd); +} + static void trxcon_st_full_power_scan_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -187,9 +215,33 @@ switch (event) { case TRXCON_EV_FULL_POWER_SCAN_RES: { + struct trxcon_param_full_power_scan_req *req = trxcon->fi_data; const struct trxcon_param_full_power_scan_res *res = data; - l1ctl_tx_pm_conf(trxcon->l2if, res->band_arfcn, res->dbm, res->last_result); + if (req == NULL) { + LOGPFSML(fi, LOGL_ERROR, "Rx unexpected power scan result\n"); + break; + } + + /* req->band_arfcn_start holds the expected ARFCN */ + if (res->band_arfcn != req->band_arfcn_start) { + LOGPFSML(fi, LOGL_ERROR, "Rx power scan result " + "with unexpected ARFCN %u (expected %u)\n", + res->band_arfcn & ~ARFCN_FLAG_MASK, + req->band_arfcn_start & ~ARFCN_FLAG_MASK); + break; + } + + if (res->band_arfcn < req->band_arfcn_stop) { + l1ctl_tx_pm_conf(trxcon->l2if, res->band_arfcn, res->dbm, false); + /* trxcon_st_full_power_scan_onenter() sends the next PHYIF_CMDT_MEASURE */ + req->band_arfcn_start = res->band_arfcn + 1; + osmo_fsm_inst_state_chg(fi, TRXCON_ST_FULL_POWER_SCAN, 0, 0); /* TODO: timeout */ + } else { + l1ctl_tx_pm_conf(trxcon->l2if, res->band_arfcn, res->dbm, true); + LOGPFSML(fi, LOGL_INFO, "Full power scan completed\n"); + TALLOC_FREE(trxcon->fi_data); + } break; } case TRXCON_EV_FULL_POWER_SCAN_REQ: @@ -525,6 +577,7 @@ | S(TRXCON_ST_FULL_POWER_SCAN), .in_event_mask = S(TRXCON_EV_FULL_POWER_SCAN_RES) | S(TRXCON_EV_FULL_POWER_SCAN_REQ), + .onenter = &trxcon_st_full_power_scan_onenter, .action = &trxcon_st_full_power_scan_action, }, [TRXCON_ST_FBSB_SEARCH] = { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic5f724a11e225b439ec10aed7697e3e03b7929e5 Gerrit-Change-Number: 30054 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022