May 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: nokia: rename BTS model from nokia_site to nokia-e1
by osmith 06 May '26

06 May '26

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email ) Change subject: nokia: rename BTS model from nokia_site to nokia-e1 ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/42729/comment/19964ed1_3315952d?usp… : PS2, Line 187: static const char *args[] = { "nokia-e1" }; > > `static const char *` array should probably be `static const char * const` […] -> https://gerrit.osmocom.org/c/osmo-ci/+/42731 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 Gerrit-Change-Number: 42729 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 06 May 2026 06:21:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>

1 0

[XS] Change in osmo-ci[master]: lint/checkpatch: ignore STATIC_CONST_CHAR_ARRAY
by osmith 06 May '26

06 May '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42731?usp=email ) Change subject: lint/checkpatch: ignore STATIC_CONST_CHAR_ARRAY ...................................................................... lint/checkpatch: ignore STATIC_CONST_CHAR_ARRAY include/osmocom/vty/command.h has the following: #define DEFUN_CMD_FUNC_DECL(funcname) \ static int funcname (struct cmd_element *, struct vty *, int, const char *[]); \ #define DEFUN_CMD_FUNC_TEXT(funcname) \ static int funcname \ (struct cmd_element *self, struct vty *vty, int argc, const char *argv[]) So the pointer to argv is const, but the elements in the array are not. Functions can in theory modify the elements of argv (just like argv in main()). I don't know if we have users of this API that are actually doing that, but as long as the API is defined like this it doesn't make sense for the linter to complain about using it correctly. Therefore, ignore STATIC_CONST_CHAR_ARRAY. Related: https://gerrit.osmocom.org/c/osmo-bsc/+/42729/comment/f3bc5254_5f30d1bb/ Change-Id: Iae0d3ff4ca648d6a3b6ca0f7805ec18e50befa80 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/31/42731/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index de14044..50551b0 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -77,6 +77,7 @@ # * SPDX_LICENSE_TAG: we don't place it on line 1 # * SPLIT_STRING: we do split long messages over multiple lines # * SSCANF_TO_KSTRTO: kernel specific +# * STATIC_CONST_CHAR_ARRAY: incompatible with DEFUN_* API from libosmocore # * STRING_FRAGMENTS: sometimes used intentionally to improve readability # * SYMBOLIC_PERMS: recommends using octal permissions over symbolic ones, not followed # * TRACING_LOGGING: recommends to use kernel's internal ftrace instead of printf("%s()\n", __func__) @@ -116,6 +117,7 @@ --ignore SPDX_LICENSE_TAG \ --ignore SPLIT_STRING \ --ignore SSCANF_TO_KSTRTO \ + --ignore STATIC_CONST_CHAR_ARRAY \ --ignore STRING_FRAGMENTS \ --ignore SYMBOLIC_PERMS \ --ignore TRACING_LOGGING \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iae0d3ff4ca648d6a3b6ca0f7805ec18e50befa80 Gerrit-Change-Number: 42731 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: nokia: rename BTS model from nokia_site to nokia-e1
by falconia 06 May '26

06 May '26

falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email ) Change subject: nokia: rename BTS model from nokia_site to nokia-e1 ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/42729/comment/92c30ae9_f1740cf3?usp… : PS2, Line 187: static const char *args[] = { "nokia-e1" }; > `static const char *` array should probably be `static const char * const` If I change that line to what the linter asks for, the result is compilation warning about discarding const qualifier: `cfg_bts_type()` function created by `DEFUN_USRATTR()` magic takes `const char **` rather than `const char * const*`. So what do we do? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 Gerrit-Change-Number: 42729 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 06 May 2026 03:27:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-bsc[master]: nokia: rename BTS model from nokia_site to nokia-e1
by Jenkins Builder 06 May '26

06 May '26

Attention is currently required from: falconia. Jenkins Builder has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email ) Change subject: nokia: rename BTS model from nokia_site to nokia-e1 ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bts_vty.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-bsc/+/42729/comment/f3bc5254_5f30d1bb?usp… : PS2, Line 187: static const char *args[] = { "nokia-e1" }; static const char * array should probably be static const char * const -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 Gerrit-Change-Number: 42729 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 06 May 2026 03:06:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-bsc[master]: nokia: rename BTS model from nokia_site to nokia-e1
by falconia 06 May '26

06 May '26

