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

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Templates: fix tr_S1AP_SetupReq
by fixeria 09 Jul '23

09 Jul '23

Attention is currently required from: laforge, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633 ) Change subject: S1AP_Templates: fix tr_S1AP_SetupReq ...................................................................... Patch Set 1: (1 comment) File library/s1ap/S1AP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633/comment/8bdd7333_86ff… PS1, Line 72: }, *, { > There is only one IE in between, the `eNB Name`. So yes, it should be `?`. ... but this IE is defined as optional, so `?` is not the correct option. Does `ifpresent` work within template lists? IIRC, no. So using `*` seems to be the only option :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633 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: Id4b52921053884e79349301598b75c264b7f058c Gerrit-Change-Number: 33633 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 11:32:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Templates: fix tr_S1AP_SetupReq
by fixeria 09 Jul '23

09 Jul '23

Attention is currently required from: laforge, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633 ) Change subject: S1AP_Templates: fix tr_S1AP_SetupReq ...................................................................... Patch Set 1: (1 comment) File library/s1ap/S1AP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633/comment/077aa140_c9fc… PS1, Line 72: }, *, { > IF the spec says (I didn't read it) there is only *one* intermediate IE permitted, we better use "?" […] There is only one IE in between, the `eNB Name`. So yes, it should be `?`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633 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: Id4b52921053884e79349301598b75c264b7f058c Gerrit-Change-Number: 33633 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 11:28:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Templates: cosmetic: fix sourcecode formatting
by fixeria 09 Jul '23

09 Jul '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33632 ) Change subject: S1AP_Templates: cosmetic: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33632 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: I6e70377315fdcc7ea6d0708fc6de87c335539282 Gerrit-Change-Number: 33632 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 11:22:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: lapdm: cosmetic: simplify lapdm_phsap_up(), use OSMO_PRIM[_HDR]
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: jolly, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33409 ) Change subject: lapdm: cosmetic: simplify lapdm_phsap_up(), use OSMO_PRIM[_HDR] ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87dedca0a38f290ae56649373dc9172433b8e4b1 Gerrit-Change-Number: 33409 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 08:13:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: Unregister profile commands during equip
by laforge 09 Jul '23

09 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33424 ) Change subject: pySim-shell: Unregister profile commands during equip ...................................................................... pySim-shell: Unregister profile commands during equip This avoids error messages about re-registering 'AddlShellCommands' commandsets during 'equip()' in the bulk_script command. Change-Id: I893bb5ae95f5c6e4c2be2d133754e427bc92a33d --- M pySim-shell.py 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index 3161844..a65e42a 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -215,6 +215,10 @@ if self.rs: lchan = self.rs.lchan[0] lchan.unregister_cmds(self) + if self.rs.profile: + for cmd_set in self.rs.profile.shell_cmdsets: + self.unregister_command_set(cmd_set) + for cmds in [Iso7816Commands, Ts102222Commands, PySimCommands]: cmd_set = self.find_commandsets(cmds) if cmd_set: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893bb5ae95f5c6e4c2be2d133754e427bc92a33d Gerrit-Change-Number: 33424 Gerrit-PatchSet: 3 Gerrit-Owner: iw0 <osmocom(a)heychris.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: pySim-shell: Unregister profile commands during equip
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: iw0. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33424 ) Change subject: pySim-shell: Unregister profile commands during equip ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893bb5ae95f5c6e4c2be2d133754e427bc92a33d Gerrit-Change-Number: 33424 Gerrit-PatchSet: 2 Gerrit-Owner: iw0 <osmocom(a)heychris.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: iw0 <osmocom(a)heychris.eu> Gerrit-Comment-Date: Sun, 09 Jul 2023 08:12:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in gapk[master]: aarch64: add get_cycles
by laforge 09 Jul '23

