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

[M] Change in osmo-bsc[master]: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory)
by dexter 09 Mar '23

09 Mar '23

Attention is currently required from: neels, laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31618 ) Change subject: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory) ...................................................................... Patch Set 11: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/5e6d33c5_bde323c5 PS10, Line 62: bool pcu_connected(struct gsm_bts *bts) > imho this should be passed a net object now. This is the pcu_sock so no depending on any BTS. […] Yes, its clearly network oriented. I have fixed this now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b Gerrit-Change-Number: 31618 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 14:09:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory)
by dexter 09 Mar '23

09 Mar '23

Attention is currently required from: neels, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618 to look at the new patch set (#11). Change subject: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory) ...................................................................... pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory) The current PCU implementation has never been tested with multiple BTS attached to it. This is due to the fact that it has been used exclusively in an BTS co-located setup where naturally only one BTS is present. The PCU sock protocol supports multiple BTSs in theory and we should handle this correctly. Related: OS#5198 Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/pcu_if.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/pcu_sock.c M src/osmo-bsc/timeslot_fsm.c 7 files changed, 143 insertions(+), 98 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/31618/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b Gerrit-Change-Number: 31618 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bsc[master]: bts: add function to check if a BTS has a BSC co located PCU
by dexter 09 Mar '23

09 Mar '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31801 ) Change subject: bts: add function to check if a BTS has a BSC co located PCU ...................................................................... bts: add function to check if a BTS has a BSC co located PCU At the momemnt we use is_ericsson_bts() to check if the BTS uses a BSC co-located PCU, this is a bit ambiguous, lets have a function that explicitly checks for a BSC co-located PCU and nothing else. Change-Id: I23ed4219e5ebd188867c17f387ca877efa9bc3b0 Related: OS#5198 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/timeslot_fsm.c 2 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/31801/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 4faf5f2..4ae3c59 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -751,6 +751,18 @@ return 0; } +static inline int bsc_co_located_pcu(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_RBS2000: + return 1; + default: + break; + } + + return 0; +} + static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts) { static struct osmo_location_area_id lai; diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index aa5e0db..790ad77 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -341,7 +341,7 @@ return; } - if (is_ericsson_bts(bts) && !pcu_connected(bts)) { + if (bsc_co_located_pcu(bts) && !pcu_connected(bts)) { LOG_TS(ts, LOGL_DEBUG, "PCU not connected: not activating PDCH.\n"); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23ed4219e5ebd188867c17f387ca877efa9bc3b0 Gerrit-Change-Number: 31801 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: pcu_sock: use is_ericsson_bts() to check for ericsson BTS
by dexter 09 Mar '23

09 Mar '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31802 ) Change subject: pcu_sock: use is_ericsson_bts() to check for ericsson BTS ...................................................................... pcu_sock: use is_ericsson_bts() to check for ericsson BTS Do not access bts->type directly, we have is_ericsson_bts() to do that Related: OS#5198 Change-Id: I274a9f0f1208dc17713ba2e1c7a1110eeb133cca --- M src/osmo-bsc/pcu_sock.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/31802/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 7160210..a2e2f51 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -573,7 +573,7 @@ * assign downlink TBFs directly through the paging channel. However, this method never became part * of the RSL specs. This means that each BTS vendor has to come up with a proprietary method. At * the moment we only support Ericsson RBS here. */ - if (bts->type == GSM_BTS_TYPE_RBS2000) { + if (is_ericsson_bts(bts)) { rc = rsl_ericsson_imm_assign_cmd(bts, pch_dt->tlli, sizeof(pch_dt->data), pch_dt->data, pag_grp); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I274a9f0f1208dc17713ba2e1c7a1110eeb133cca Gerrit-Change-Number: 31802 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: pcu_sock: check BTS type properly in pcu_info_update()
by dexter 09 Mar '23

09 Mar '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31803 ) Change subject: pcu_sock: check BTS type properly in pcu_info_update() ...................................................................... pcu_sock: check BTS type properly in pcu_info_update() When updating the BTS information in the bsc co-located PCU, first check if the BTS has a BSC co-located PCU at all. Also check if the BTS is E1 based since those type of BTS require extra information about the E1 connection. Related: OS#5198 Change-Id: I8da26debc0e27f24fae4ee88f22f8875de13bc84 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/31803/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index a2e2f51..5fe599e 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -362,13 +362,13 @@ __attribute__((weak)) void pcu_info_update(struct gsm_bts *bts) { if (pcu_connected(bts)) { - /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the - * PDCH before we announce the other BTS related parameters. At the moment Ericsson RBS is the only - * E1 BTS we support. */ - if (is_ericsson_bts(bts)) - pcu_tx_e1_ccu_ind(bts); - - pcu_tx_info_ind(bts); + if (bsc_co_located_pcu(bts)) { + /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the + * PDCH before we announce the other BTS related parameters. */ + if (is_e1_bts(bts)) + pcu_tx_e1_ccu_ind(bts); + pcu_tx_info_ind(bts); + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8da26debc0e27f24fae4ee88f22f8875de13bc84 Gerrit-Change-Number: 31803 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: rsl_rx_ipac_XXcx: parse csd_fmt_d/ir
by fixeria 09 Mar '23

09 Mar '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31795 ) Change subject: rsl_rx_ipac_XXcx: parse csd_fmt_d/ir ...................................................................... Patch Set 1: (1 comment) File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/31795/comment/639e52ba_2f9da67a PS1, Line 2772: csd_fmt_d = *csd_fmt & 0xf; Are you sure this is correct? In the previous patch I see: ``` |=== | Offset | Size | Description | 0 | 4 | RTP CSD Format IR | 4 | 4 | RTP CSD Format D |=== ``` so if this table is correct, it should be (assuming MSB): ``` csd_fmt_ir = *csd_fmt & 0x0f; csd_fmt_d = *csd_fmt >> 4; ``` or vice versa if the bit order is LSB. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfc7811387df5224682d7e6a313d38648d3d8c48 Gerrit-Change-Number: 31795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 13:25:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: doc: rsl: add RSL_IE_IPAC_RTP_CSD_FORMAT
by fixeria 09 Mar '23

09 Mar '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31794 ) Change subject: doc: rsl: add RSL_IE_IPAC_RTP_CSD_FORMAT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8f40076698f2b341cc0096fd96ba2051a41f077 Gerrit-Change-Number: 31794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 13:18:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: gitignore: add vty pdf
by fixeria 09 Mar '23

09 Mar '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31793 ) Change subject: gitignore: add vty pdf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8653d5521680bb6ac2b32371b5428263082bc7f3 Gerrit-Change-Number: 31793 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 13:17:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory)
by pespin 09 Mar '23

09 Mar '23

Attention is currently required from: neels, laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31618 ) Change subject: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory) ...................................................................... Patch Set 10: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/47142573_38c04008 PS10, Line 62: bool pcu_connected(struct gsm_bts *bts) imho this should be passed a net object now. This is the pcu_sock so no depending on any BTS. If you want, add an extra function in bts.c bts_is_pcu_connected(bts) to add the extra is_ericsson_bts() after calling this pcu_connected(). EDIT: actually, it probably needs to be passed a struct pcu_sock_state *stat. Either that or *net, whatever you feel like. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b Gerrit-Change-Number: 31618 Gerrit-PatchSet: 10 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 13:16:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: tests/CommonLibs: clean up Makefile.am
by fixeria 09 Mar '23