Attention is currently required from: falconia. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: nokia: rename BTS model from nokia_site to nokia-e1 ...................................................................... nokia: rename BTS model from nokia_site to nokia-e1 When Nokia BTS support was introduced into Osmocom in 2011, only {Metro,Ultra,In}Site family was supported, and the name of this BTS model in OsmoBSC was set to nokia_site. However, we now also support Flexi Multiradio in E1 Abis configuration with the same code, automatically applying Site-specific or Flexi-MR- specific handling based on the type code returned by the BTS itself - hence calling the BTS model nokia_site and referring strictly to *Site in docs and vty help is now misleading. At the same time, these newer BTS models support both E1 and IP Abis options, and there is a desire to support IP Abis operation at some point in the future. When/if Nokia IP support becomes a reality, we will certainly need to know upfront which type of Abis we are working with, similarly to how we currently distinguish upfront between E1 and IPA types of BTS. Therefore, the new BTS model name is set to nokia-e1, rather than just "nokia", with the expectation that we will also have nokia-ip in the future. bts_nokia_site.c source file name is deliberately left unchanged. Source file renames make it difficult to follow changes, hence a slightly outdated source file name is deemed to be a lesser evil. This source file may also be split in the future as Nokia BTS support code grows. Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 --- M include/osmocom/bsc/bss.h M include/osmocom/bsc/bts.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_init.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c 8 files changed, 46 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/42729/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 Gerrit-Change-Number: 42729 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in osmo-bsc[master]: nokia: rename BTS model from nokia_site to nokia-e1
by Jenkins Builder 06 May '26

06 May '26

Jenkins Builder has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email ) Change subject: nokia: rename BTS model from nokia_site to nokia-e1 ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bts_vty.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-bsc/+/42729/comment/9cece3b4_059e796c?usp… : PS1, Line 187: const char *args[] = { "nokia-e1" }; char * array declaration might be better as static const -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 Gerrit-Change-Number: 42729 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 06 May 2026 02:53:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in osmo-bsc[master]: gsm_set_bts_type(): fix switch statement
by falconia 06 May '26

06 May '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42728?usp=email ) Change subject: gsm_set_bts_type(): fix switch statement ...................................................................... gsm_set_bts_type(): fix switch statement The switch statement on (bts->type) in this function exhibited two defects: 1) From the beginning, each unhandled BTS type was listed explicitly, instead of providing a default case; 2) When Nokia-specific initialization was added in 2015, the addition was erroneously applied to GSM_BTS_TYPE_BS11 and GSM_BTS_TYPE_UNKNOWN cases, besides the intended case of GSM_BTS_TYPE_NOKIA_SITE. Fixes: 56e1766dba1a03e304e51d079e65406542e7887c Change-Id: Ibf500c373b69a69182885d5e700abc6fb1b03ccd --- M src/osmo-bsc/bts.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/42728/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 2ec4865..d295bfd 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -742,14 +742,12 @@ INIT_LLIST_HEAD(&bts->rbs2000.is.conn_groups); INIT_LLIST_HEAD(&bts->rbs2000.con.conn_groups); break; - case GSM_BTS_TYPE_BS11: - case GSM_BTS_TYPE_UNKNOWN: case GSM_BTS_TYPE_NOKIA_SITE: /* Set default BTS reset timer */ bts->nokia.bts_reset_timer_cnf = 15; /* Enable Rx diversity by default, for backward compat */ bts->nokia.rx_diversity = 1; - case _NUM_GSM_BTS_TYPE: + default: break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibf500c373b69a69182885d5e700abc6fb1b03ccd Gerrit-Change-Number: 42728 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in osmo-bsc[master]: nokia: rename vty settings, drop _site
by falconia 06 May '26