09 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/gapk/+/33620 ) Change subject: aarch64: add get_cycles ...................................................................... aarch64: add get_cycles borrowed from arch/arm64/include/asm/arch_timer.h Change-Id: I489fb8346fbc7440f40695f01d80a89b90761165 --- A .checkpatch.conf M include/osmocom/gapk/get_cycles.h 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..58a0b87 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1 @@ +--ignore NEW_TYPEDEFS diff --git a/include/osmocom/gapk/get_cycles.h b/include/osmocom/gapk/get_cycles.h index 40ac570..25376a1 100644 --- a/include/osmocom/gapk/get_cycles.h +++ b/include/osmocom/gapk/get_cycles.h @@ -103,6 +103,16 @@ #endif return ret & ~TICK_PRIV_BIT; } +#elif defined(__aarch64__) + +typedef unsigned long cycles_t; +static inline cycles_t get_cycles(void) +{ + cycles_t cval; + asm volatile("isb" : : : "memory"); + asm volatile("mrs %0, cntvct_el0" : "=r" (cval)); + return cval; +} #elif defined(__PPC__) #define CPU_FTR_601 0x00000100 typedef unsigned long cycles_t; -- To view, visit https://gerrit.osmocom.org/c/gapk/+/33620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I489fb8346fbc7440f40695f01d80a89b90761165 Gerrit-Change-Number: 33620 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in gapk[master]: aarch64: add get_cycles
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/33620 ) Change subject: aarch64: add get_cycles ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/33620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I489fb8346fbc7440f40695f01d80a89b90761165 Gerrit-Change-Number: 33620 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 08:12:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version
by laforge 09 Jul '23

09 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33521 ) Change subject: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version ...................................................................... ttcn3-bts-test/jenkins.sh: set mp_pcuif_version OsmoBTS currently uses PCUIF v.10 but will move to v.11 soon. (see Depends). Unfortuantely this means that we have to execute the TTCN3 testsuite in master with PCUIF v.11 and in latest with PCUIF v.10. This will be the case until the current master becomes the new latest on the next release. Depends: osmo-bts.git I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25 Depends: osmo-ttcn3-hacks.git I08de02e951e10bc8b4381cc2ad32e63f2747e3c4 Change-Id: Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb Related: OS#5927 --- M ttcn3-bts-test/generic/BTS_Tests.cfg M ttcn3-bts-test/jenkins.sh M ttcn3-bts-test/oml/BTS_Tests.cfg M ttcn3-bts-test/virtphy/BTS_Tests.cfg 4 files changed, 35 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index f6a0552..7015111 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -18,6 +18,7 @@ BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10" BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10" BTS_Tests.mp_l1_supports_gprs := true +PCUIF_Types.mp_pcuif_version := 10; [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index ed1e095..c456f37 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -121,17 +121,31 @@ $REPO_USER/ttcn3-bts-test } +set_pcuif_version() { + # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is + # executed for current master. For latest the PCUIF module parameter must stay at v.10 + # since in osmo-btw-latest PCUIF v.11 is not yet supported. After the next release PCUIF + # v.11 will be supported in osmo-bts-latest as well and this function, including the + # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed. + if image_suffix_is_master; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 10/PCUIF_Types.mp_pcuif_version := 11/g' $1 + fi +} + network_create mkdir $VOL_BASE_DIR/bts-tester-generic cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-virtphy cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-oml cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-oml/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg" mkdir $VOL_BASE_DIR/bts-tester-hopping cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/ write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg" diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg index ee2b4e0..bcecf28 100644 --- a/ttcn3-bts-test/oml/BTS_Tests.cfg +++ b/ttcn3-bts-test/oml/BTS_Tests.cfg @@ -19,6 +19,7 @@ BTS_Tests_OML.mp_oml_ip := "172.18.9.10" BTS_Tests_OML.mp_oml_port := 3002 BTS_Tests_OML.mp_pcu_socket := "/data/unix/pcu_sock" +PCUIF_Types.mp_pcuif_version := 10; [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg b/ttcn3-bts-test/virtphy/BTS_Tests.cfg index ee3455d..74d6f53 100644 --- a/ttcn3-bts-test/virtphy/BTS_Tests.cfg +++ b/ttcn3-bts-test/virtphy/BTS_Tests.cfg @@ -17,6 +17,7 @@ BTS_Tests.mp_ctrl_ip := "172.18.9.20" BTS_Tests.mp_l1_supports_gprs := true BTS_Tests.mp_bts_trxc_port := -1; +PCUIF_Types.mp_pcuif_version := 10; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb Gerrit-Change-Number: 33521 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(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 0

[S] Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33521 ) Change subject: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb Gerrit-Change-Number: 33521 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(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: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 09 Jul 2023 08:11:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0