09 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/31799 ) Change subject: tests/CommonLibs: clean up Makefile.am ...................................................................... tests/CommonLibs: clean up Makefile.am * AM_CPPFLAGS is for preprocessor flags like '-I' or '-D', * AM_CFLAGS/AM_CXXFLAGS is for C/C++ compiler flags like '-Wall', * AM_LDFLAGS is for linker flags, not libraries! Change-Id: I42713edd17a510aea8558c8b0f9cca98c46979b3 --- M tests/CommonLibs/Makefile.am 1 file changed, 32 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/99/31799/1 diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am index e6790e6..036cd2d 100644 --- a/tests/CommonLibs/Makefile.am +++ b/tests/CommonLibs/Makefile.am @@ -1,7 +1,23 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = -Wall -I$(top_srcdir)/CommonLibs $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -g -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) +AM_CPPFLAGS = \ + $(STD_DEFINES_AND_INCLUDES) \ + -I$(top_srcdir)/CommonLibs \ + $(NULL) + +AM_CXXFLAGS = + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(NULL) + +LDADD = \ + $(COMMON_LA) \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(NULL) EXTRA_DIST = BitVectorTest.ok \ PRBSTest.ok \ @@ -20,21 +36,16 @@ LogTest BitVectorTest_SOURCES = BitVectorTest.cpp -BitVectorTest_LDADD = $(COMMON_LA) PRBSTest_SOURCES = PRBSTest.cpp InterthreadTest_SOURCES = InterthreadTest.cpp -InterthreadTest_LDADD = $(COMMON_LA) -InterthreadTest_LDFLAGS = -lpthread $(AM_LDFLAGS) +InterthreadTest_LDADD = $(LDADD) -lpthread TimevalTest_SOURCES = TimevalTest.cpp -TimevalTest_LDADD = $(COMMON_LA) VectorTest_SOURCES = VectorTest.cpp -VectorTest_LDADD = $(COMMON_LA) LogTest_SOURCES = LogTest.cpp -LogTest_LDADD = $(COMMON_LA) MOSTLYCLEANFILES += testSource testDestination -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I42713edd17a510aea8558c8b0f9cca98c46979b3 Gerrit-Change-Number: 31799 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0