06 May '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42730?usp=email ) Change subject: nokia: rename vty settings, drop _site ...................................................................... nokia: rename vty settings, drop _site All Nokia-specific vty settings previously had names beginning with nokia_site, creating needless confusion for operators of Nokia BTS models that are newer than *Site family. Rename these vty settings to begin with just nokia, with nokia_site supported as a backward compatibility alias. Change-Id: I807c0ad14f4436a21f0be0a5ed291539cd4af7e8 --- M src/osmo-bsc/bts_vty.c 1 file changed, 57 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/42730/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 33629a8..e329f78 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -403,10 +403,10 @@ #define NOKIA_STR "Nokia BTS related commands\n" -DEFUN_USRATTR(cfg_bts_nokia_site_skip_reset, - cfg_bts_nokia_site_skip_reset_cmd, +DEFUN_USRATTR(cfg_bts_nokia_skip_reset, + cfg_bts_nokia_skip_reset_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), - "nokia_site skip-reset (0|1)", + "nokia skip-reset (0|1)", NOKIA_STR "Skip the reset step during bootstrap process of this BTS\n" "Do NOT skip the reset\n" "Skip the reset\n") @@ -422,10 +422,16 @@ return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_bts_nokia_skip_reset, + cfg_bts_nokia_site_skip_reset_cmd, + "nokia_site skip-reset (0|1)", + NOKIA_STR + "Skip the reset step during bootstrap process of this BTS\n" + "Do NOT skip the reset\n" "Skip the reset\n"); -DEFUN_ATTR(cfg_bts_nokia_site_no_loc_rel_cnf, - cfg_bts_nokia_site_no_loc_rel_cnf_cmd, - "nokia_site no-local-rel-conf (0|1)", +DEFUN_ATTR(cfg_bts_nokia_no_loc_rel_cnf, + cfg_bts_nokia_no_loc_rel_cnf_cmd, + "nokia no-local-rel-conf (0|1)", NOKIA_STR "Do not wait for RELease CONFirm message when releasing channel locally\n" "Wait for RELease CONFirm\n" "Do not wait for RELease CONFirm\n", @@ -442,10 +448,16 @@ return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_bts_nokia_no_loc_rel_cnf, + cfg_bts_nokia_site_no_loc_rel_cnf_cmd, + "nokia_site no-local-rel-conf (0|1)", + NOKIA_STR + "Do not wait for RELease CONFirm message when releasing channel locally\n" + "Wait for RELease CONFirm\n" "Do not wait for RELease CONFirm\n"); -DEFUN_ATTR(cfg_bts_nokia_site_bts_reset_timer_cnf, - cfg_bts_nokia_site_bts_reset_timer_cnf_cmd, - "nokia_site bts-reset-timer <15-300>", +DEFUN_ATTR(cfg_bts_nokia_bts_reset_timer_cnf, + cfg_bts_nokia_bts_reset_timer_cnf_cmd, + "nokia bts-reset-timer <15-300>", NOKIA_STR "The amount of time between BTS_RESET is sent " "and the BTS is being bootstrapped\n" @@ -463,11 +475,18 @@ return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_bts_nokia_bts_reset_timer_cnf, + cfg_bts_nokia_site_bts_reset_timer_cnf_cmd, + "nokia_site bts-reset-timer <15-300>", + NOKIA_STR + "The amount of time between BTS_RESET is sent " + "and the BTS is being bootstrapped\n" + "Timer value (in seconds, default 15)\n"); -DEFUN_USRATTR(cfg_bts_nokia_site_hopping_mode, - cfg_bts_nokia_site_hopping_mode_cmd, +DEFUN_USRATTR(cfg_bts_nokia_hopping_mode, + cfg_bts_nokia_hopping_mode_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), - "nokia_site hopping-mode (baseband|synthesizer)", + "nokia hopping-mode (baseband|synthesizer)", NOKIA_STR "Sets the hopping type for Nokia *Site\n" "Baseband (BB) hopping\n" @@ -487,11 +506,18 @@ return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_bts_nokia_hopping_mode, + cfg_bts_nokia_site_hopping_mode_cmd, + "nokia_site hopping-mode (baseband|synthesizer)", + NOKIA_STR + "Sets the hopping type for Nokia *Site\n" + "Baseband (BB) hopping\n" + "Synthesizer (RF) hopping\n"); -DEFUN_USRATTR(cfg_bts_nokia_site_rx_div, - cfg_bts_nokia_site_rx_div_cmd, +DEFUN_USRATTR(cfg_bts_nokia_rx_div, + cfg_bts_nokia_rx_div_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), - "nokia_site rx-diversity (0|1)", + "nokia rx-diversity (0|1)", NOKIA_STR "Rx diversity feature\n" "Disable Rx diversity\n" "Enable Rx diversity\n") @@ -507,6 +533,12 @@ return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_bts_nokia_rx_div, + cfg_bts_nokia_site_rx_div_cmd, + "nokia_site rx-diversity (0|1)", + NOKIA_STR + "Rx diversity feature\n" + "Disable Rx diversity\n" "Enable Rx diversity\n"); #define OML_STR "Organization & Maintenance Link\n" #define IPA_STR "A-bis/IP Specific Options\n" @@ -4749,12 +4781,12 @@ bts->oml_tei, bts->oml_e1_link.e1_nr, VTY_NEWLINE); break; case GSM_BTS_TYPE_NOKIA_E1: - vty_out(vty, " nokia_site skip-reset %d%s", bts->nokia.skip_reset, VTY_NEWLINE); - vty_out(vty, " nokia_site no-local-rel-conf %d%s", + vty_out(vty, " nokia skip-reset %d%s", bts->nokia.skip_reset, VTY_NEWLINE); + vty_out(vty, " nokia no-local-rel-conf %d%s", bts->nokia.no_loc_rel_cnf, VTY_NEWLINE); - vty_out(vty, " nokia_site bts-reset-timer %d%s", bts->nokia.bts_reset_timer_cnf, VTY_NEWLINE); - vty_out(vty, " nokia_site hopping-mode %s%s", get_value_string(nokia_hopping_mode_strs, bts->nokia.hopping_mode), VTY_NEWLINE); - vty_out(vty, " nokia_site rx-diversity %d%s", bts->nokia.rx_diversity, VTY_NEWLINE); + vty_out(vty, " nokia bts-reset-timer %d%s", bts->nokia.bts_reset_timer_cnf, VTY_NEWLINE); + vty_out(vty, " nokia hopping-mode %s%s", get_value_string(nokia_hopping_mode_strs, bts->nokia.hopping_mode), VTY_NEWLINE); + vty_out(vty, " nokia rx-diversity %d%s", bts->nokia.rx_diversity, VTY_NEWLINE); /* fall through: Nokia requires "oml e1" parameters also */ default: @@ -4980,6 +5012,11 @@ install_element(BTS_NODE, &cfg_bts_deprecated_unit_id_cmd); install_element(BTS_NODE, &cfg_bts_rsl_ip_cmd); install_element(BTS_NODE, &cfg_bts_deprecated_rsl_ip_cmd); + install_element(BTS_NODE, &cfg_bts_nokia_skip_reset_cmd); + install_element(BTS_NODE, &cfg_bts_nokia_no_loc_rel_cnf_cmd); + install_element(BTS_NODE, &cfg_bts_nokia_bts_reset_timer_cnf_cmd); + install_element(BTS_NODE, &cfg_bts_nokia_hopping_mode_cmd); + install_element(BTS_NODE, &cfg_bts_nokia_rx_div_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_skip_reset_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_no_loc_rel_cnf_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_bts_reset_timer_cnf_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I807c0ad14f4436a21f0be0a5ed291539cd4af7e8 Gerrit-Change-Number: 42730 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in osmo-bsc[master]: nokia: rename BTS model from nokia_site to nokia-e1
by falconia 06 May '26

