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

[S] Change in osmo-hlr[master]: tests/auc/Makefile.am: put object files to LDADD
by fixeria 09 Mar '23

09 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/31784 ) Change subject: tests/auc/Makefile.am: put object files to LDADD ...................................................................... tests/auc/Makefile.am: put object files to LDADD Change-Id: Iaefcfe7a8904841a29094fe40eb5850912544b4c --- M tests/auc/Makefile.am 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/84/31784/1 diff --git a/tests/auc/Makefile.am b/tests/auc/Makefile.am index 5ae133b..b196dbc 100644 --- a/tests/auc/Makefile.am +++ b/tests/auc/Makefile.am @@ -30,8 +30,8 @@ $(NULL) auc_test_LDADD = \ - $(top_srcdir)/src/auc.c \ - $(top_srcdir)/src/logging.c \ + $(top_builddir)/src/auc.o \ + $(top_builddir)/src/logging.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(NULL) @@ -41,8 +41,8 @@ $(NULL) auc_ts_55_205_test_sets_LDADD = \ - $(top_srcdir)/src/auc.c \ - $(top_srcdir)/src/logging.c \ + $(top_builddir)/src/auc.o \ + $(top_builddir)/src/logging.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/31784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaefcfe7a8904841a29094fe40eb5850912544b4c Gerrit-Change-Number: 31784 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hlr[master]: tests/*/Makefile.am: move -I to AM_CPPFLAGS
by fixeria 09 Mar '23

09 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/31785 ) Change subject: tests/*/Makefile.am: move -I to AM_CPPFLAGS ...................................................................... tests/*/Makefile.am: move -I to AM_CPPFLAGS Change-Id: I654053e11b0cc824c198f68e4ff0a0fcb295efb0 --- M tests/auc/Makefile.am M tests/db/Makefile.am M tests/gsup/Makefile.am M tests/mslookup/Makefile.am 4 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/85/31785/1 diff --git a/tests/auc/Makefile.am b/tests/auc/Makefile.am index b196dbc..9d0f726 100644 --- a/tests/auc/Makefile.am +++ b/tests/auc/Makefile.am @@ -2,12 +2,12 @@ AM_CPPFLAGS = \ $(all_includes) \ + -I$(top_srcdir)/include \ $(NULL) AM_CFLAGS = \ -Wall \ -ggdb3 \ - -I$(top_srcdir)/include \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(NULL) diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am index ece34d3..b07460e 100644 --- a/tests/db/Makefile.am +++ b/tests/db/Makefile.am @@ -1,7 +1,10 @@ -AM_CFLAGS = \ +AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ + $(NULL) + +AM_CFLAGS = \ -Wall \ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am index 9a10597..04bc51a 100644 --- a/tests/gsup/Makefile.am +++ b/tests/gsup/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = \ $(all_includes) \ + -I$(top_srcdir)/include \ $(NULL) AM_CFLAGS = \ - -I$(top_srcdir)/include \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(NULL) diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index 04778e8..5c53a02 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -1,11 +1,11 @@ AM_CPPFLAGS = \ $(all_includes) \ + -I$(top_srcdir)/include \ $(NULL) AM_CFLAGS = \ -Wall \ -ggdb3 \ - -I$(top_srcdir)/include \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/31785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I654053e11b0cc824c198f68e4ff0a0fcb295efb0 Gerrit-Change-Number: 31785 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: cosmetic: gsm_data.h: Fix typo in comment
by pespin 09 Mar '23

09 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31783 ) Change subject: cosmetic: gsm_data.h: Fix typo in comment ...................................................................... cosmetic: gsm_data.h: Fix typo in comment Change-Id: Id59eb176551b2546ee6ff9c7f0eee4d8dd6ed199 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/31783/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 43f687c..533be93 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -323,7 +323,7 @@ /* flag to prevent multiple simultaneous ciphering commands */ int ciphering_handled; - /* SCCP connection associatd with this subscriber_connection */ + /* SCCP connection associated with this subscriber_connection */ struct { /* SCCP connection related */ struct bsc_msc_data *msc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id59eb176551b2546ee6ff9c7f0eee4d8dd6ed199 Gerrit-Change-Number: 31783 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ggsn[master]: Do not hard-code -g and -O2 in CFLAGS
by pespin 09 Mar '23

09 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31782 ) Change subject: Do not hard-code -g and -O2 in CFLAGS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4b0b523b7dac4d67413bda37b546964262e5ea0d Gerrit-Change-Number: 31782 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 10:33:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: Fix cmdline args not applied
by pespin 09 Mar '23