06 May '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email ) Change subject: nokia: rename BTS model from nokia_site to nokia-e1 ...................................................................... nokia: rename BTS model from nokia_site to nokia-e1 When Nokia BTS support was introduced into Osmocom in 2011, only {Metro,Ultra,In}Site family was supported, and the name of this BTS model in OsmoBSC was set to nokia_site. However, we now also support Flexi Multiradio in E1 Abis configuration with the same code, automatically applying Site-specific or Flexi-MR- specific handling based on the type code returned by the BTS itself - hence calling the BTS model nokia_site and referring strictly to *Site in docs and vty help is now misleading. At the same time, these newer BTS models support both E1 and IP Abis options, and there is a desire to support IP Abis operation at some point in the future. When/if Nokia IP support becomes a reality, we will certainly need to know upfront which type of Abis we are working with, similarly to how we currently distinguish upfront between E1 and IPA types of BTS. Therefore, the new BTS model name is set to nokia-e1, rather than just "nokia", with the expectation that we will also have nokia-ip in the future. bts_nokia_site.c source file name is deliberately left unchanged. Source file renames make it difficult to follow changes, hence a slightly outdated source file name is deemed to be a lesser evil. This source file may also be split in the future as Nokia BTS support code grows. Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 --- M include/osmocom/bsc/bss.h M include/osmocom/bsc/bts.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_init.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c 8 files changed, 46 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/42729/1 diff --git a/include/osmocom/bsc/bss.h b/include/osmocom/bsc/bss.h index 199f981..05b4e94 100644 --- a/include/osmocom/bsc/bss.h +++ b/include/osmocom/bsc/bss.h @@ -15,6 +15,6 @@ extern int bts_model_bs11_init(void); extern int bts_model_rbs2k_init(void); extern int bts_model_nanobts_init(void); -extern int bts_model_nokia_site_init(void); +extern int bts_model_nokia_init(void); extern int bts_model_osmobts_init(void); #endif diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index f05f41c..b995752 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -242,7 +242,7 @@ GSM_BTS_TYPE_BS11, GSM_BTS_TYPE_NANOBTS, GSM_BTS_TYPE_RBS2000, - GSM_BTS_TYPE_NOKIA_SITE, + GSM_BTS_TYPE_NOKIA_E1, GSM_BTS_TYPE_OSMOBTS, _NUM_GSM_BTS_TYPE }; @@ -774,7 +774,7 @@ static inline bool is_nokia_bts(const struct gsm_bts *bts) { switch (bts->type) { - case GSM_BTS_TYPE_NOKIA_SITE: + case GSM_BTS_TYPE_NOKIA_E1: return true; default: break; @@ -800,7 +800,7 @@ switch (bts->type) { case GSM_BTS_TYPE_BS11: case GSM_BTS_TYPE_RBS2000: - case GSM_BTS_TYPE_NOKIA_SITE: + case GSM_BTS_TYPE_NOKIA_E1: return true; default: break; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 4627914..f0ba132 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1528,7 +1528,7 @@ mr->ms_l1.ta = val[1]; /* BS11, Nokia and RBS report TA shifted by 2 bits */ if (msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_BS11 - || msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE + || msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_NOKIA_E1 || msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_RBS2000) mr->ms_l1.ta >>= 2; /* store TA for handover decision, and for intra-cell re-assignment */ diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d295bfd..4b28df7 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -68,7 +68,7 @@ { GSM_BTS_TYPE_BS11, "bs11" }, { GSM_BTS_TYPE_NANOBTS, "nanobts" }, { GSM_BTS_TYPE_RBS2000, "rbs2000" }, - { GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" }, + { GSM_BTS_TYPE_NOKIA_E1, "nokia-e1" }, { GSM_BTS_TYPE_OSMOBTS, "osmo-bts" }, { 0, NULL } }; @@ -78,7 +78,7 @@ { GSM_BTS_TYPE_BS11, "Siemens BTS (BS-11 or compatible)" }, { GSM_BTS_TYPE_NANOBTS, "ip.access nanoBTS or compatible" }, { GSM_BTS_TYPE_RBS2000, "Ericsson RBS2000 Series" }, - { GSM_BTS_TYPE_NOKIA_SITE, "Nokia {Metro,Ultra,In}Site" }, + { GSM_BTS_TYPE_NOKIA_E1, "Nokia BTS with E1 Abis" }, { GSM_BTS_TYPE_OSMOBTS, "Osmocom Base Transceiver Station" }, { 0, NULL } }; @@ -742,7 +742,7 @@ INIT_LLIST_HEAD(&bts->rbs2000.is.conn_groups); INIT_LLIST_HEAD(&bts->rbs2000.con.conn_groups); break; - case GSM_BTS_TYPE_NOKIA_SITE: + case GSM_BTS_TYPE_NOKIA_E1: /* Set default BTS reset timer */ bts->nokia.bts_reset_timer_cnf = 15; /* Enable Rx diversity by default, for backward compat */ diff --git a/src/osmo-bsc/bts_init.c b/src/osmo-bsc/bts_init.c index 0e3debc..b931801 100644 --- a/src/osmo-bsc/bts_init.c +++ b/src/osmo-bsc/bts_init.c @@ -23,7 +23,7 @@ bts_model_bs11_init(); bts_model_rbs2k_init(); bts_model_nanobts_init(); - bts_model_nokia_site_init(); + bts_model_nokia_init(); bts_model_osmobts_init(); /* Your new BTS here. */ return 0; diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 9c1e5a1..be0fec3 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -140,7 +140,7 @@ switch (signal) { case S_GLOBAL_BTS_CLOSE_OM: bts = signal_data; - if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) + if (is_nokia_bts(bts)) shutdown_om(signal_data); break; } @@ -166,7 +166,7 @@ case S_L_INP_TEI_UP: switch (isd->link_type) { case E1INP_SIGN_OML: - if (isd->trx->bts->type != GSM_BTS_TYPE_NOKIA_SITE) + if (!is_nokia_bts(isd->trx->bts)) break; if (isd->tei == isd->trx->bts->oml_tei) @@ -193,7 +193,7 @@ static void nm_statechg_evt(unsigned int signal, struct nm_statechg_signal_data *nsd) { - if (nsd->bts->type != GSM_BTS_TYPE_NOKIA_SITE) + if (!is_nokia_bts(nsd->bts)) return; } @@ -2180,24 +2180,24 @@ return rc; } -static int bts_model_nokia_site_start(struct gsm_network *net); +static int bts_model_nokia_e1_start(struct gsm_network *net); -static void bts_model_nokia_site_e1line_bind_ops(struct e1inp_line *line) +static void bts_model_nokia_e1line_bind_ops(struct e1inp_line *line) { e1inp_line_bind_ops(line, &bts_isdn_e1inp_line_ops); } -static struct gsm_bts_model model_nokia_site = { - .type = GSM_BTS_TYPE_NOKIA_SITE, - .name = "nokia_site", - .start = bts_model_nokia_site_start, +static struct gsm_bts_model model_nokia_e1 = { + .type = GSM_BTS_TYPE_NOKIA_E1, + .name = "nokia-e1", + .start = bts_model_nokia_e1_start, .oml_rcvmsg = &abis_nokia_rcvmsg, - .e1line_bind_ops = &bts_model_nokia_site_e1line_bind_ops, + .e1line_bind_ops = &bts_model_nokia_e1line_bind_ops, }; static struct gsm_network *my_net; -static int bts_model_nokia_site_start(struct gsm_network *net) +static int bts_model_nokia_e1_start(struct gsm_network *net) { osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); osmo_signal_register_handler(SS_L_GLOBAL, gbl_sig_cb, NULL); @@ -2208,14 +2208,14 @@ return 0; } -int bts_model_nokia_site_init(void) +int bts_model_nokia_init(void) { - model_nokia_site.features.data = &model_nokia_site._features_data[0]; - model_nokia_site.features.data_len = sizeof(model_nokia_site._features_data); + model_nokia_e1.features.data = &model_nokia_e1._features_data[0]; + model_nokia_e1.features.data_len = sizeof(model_nokia_e1._features_data); - osmo_bts_set_feature(&model_nokia_site.features, BTS_FEAT_HOPPING); - osmo_bts_set_feature(&model_nokia_site.features, BTS_FEAT_HSCSD); - osmo_bts_set_feature(&model_nokia_site.features, BTS_FEAT_MULTI_TSC); + osmo_bts_set_feature(&model_nokia_e1.features, BTS_FEAT_HOPPING); + osmo_bts_set_feature(&model_nokia_e1.features, BTS_FEAT_HSCSD); + osmo_bts_set_feature(&model_nokia_e1.features, BTS_FEAT_MULTI_TSC); - return gsm_bts_model_register(&model_nokia_site); + return gsm_bts_model_register(&model_nokia_e1); } diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 3afa0cc..33629a8 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -178,6 +178,20 @@ return cfg_bts_type(self, vty, 1, args); } +DEFUN_DEPRECATED(cfg_bts_type_nokia_site, + cfg_bts_type_nokia_site_cmd, + "type nokia_site", + "Set the BTS type\n" + "Deprecated alias for 'nokia-e1'\n") +{ + const char *args[] = { "nokia-e1" }; + + vty_out(vty, "%% BTS type 'nokia_site' is deprecated, " + "use 'type nokia-e1' instead.%s", VTY_NEWLINE); + + return cfg_bts_type(self, vty, 1, args); +} + DEFUN_USRATTR(cfg_bts_band, cfg_bts_band_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), @@ -4170,7 +4184,7 @@ vty_out(vty, " Unit ID: %u/%u/0, OML Stream ID 0x%02x%s", bts->ip_access.site_id, bts->ip_access.bts_id, bts->oml_tei, VTY_NEWLINE); - else if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) + else if (is_nokia_bts(bts)) vty_out(vty, " Skip Reset: %d%s", bts->nokia.skip_reset, VTY_NEWLINE); vty_out(vty, " NM State: "); @@ -4734,7 +4748,7 @@ vty_out(vty, " oml ipa stream-id %u line %u%s", bts->oml_tei, bts->oml_e1_link.e1_nr, VTY_NEWLINE); break; - case GSM_BTS_TYPE_NOKIA_SITE: + case GSM_BTS_TYPE_NOKIA_E1: vty_out(vty, " nokia_site skip-reset %d%s", bts->nokia.skip_reset, VTY_NEWLINE); vty_out(vty, " nokia_site no-local-rel-conf %d%s", bts->nokia.no_loc_rel_cnf, VTY_NEWLINE); @@ -4950,6 +4964,7 @@ install_node(&bts_node, config_write_bts); install_element(BTS_NODE, &cfg_bts_type_cmd); install_element(BTS_NODE, &cfg_bts_type_sysmobts_cmd); + install_element(BTS_NODE, &cfg_bts_type_nokia_site_cmd); install_element(BTS_NODE, &cfg_description_cmd); install_element(BTS_NODE, &cfg_no_description_cmd); install_element(BTS_NODE, &cfg_bts_band_cmd); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index f4a4c4c..714ca96 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -322,7 +322,7 @@ trx->arfcn, osmo_plmn_name(&bsc_gsmnet->plmn), bts->location_area_code, bts->cell_identity, bts->bsic); - if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) { + if (is_nokia_bts(bts)) { rsl_nokia_si_begin(trx); } @@ -339,7 +339,7 @@ return; } - if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) { + if (is_nokia_bts(bts)) { /* channel unspecific, power reduction in 2 dB steps */ rsl_bs_power_control(trx, 0xFF, trx->max_power_red / 2); rsl_nokia_si_end(trx); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3e993bda577964922e29dbbaf9554fa53bb2d445 Gerrit-Change-Number: 42729 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[S] Change in osmo-bsc[master]: Nokia Flexi Multiradio: reset non-BCCH TRX
by falconia 06 May '26

06 May '26

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42727?usp=email ) Change subject: Nokia Flexi Multiradio: reset non-BCCH TRX ...................................................................... Nokia Flexi Multiradio: reset non-BCCH TRX In the case of MetroSite and UltraSite BTS, it has been determined empirically that TRX reset needs to be skipped for non-BCCH TRX. However, the opposite situation holds on Flexi MR: non-BCCH TRX do need to be reset, or they fail to come up. Solution: conditionalize reset of non-BCCH TRX on Nokia BTS type. Change-Id: I270c1ffab074c1e5a43ab9dfa103725a1518f718 --- M src/osmo-bsc/bts_nokia_site.c 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index c8ac578..9c1e5a1 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1174,6 +1174,21 @@ } } +static bool bts_is_flexi_mr(uint8_t bts_type) +{ + switch (bts_type) { + case 0x20: /* Flexi MultiRadio (no shared radio modules) */ + case 0x21: /* Flexi MultiRadio (some or all radios shared, SW=GSM) */ + case 0x25: /* Flexi MultiRadio (some or all radios shared, SW is other than GSM) */ + case 0x28: /* Flexi MultiRadio 10 (no shared radio modules) */ + case 0x29: /* Flexi MultiRadio 10 (some or all radios shared, SW=GSM) */ + case 0x2A: /* Flexi MultiRadio 10 (some or all radios shared, SW is other than GSM) */ + return true; + default: + return false; + } +} + /* build the configuration data */ static int make_bts_config(struct gsm_bts *bts, uint8_t bts_type, int n_trx, uint8_t * fu_config, int need_hopping, int hopping_type) @@ -1787,6 +1802,7 @@ static int handle_conf_complete(struct e1inp_sign_link *sign_link, uint16_t ref) { struct gsm_bts *bts = sign_link->trx->bts; + bool is_flexi_mr = bts_is_flexi_mr(bts->nokia.bts_type); struct gsm_bts_trx *trx; int bcch_trx_nr = -1; @@ -1808,6 +1824,13 @@ if (trx->nr != bcch_trx_nr) { /* unlock TRX */ abis_nm_cha_adm_trx_unlock(bts, trx->nr+1, ref); + /* On Flexi Multiradio we have to reset non-BCCH TRX + * too, otherwise they never come up. But on + * MetroSite and UltraSite, non-BCCH TRX work + * correctly only when we *don't* reset them here! + */ + if (is_flexi_mr) + abis_nm_trx_reset(bts, trx->nr+1, ref); } } /* start TRX (RSL link) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I270c1ffab074c1e5a43ab9dfa103725a1518f718 Gerrit-Change-Number: 42727 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log May 2026