09 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31354 ) Change subject: layer23: Fix cmdline args not applied ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I already asked several times that I'd like to get an answer regading my proposals in the earlier comment so that I can submit something which will be merged and hence the bug can be fixed. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I285a4908401659b69dac513dd1a4b07facb88c51 Gerrit-Change-Number: 31354 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 10:32:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ggsn[master]: Do not hard-code -g and -O2 in CFLAGS
by fixeria 09 Mar '23

09 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31782 ) Change subject: Do not hard-code -g and -O2 in CFLAGS ...................................................................... Do not hard-code -g and -O2 in CFLAGS Let the user decide on the optimization level and debugging info. Change-Id: I4b0b523b7dac4d67413bda37b546964262e5ea0d --- M ggsn/Makefile.am M gtp/Makefile.am M lib/Makefile.am M sgsnemu/Makefile.am M tests/gtp/Makefile.am M tests/lib/Makefile.am 6 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/82/31782/1 diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index eea7c6e..d4c82ad 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -2,7 +2,7 @@ AM_LDFLAGS = @EXEC_LDFLAGS@ -AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 8e2aa0b..cb32da7 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -8,7 +8,7 @@ include_HEADERS = gtp.h gsn.h pdp.h gtpie.h -AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) libgtp_la_SOURCES = gtp.c gtp.h gsn.c gsn.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined diff --git a/lib/Makefile.am b/lib/Makefile.am index 5bd9443..9dcd13b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h netns.h util.h icmpv6.h checksum.h -AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c netns.c util.c icmpv6.c checksum.c diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am index 9f10cd2..1f75de0 100644 --- a/sgsnemu/Makefile.am +++ b/sgsnemu/Makefile.am @@ -2,7 +2,7 @@ AM_LDFLAGS = @EXEC_LDFLAGS@ -AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) diff --git a/tests/gtp/Makefile.am b/tests/gtp/Makefile.am index 3dce716..e49d824 100644 --- a/tests/gtp/Makefile.am +++ b/tests/gtp/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g +AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) EXTRA_DIST = \ gtpie_test.ok \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 03a5d99..8f0301c 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g +AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) EXTRA_DIST = ippool_test.ok \ ippool_test.err \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4b0b523b7dac4d67413bda37b546964262e5ea0d Gerrit-Change-Number: 31782 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: tests/Makefile.am: clean up AM_* variables
by pespin 09 Mar '23

09 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31776 ) Change subject: tests/Makefile.am: clean up AM_* variables ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Neither I see anything wrong: -I should be in CPPFLAGS and this is what this patch does :) My point was that it really doesn't matter if you put it in CPPFLAGS or CFLAGS, So I wouldn't spend time moving stuff from one to another. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ice892f848e06b601e67b06a4e1e25c11fb7c4128 Gerrit-Change-Number: 31776 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 10:29:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one...
by pespin 09 Mar '23

09 Mar '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31749 ) Change subject: bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one TRX is rf_locked ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/31749/comment/583fe840_5779f04b PS1, Line 7: no NM Radio{Carrier,Channel} not > no ... […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie4836f5721ce8227a63c267730aeb17228994214 Gerrit-Change-Number: 31749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Comment-Date: Thu, 09 Mar 2023 10:28:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one...
by pespin 09 Mar '23

09 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31749 ) Change subject: bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one TRX is rf_locked ...................................................................... bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one TRX is rf_locked Differentiate in each TRX between being provisioned (configuration available) and being provisioned *plus enabled*. TRX0 waits for all other TRX to be ready before sending POWERON, since all TRX need to have been minimally configured over TRXC before POWERON is called. This "ready" state though, doesn't necessarily mean the TRX!=0 are enabled (aka NM Enabled and rf_locked=0). With them being configured it es enough to start the whole PHY. With the old logic, given any TRX was rf_locked=1 at startup, the PHY would not become UP because it the TRX_PROV FSM was waiting for OPSTART to arrive on all TRX, which wouldn't happen on TRX that had rf_locked=1. So in summary, the desired requirements to start the PHY are (in any order): 1- Wait all TRX are configured 2- Wait for TRX0 OPSTART Related: SYS#6370 Change-Id: Ie4836f5721ce8227a63c267730aeb17228994214 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 49 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 5deecd7..8b20b10 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -253,11 +253,11 @@ l1h->config.setslot_sent[data->tn] = false; } -/* Whether a given TRX is fully configured and can be powered on */ +/* Whether a given TRX is fully configured */ static bool trx_is_provisioned(struct trx_l1h *l1h) { struct phy_instance *pinst = l1h->phy_inst; - if (l1h->config.enabled && l1h->config.rxtune_acked && l1h->config.txtune_acked && + if (l1h->config.rxtune_acked && l1h->config.txtune_acked && (l1h->config.bsic_acked || !pinst->phy_link->u.osmotrx.use_legacy_setbsic) && (l1h->config.tsc_acked || pinst->phy_link->u.osmotrx.use_legacy_setbsic) && (l1h->config.nomtxpower_acked || l1h->config.nominal_power_set_by_vty) && @@ -267,6 +267,11 @@ return false; } +/* Whether a given TRX is fully configured and can be powered on */ +static bool trx_is_provisioned_and_enabled(struct trx_l1h *l1h) +{ + return l1h->config.enabled && trx_is_provisioned(l1h); +} static void trx_signal_ready_trx0(struct trx_l1h *l1h) { @@ -282,7 +287,7 @@ } } -/* Called from TRX0 to check if other TRX are already configured and powered so POWERON can be sent */ +/* Called from TRX0 to check if other TRX are already configured so POWERON can be sent */ static bool trx_other_trx0_ready(struct trx_l1h *l1h) { struct phy_instance *pinst = l1h->phy_inst; @@ -293,7 +298,7 @@ struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl; if (l1h_it->phy_inst->num == 0) continue; - if (l1h_it->provision_fi->state != TRX_PROV_ST_OPEN_POWERON) + if (!trx_is_provisioned(l1h_it)) return false; } return true; @@ -389,7 +394,8 @@ uint16_t arfcn; int nominal_power; int status; - bool others_ready; + bool waiting_other_trx; + bool was_ready = trx_is_provisioned(l1h); switch (event) { case TRX_PROV_EV_CLOSE: @@ -485,22 +491,22 @@ l1if_provision_transceiver_trx(l1h); - if (l1h->phy_inst->num == 0) - others_ready = trx_other_trx0_ready(l1h); - else - others_ready = true; /* we don't care about others in TRX!=0 */ + if (l1h->phy_inst->num == 0) { + waiting_other_trx = !trx_other_trx0_ready(l1h); + } else { + waiting_other_trx = false; /* we don't care about others in TRX!=0 */ + /* If we just became ready for TRX0 POWERON (aka this TRX becomes provisioned), signal it to TRX0: */ + if (l1h->phy_inst->num != 0 && (!was_ready && trx_is_provisioned(l1h))) + trx_signal_ready_trx0(l1h); + } /* if we gathered all data and could go forward. For TRX0, only after * all other TRX are prepared, since it will send POWERON commad */ - if (trx_is_provisioned(l1h) && - (l1h->phy_inst->num != 0 || others_ready)) { - if (l1h->phy_inst->num != 0) { + if (trx_is_provisioned_and_enabled(l1h) && !waiting_other_trx) { + if (l1h->phy_inst->num != 0) trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); - /* Once we are powered on, signal TRX0 in case it was waiting for us */ - trx_signal_ready_trx0(l1h); - } else { + else trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); - } } else { LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s%s\n", l1h->config.enabled ? "" :" enable", @@ -512,7 +518,7 @@ l1h->config.txtune_acked ? "" : " txtune-ack", l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), l1h->config.setformat_acked ? "" : " setformat-ack", - (l1h->phy_inst->num != 0 || others_ready) ? "" : " other-trx" + waiting_other_trx ? "" : " other-trx" ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie4836f5721ce8227a63c267730aeb17228994214 Gerrit-Change-Number: 31749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

1 0

[M] Change in osmo-bts[master]: bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one...
by pespin 09 Mar '23

09 Mar '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31749 ) Change subject: bts-trx: Fix no NM Radio{Carrier,Channel} switching to Enabled if one TRX is rf_locked ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: Fixed the double negation in commit description, readding +2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie4836f5721ce8227a63c267730aeb17228994214 Gerrit-Change-Number: 31749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Comment-Date: Thu, 09 Mar 2023 10:28:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0