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

[S] Change in osmo-mgw[master]: mgcp-client: Fix missing include in mgcp_client_pool.h

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34508?usp=email ) Change subject: mgcp-client: Fix missing include in mgcp_client_pool.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia27bb20a79966cb90e04720462d24a236a168ada Gerrit-Change-Number: 34508 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Sep 2023 16:05:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp-client: Introduce API osmo_mgcpc_ep_local_name()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34510?usp=email ) Change subject: mgcp-client: Introduce API osmo_mgcpc_ep_local_name() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34510?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18d7bdf650c0ec87ae16ed4944aed9f495400137 Gerrit-Change-Number: 34510 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Sep 2023 16:05:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: si2quater: Invalidate thresh_lo, prio and qrxlm when needed

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34515?usp=email ) Change subject: si2quater: Invalidate thresh_lo, prio and qrxlm when needed ...................................................................... si2quater: Invalidate thresh_lo, prio and qrxlm when needed Change-Id: I5910ce8db2d085295b327b12096ba129369eb532 --- M include/osmocom/bsc/system_information.h M src/osmo-bsc/bts_ctrl.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/system_information.c 4 files changed, 35 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h index 7b1cff0..f74ef6d 100644 --- a/include/osmocom/bsc/system_information.h +++ b/include/osmocom/bsc/system_information.h @@ -17,6 +17,7 @@ int range_encode(enum osmo_gsm48_range r, int *arfcns, int arfcns_used, int *w, int f0, uint8_t *chan_list); uint8_t si2q_num(struct gsm_bts *bts); +int bts_earfcn_del(struct gsm_bts *bts, uint16_t earfcn); int bts_earfcn_add(struct gsm_bts *bts, uint16_t earfcn, uint8_t thresh_hi, uint8_t thresh_lo, uint8_t prio, uint8_t qrx, uint8_t meas_bw); int bts_uarfcn_del(struct gsm_bts *bts, uint16_t arfcn, uint16_t scramble); diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index fdb4638..cfcbe9d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -717,7 +717,6 @@ static int set_bts_si2quater_neighbor_list_del_earfcn(struct ctrl_cmd *cmd, void *data) { struct gsm_bts *bts = (struct gsm_bts *)cmd->node; - struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list; int earfcn; if (osmo_str_to_int(&earfcn, cmd->value, 10, 0, 65535) < 0) { @@ -725,7 +724,7 @@ return CTRL_CMD_ERROR; } - if (osmo_earfcn_del(e, earfcn) < 0) { + if (bts_earfcn_del(bts, earfcn) < 0) { cmd->reply = "Failed to delete a (not existent?) neighbor EARFCN"; return CTRL_CMD_ERROR; } @@ -835,7 +834,6 @@ static int set_bts_si2quater_neighbor_list_add_earfcn(struct ctrl_cmd *cmd, void *data) { struct gsm_bts *bts = (struct gsm_bts *)cmd->node; - struct osmo_earfcn_si2q *neighbors = &bts->si_common.si2quater_neigh_list; char *earfcn_str, *thresh_hi_str, *thresh_lo_str, *prio_str, *qrxlv_str, *meas_str, *saveptr, *tmp; int earfcn, thresh_hi, thresh_lo, prio, qrxlv, meas, result; @@ -914,7 +912,7 @@ cmd->reply = "OOM"; } - if (osmo_earfcn_del(neighbors, earfcn) != 0) + if (bts_earfcn_del(bts, earfcn) != 0) cmd->reply = "Failed to roll-back adding EARFCN"; return CTRL_CMD_ERROR; diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 9f5ca5b..6602ad1 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2087,7 +2087,6 @@ "measurement bandwidth\n" "measurement bandwidth (8 means NA)\n") { struct gsm_bts *bts = vty->index; - struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list; uint16_t arfcn = atoi(argv[0]); uint8_t thresh_hi = atoi(argv[1]), thresh_lo = atoi(argv[2]), prio = atoi(argv[3]), qrx = atoi(argv[4]), meas = atoi(argv[5]); @@ -2123,7 +2122,7 @@ vty_out(vty, "%% Warning: not enough space in SI2quater (%u/%u used) for a given EARFCN %u%s", bts->si2q_count, SI2Q_MAX_NUM, arfcn, VTY_NEWLINE); - if (osmo_earfcn_del(e, arfcn) != 0) + if (bts_earfcn_del(bts, arfcn) != 0) vty_out(vty, "%% Failed to roll-back adding EARFCN %u%s", arfcn, VTY_NEWLINE); return CMD_WARNING; @@ -2140,9 +2139,8 @@ "EARFCN\n") { struct gsm_bts *bts = vty->index; - struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list; uint16_t arfcn = atoi(argv[0]); - int r = osmo_earfcn_del(e, arfcn); + int r = bts_earfcn_del(bts, arfcn); if (r < 0) { vty_out(vty, "%% Unable to delete arfcn %u: %s%s", arfcn, strerror(-r), VTY_NEWLINE); diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 461f86a..799028e 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -216,6 +216,26 @@ return scramble; } +int bts_earfcn_del(struct gsm_bts *bts, uint16_t earfcn) +{ + struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list; + int r; + + r = osmo_earfcn_del(e, earfcn); + + if (r < 0) + return r; + + /* If the last earfcn was removed, invlidate common neighbours limitations */ + if (si2q_earfcn_count(e) == 0) { + e->thresh_lo_valid = false; + e->qrxlm_valid = false; + e->prio_valid = false; + } + + return r; +} + int bts_earfcn_add(struct gsm_bts *bts, uint16_t earfcn, uint8_t thresh_hi, uint8_t thresh_lo, uint8_t prio, uint8_t qrx, uint8_t meas_bw) { @@ -223,7 +243,7 @@ int r; /* EARFCN may already exist, so we delete it to avoid duplicates */ - if (osmo_earfcn_del(e, earfcn) == 0) + if (bts_earfcn_del(bts, earfcn) == 0) LOGP(DRR, LOGL_NOTICE, "EARFCN %u is already in the list, modifying\n", earfcn); if (meas_bw < EARFCN_MEAS_BW_INVALID) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34515?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5910ce8db2d085295b327b12096ba129369eb532 Gerrit-Change-Number: 34515 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> 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 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: si2quater: Invalidate thresh_lo, prio and qrxlm when needed

by laforge

Attention is currently required from: fixeria, matanp. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34515?usp=email ) Change subject: si2quater: Invalidate thresh_lo, prio and qrxlm when needed ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34515?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5910ce8db2d085295b327b12096ba129369eb532 Gerrit-Change-Number: 34515 Gerrit-PatchSet: 3 Gerrit-Owner: matanp <matan1008(a)gmail.com> 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Sun, 24 Sep 2023 16:05:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[L] Change in osmo-bts[master]: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email ) Change subject: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES ...................................................................... oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES Change-Id: I88c6c6af18be054bd152832e60c8afbbd16098a3 Depends: libosmocore.git Ia4208e10d61843dd6ae77398f6624c918dc81ea4 Depends: libosmocore.git I85316af9b57e8113077305798cb2d82a24e48e00 --- M include/osmo-bts/bts.h M include/osmo-bts/bts_trx.h M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/oml.c M src/osmo-bts-lc15/l1_if.c M src/osmo-bts-lc15/main.c M src/osmo-bts-oc2g/l1_if.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 14 files changed, 319 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index d332935..985f4ed 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -130,6 +130,9 @@ uint16_t bvci; uint8_t timer[11]; struct gprs_rlc_cfg rlc_cfg; + struct { + uint32_t gprs_codings; /* see NM_IPAC_F_GPRS_CODING_* flags */ + } support; }; /* Struct that holds one OML-Address (Address of the BSC) */ @@ -319,6 +322,7 @@ struct { uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ + uint8_t max_ta; /* maximum timing advance */ } support; struct { uint8_t tc4_ctr; diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index a098c3e..9d3a748 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -44,6 +44,12 @@ /* The associated PHY instance */ struct phy_instance *pinst; + struct { + uint32_t freq_bands; /* see NM_IPAC_F_FREQ_BAND_* flags */ + uint32_t chan_types; /* see NM_IPAC_F_CHANT_* flags */ + uint32_t chan_modes; /* see NM_IPAC_F_CHANM_* flags */ + } support; + struct gsm_bts_trx_ts ts[TRX_NR_TS]; }; diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index b20f3ea..164c89f 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -59,6 +59,52 @@ #define MAX_VERSION_LENGTH 64 +/* NM_IPAC_F_CHANT_* mask for NM_IPAC_EIE_CHAN_TYPES (common) */ +#define NM_IPAC_MASK_CHANT_COMMON \ + (NM_IPAC_F_CHANT_TCHF | \ + NM_IPAC_F_CHANT_TCHH | \ + NM_IPAC_F_CHANT_SDCCH8 | \ + NM_IPAC_F_CHANT_BCCH | \ + NM_IPAC_F_CHANT_BCCH_SDCCH4) +/* NM_IPAC_F_CHANM_SPEECH_* mask for NM_IPAC_EIE_CHAN_MODES */ +#define NM_IPAC_MASK_CHANM_SPEECH \ + (NM_IPAC_F_CHANM_SPEECH_FS | \ + NM_IPAC_F_CHANM_SPEECH_EFS | \ + NM_IPAC_F_CHANM_SPEECH_AFS | \ + NM_IPAC_F_CHANM_SPEECH_HS | \ + NM_IPAC_F_CHANM_SPEECH_AHS) +/* NM_IPAC_F_CHANM_CSD_NT_* mask for NM_IPAC_EIE_CHAN_MODES */ +#define NM_IPAC_MASK_CHANM_CSD_NT \ + (NM_IPAC_F_CHANM_CSD_NT_4k8 | \ + NM_IPAC_F_CHANM_CSD_NT_9k6 | \ + NM_IPAC_F_CHANM_CSD_NT_14k4) +/* NM_IPAC_F_CHANM_CSD_T_* mask for NM_IPAC_EIE_CHAN_MODES */ +#define NM_IPAC_MASK_CHANM_CSD_T \ + (NM_IPAC_F_CHANM_CSD_T_1200_75 | \ + NM_IPAC_F_CHANM_CSD_T_600 | \ + NM_IPAC_F_CHANM_CSD_T_1k2 | \ + NM_IPAC_F_CHANM_CSD_T_2k4 | \ + NM_IPAC_F_CHANM_CSD_T_4k8 | \ + NM_IPAC_F_CHANM_CSD_T_9k6 | \ + NM_IPAC_F_CHANM_CSD_T_14k4) +/* NM_IPAC_F_GPRS_CODING_CS[1-4] mask for NM_IPAC_EIE_GPRS_CODING */ +#define NM_IPAC_MASK_GPRS_CODING_CS \ + (NM_IPAC_F_GPRS_CODING_CS1 | \ + NM_IPAC_F_GPRS_CODING_CS2 | \ + NM_IPAC_F_GPRS_CODING_CS3 | \ + NM_IPAC_F_GPRS_CODING_CS4) +/* NM_IPAC_F_GPRS_CODING_MCS[1-9] mask for NM_IPAC_EIE_GPRS_CODING */ +#define NM_IPAC_MASK_GPRS_CODING_MCS \ + (NM_IPAC_F_GPRS_CODING_MCS1 | \ + NM_IPAC_F_GPRS_CODING_MCS2 | \ + NM_IPAC_F_GPRS_CODING_MCS3 | \ + NM_IPAC_F_GPRS_CODING_MCS4 | \ + NM_IPAC_F_GPRS_CODING_MCS5 | \ + NM_IPAC_F_GPRS_CODING_MCS6 | \ + NM_IPAC_F_GPRS_CODING_MCS7 | \ + NM_IPAC_F_GPRS_CODING_MCS8 | \ + NM_IPAC_F_GPRS_CODING_MCS9) + enum gsm_bts_trx_ts_flags { TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, diff --git a/src/common/bts.c b/src/common/bts.c index 3cd91e7..7e7d8f0 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -59,6 +59,7 @@ #include <osmo-bts/osmux.h> #include <osmo-bts/notification.h> +#define MAX_TA_DEF 63 /* default max Timing Advance value */ #define MIN_QUAL_RACH 50 /* minimum link quality (in centiBels) for Access Bursts */ #define MIN_QUAL_NORM -5 /* minimum link quality (in centiBels) for Normal Bursts */ @@ -344,7 +345,7 @@ bts->bsic_configured = false; bts->load.ccch.load_ind_period = 112; bts->rtp_jitter_buf_ms = 100; - bts->max_ta = 63; + bts->max_ta = MAX_TA_DEF; bts->ny1 = 4; bts->ny2 = 4; bts->t3105_ms = 300; @@ -384,6 +385,9 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC); osmo_bts_set_feature(bts->features, BTS_FEAT_PAGING_COORDINATION); + /* Maximum TA supported by the PHY (can be overridden by PHY specific code) */ + bts->support.max_ta = MAX_TA_DEF; + rc = bts_model_init(bts); if (rc < 0) return rc; diff --git a/src/common/oml.c b/src/common/oml.c index 4565e9a..701f5f3 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -217,6 +217,68 @@ msgb_tl16v_put(msg, NM_ATT_MANUF_ID, len, bts->features->data); } +/* Add ip.access feature flags for the given MO */ +static int add_att_ipacc_features(struct msgb *msg, const struct gsm_abis_mo *mo) +{ + const struct gsm_bts *bts = mo->bts; + const struct gsm_bts_trx *trx; + uint32_t val; + uint8_t *len; + + msgb_v_put(msg, NM_ATT_IPACC_SUPP_FEATURES); + + /* We don't know the length yet, so we update it later. */ + len = msgb_put(msg, 2); + + switch (mo->obj_class) { + case NM_OC_BTS: + msgb_tv16_put(msg, NM_IPAC_EIE_MAX_TA, 1); /* TL16 */ + msgb_put_u8(msg, (bts->support.max_ta >> 0) & 0xff); + break; + case NM_OC_RADIO_CARRIER: + trx = container_of(mo, struct gsm_bts_trx, mo); + msgb_tv16_put(msg, NM_IPAC_EIE_FREQ_BANDS, 1); /* TL16 */ + msgb_put_u8(msg, (trx->support.freq_bands >> 0) & 0xff); + break; + case NM_OC_BASEB_TRANSC: + trx = container_of(mo, struct gsm_bts_trx, bb_transc.mo); + msgb_tv16_put(msg, NM_IPAC_EIE_CIPH_ALGOS, 1); /* TL16 */ + msgb_put_u8(msg, bts->support.ciphers); /* LSB is A5/1 */ + + msgb_tv16_put(msg, NM_IPAC_EIE_CHAN_TYPES, 2); /* TL16 */ + msgb_put_u8(msg, (trx->support.chan_types >> 0) & 0xff); + msgb_put_u8(msg, (trx->support.chan_types >> 8) & 0xff); + + msgb_tv16_put(msg, NM_IPAC_EIE_CHAN_MODES, 3); /* TL16 */ + msgb_put_u8(msg, (trx->support.chan_modes >> 0) & 0xff); + msgb_put_u8(msg, (trx->support.chan_modes >> 8) & 0xff); + msgb_put_u8(msg, (trx->support.chan_modes >> 16) & 0xff); + + msgb_tv16_put(msg, NM_IPAC_EIE_RTP_FEATURES, 1); /* TL16 */ + val = NM_IPAC_F_RTP_FEAT_IR_64k; + msgb_put_u8(msg, (val >> 0) & 0xff); + + msgb_tv16_put(msg, NM_IPAC_EIE_RSL_FEATURES, 1); /* TL16 */ + val = NM_IPAC_F_RSL_FEAT_DYN_PDCH_ACT + | NM_IPAC_F_RSL_FEAT_RTP_PT2; + msgb_put_u8(msg, (val >> 0) & 0xff); + break; + case NM_OC_GPRS_CELL: + msgb_tv16_put(msg, NM_IPAC_EIE_GPRS_CODING, 2); /* TL16 */ + msgb_put_u8(msg, (bts->gprs.cell.support.gprs_codings >> 0) & 0xff); + msgb_put_u8(msg, (bts->gprs.cell.support.gprs_codings >> 8) & 0xff); + break; + default: + msgb_get(msg, 1 + 2); /* TL16 */ + return -ENOTSUP; + } + + /* Finally, update the length */ + osmo_store16be((uint16_t)(msg->tail - (len + 2)), len); + + return 0; +} + /* send 3GPP TS 52.021 §8.11.2 Get Attribute Response */ static int oml_tx_attr_resp(const struct gsm_abis_mo *mo, const uint8_t *attr, uint16_t attr_len) @@ -252,6 +314,10 @@ else goto unsupported; break; + case NM_ATT_IPACC_SUPP_FEATURES: + if (add_att_ipacc_features(nmsg, mo) != 0) + goto unsupported; + break; default: unsupported: LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes [%u], %s is unsupported\n", diff --git a/src/osmo-bts-lc15/l1_if.c b/src/osmo-bts-lc15/l1_if.c index e999527..bf120a9 100644 --- a/src/osmo-bts-lc15/l1_if.c +++ b/src/osmo-bts-lc15/l1_if.c @@ -1426,6 +1426,30 @@ LOGP(DL1C, LOGL_FATAL, "BTS band %s not supported by hw\n", gsm_band_name(trx->bts->band)); + /* Frequency bands indicated to the BSC */ + switch (fl1h->hw_info.band_support) { + case GSM_BAND_450: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_450; + break; + case GSM_BAND_480: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_480; + break; + case GSM_BAND_850: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_850; + break; + case GSM_BAND_900: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_PGSM; + /* XXX: does GSM_BAND_900 include NM_IPAC_F_FREQ_BAND_EGSM? */ + /* XXX: does GSM_BAND_900 include NM_IPAC_F_FREQ_BAND_RGSM? */ + break; + case GSM_BAND_1800: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_DCS; + break; + case GSM_BAND_1900: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_PCS; + break; + } + /* Request the activation */ l1if_activate_rf(fl1h, 1); diff --git a/src/osmo-bts-lc15/main.c b/src/osmo-bts-lc15/main.c index bcd526a..59c089a 100644 --- a/src/osmo-bts-lc15/main.c +++ b/src/osmo-bts-lc15/main.c @@ -89,6 +89,8 @@ bts->model_priv = bts_lc15; bts->variant = BTS_OSMO_LITECELL15; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS + | NM_IPAC_MASK_GPRS_CODING_MCS; /* specific default values for LC15 platform */ bts_lc15->led_ctrl_mode = LC15_BTS_LED_CTRL_MODE_DEFAULT; @@ -126,6 +128,17 @@ int bts_model_trx_init(struct gsm_bts_trx *trx) { + /* Frequency bands indicated to the BSC */ + trx->support.freq_bands = 0x00; /* updated in info_compl_cb() */ + + /* Channel types and modes indicated to the BSC */ + trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON + | NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH + | NM_IPAC_F_CHANT_SDCCH8_CBCH + | NM_IPAC_F_CHANT_PDCHF + | NM_IPAC_F_CHANT_TCHF_PDCHF; + trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH; + trx->nominal_power = 40; trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power); return 0; diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c index 4f99097..2ad59c9 100644 --- a/src/osmo-bts-oc2g/l1_if.c +++ b/src/osmo-bts-oc2g/l1_if.c @@ -1475,6 +1475,30 @@ LOGP(DL1C, LOGL_FATAL, "BTS band %s not supported by hw\n", gsm_band_name(trx->bts->band)); + /* Frequency bands indicated to the BSC */ + switch (fl1h->hw_info.band_support) { + case GSM_BAND_450: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_450; + break; + case GSM_BAND_480: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_480; + break; + case GSM_BAND_850: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_850; + break; + case GSM_BAND_900: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_PGSM; + /* XXX: does GSM_BAND_900 include NM_IPAC_F_FREQ_BAND_EGSM? */ + /* XXX: does GSM_BAND_900 include NM_IPAC_F_FREQ_BAND_RGSM? */ + break; + case GSM_BAND_1800: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_DCS; + break; + case GSM_BAND_1900: + trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_PCS; + break; + } + /* Request the activation */ l1if_activate_rf(fl1h, 1); diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index e184814..f5f9625 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -88,6 +88,8 @@ bts->model_priv = bts_oc2g; bts->variant = BTS_OSMO_OC2G; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS + | NM_IPAC_MASK_GPRS_CODING_MCS; /* specific default values for OC2G platform */ /* TODO(oramadan) MERGE @@ -127,6 +129,17 @@ int bts_model_trx_init(struct gsm_bts_trx *trx) { + /* Frequency bands indicated to the BSC */ + trx->support.freq_bands = 0x00; /* updated in info_compl_cb() */ + + /* Channel types and modes indicated to the BSC */ + trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON + | NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH + | NM_IPAC_F_CHANT_SDCCH8_CBCH + | NM_IPAC_F_CHANT_PDCHF + | NM_IPAC_F_CHANT_TCHF_PDCHF; + trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH; + trx->nominal_power = 25; trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power); return 0; diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index f132cdd..c79c115 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -768,6 +768,7 @@ bts->variant = BTS_OSMO_OCTPHY; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS; /* FIXME: what is the nominal transmit power of the PHY/board? */ bts->c0->nominal_power = 15; @@ -786,6 +787,29 @@ int bts_model_trx_init(struct gsm_bts_trx *trx) { + /* Frequency bands indicated to the BSC */ + trx->support.freq_bands = NM_IPAC_F_FREQ_BAND_PGSM + | NM_IPAC_F_FREQ_BAND_EGSM + | NM_IPAC_F_FREQ_BAND_RGSM + | NM_IPAC_F_FREQ_BAND_DCS + | NM_IPAC_F_FREQ_BAND_PCS + | NM_IPAC_F_FREQ_BAND_850 + | NM_IPAC_F_FREQ_BAND_480 + | NM_IPAC_F_FREQ_BAND_450; + + /* Channel types and modes indicated to the BSC */ + trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON +#if defined(cOCTVC1_GSM_LOGICAL_CHANNEL_COMBINATION_ENUM_FCCH_SCH_BCCH_CCCH_SDCCH4_CBCH_SACCHC4) + | NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH +#endif +#if defined(cOCTVC1_GSM_LOGICAL_CHANNEL_COMBINATION_ENUM_SDCCH8_CBCH_SACCHC8) + | NM_IPAC_F_CHANT_SDCCH8_CBCH +#endif + | NM_IPAC_F_CHANT_PDCHF + | NM_IPAC_F_CHANT_TCHF_PDCHF; + trx->support.chan_modes = NM_IPAC_F_CHANM_SPEECH_FS + | NM_IPAC_F_CHANM_SPEECH_HS; + return 0; } diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 156c4b8..4ab2ef6 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1938,5 +1938,27 @@ hdl = pinst->u.sysmobts.hdl; osmo_strlcpy(bts->sub_model, sysmobts_model(hdl->hw_info.model_nr, hdl->hw_info.trx_nr), sizeof(bts->sub_model)); + /* Frequency bands indicated to the BSC */ + for (unsigned int i = 0; i < sizeof(hdl->hw_info.band_support) * 8; i++) { + if (~hdl->hw_info.band_support & (1 << i)) + continue; + switch (1 << i) { + case GSM_BAND_850: + pinst->trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_850; + break; + case GSM_BAND_900: + pinst->trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_PGSM; + /* XXX: does GSM_BAND_900 include NM_IPAC_F_FREQ_BAND_EGSM? */ + /* XXX: does GSM_BAND_900 include NM_IPAC_F_FREQ_BAND_RGSM? */ + break; + case GSM_BAND_1800: + pinst->trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_DCS; + break; + case GSM_BAND_1900: + pinst->trx->support.freq_bands |= NM_IPAC_F_FREQ_BAND_PCS; + break; + } + } + return 0; } diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 68f36df..04f9c8a 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -60,6 +60,8 @@ bts->variant = BTS_OSMO_SYSMO; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS + | NM_IPAC_MASK_GPRS_CODING_MCS; if (stat(SYSMOBTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); @@ -95,6 +97,17 @@ int bts_model_trx_init(struct gsm_bts_trx *trx) { + /* Frequency bands indicated to the BSC */ + trx->support.freq_bands = 0x00; /* updated in bts_model_phy_link_open() */ + + /* Channel types and modes indicated to the BSC */ + trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON + | NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH + | NM_IPAC_F_CHANT_SDCCH8_CBCH + | NM_IPAC_F_CHANT_PDCHF + | NM_IPAC_F_CHANT_TCHF_PDCHF; + trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH; + return 0; } diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index ff71b3a..c1f5716 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -132,6 +132,8 @@ bts->model_priv = bts_trx; bts->variant = BTS_OSMO_TRX; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3) | CIPHER_A5(4); + bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS + | NM_IPAC_MASK_GPRS_CODING_MCS; /* The nominal value for each TRX is later overwritten through VTY cmd * 'nominal-tx-power' if present, otherwise through TRXC cmd NOMTXPOWER. @@ -173,6 +175,28 @@ int bts_model_trx_init(struct gsm_bts_trx *trx) { + /* Frequency bands indicated to the BSC */ + trx->support.freq_bands = NM_IPAC_F_FREQ_BAND_PGSM + | NM_IPAC_F_FREQ_BAND_EGSM + | NM_IPAC_F_FREQ_BAND_RGSM + | NM_IPAC_F_FREQ_BAND_DCS + | NM_IPAC_F_FREQ_BAND_PCS + | NM_IPAC_F_FREQ_BAND_850 + | NM_IPAC_F_FREQ_BAND_480 + | NM_IPAC_F_FREQ_BAND_450; + + /* Channel types and modes indicated to the BSC */ + trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON + | NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH + | NM_IPAC_F_CHANT_SDCCH8_CBCH + | NM_IPAC_F_CHANT_PDCHF + | NM_IPAC_F_CHANT_TCHF_PDCHF; + trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH + | NM_IPAC_MASK_CHANM_CSD_NT + | NM_IPAC_MASK_CHANM_CSD_T; + /* TODO: NM_IPAC_F_CHANM_CSD_T_14k4 (see OS#6167) */ + trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_T_14k4; + /* The nominal value for each TRX is later overwritten through VTY cmd * 'nominal-tx-power' if present, otherwise through TRXC cmd NOMTXPOWER. */ diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 6efbca5..bf5f324 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -61,6 +61,8 @@ bts->model_priv = bts_virt; bts->variant = BTS_OSMO_VIRTUAL; bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->gprs.cell.support.gprs_codings = NM_IPAC_MASK_GPRS_CODING_CS + | NM_IPAC_MASK_GPRS_CODING_MCS; /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); @@ -78,6 +80,28 @@ int bts_model_trx_init(struct gsm_bts_trx *trx) { + /* Frequency bands indicated to the BSC */ + trx->support.freq_bands = NM_IPAC_F_FREQ_BAND_PGSM + | NM_IPAC_F_FREQ_BAND_EGSM + | NM_IPAC_F_FREQ_BAND_RGSM + | NM_IPAC_F_FREQ_BAND_DCS + | NM_IPAC_F_FREQ_BAND_PCS + | NM_IPAC_F_FREQ_BAND_850 + | NM_IPAC_F_FREQ_BAND_480 + | NM_IPAC_F_FREQ_BAND_450; + + /* Channel types and modes indicated to the BSC */ + trx->support.chan_types = NM_IPAC_MASK_CHANT_COMMON + | NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH + | NM_IPAC_F_CHANT_SDCCH8_CBCH + | NM_IPAC_F_CHANT_PDCHF + | NM_IPAC_F_CHANT_TCHF_PDCHF; + trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH + | NM_IPAC_MASK_CHANM_CSD_NT + | NM_IPAC_MASK_CHANM_CSD_T; + /* TODO: NM_IPAC_F_CHANM_CSD_T_14k4 (see OS#6167) */ + trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_T_14k4; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88c6c6af18be054bd152832e60c8afbbd16098a3 Gerrit-Change-Number: 34434 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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 year, 9 months

1
0
0 0

[L] Change in osmo-bts[master]: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email ) Change subject: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88c6c6af18be054bd152832e60c8afbbd16098a3 Gerrit-Change-Number: 34434 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Sep 2023 16:05:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE}

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34470?usp=email ) Change subject: abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} ...................................................................... abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} 3GPP TS 52.021 does not strictly mandate that the SW Activated Report can only be received in state DISABLED/OFFLINE. The only requirement is that the software load procedure (if needed) and activation is to be performed in this state. The successful outcome of software activation procedure is indicated by the BTS using the above-mentioned SW Activated Report message, which may be received in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} too. The MO state changes are triggered by the State Changed Event Report messages, and happen asynchronously with the software activation. This patch fixes the following warnings seen with a nanoBTS: NM_BTS_OP(bts2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_NSE_OP(nse2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_CELL_OP(gprs-cell2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_NSVC_OP(nsvc0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_NSVC_OP(nsvc1){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_BB_TRANSC_OP(bts2-trx0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts1){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts3){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts4){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts5){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts6){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts7){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_RCARRIER_OP(bts2-trx0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted The following warning is still expected to show up though: NM_BTS_SM_OP(bts_sm){ENABLED}: Event SW_ACT_REP not permitted but is caused by a different problem, which is to be fixed later. Change-Id: I00a423adcde5c34977f4c4dad920874687fa493c --- M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_bts_sm_fsm.c M src/osmo-bsc/nm_channel_fsm.c M src/osmo-bsc/nm_gprs_cell_fsm.c M src/osmo-bsc/nm_gprs_nse_fsm.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c 8 files changed, 103 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index b68dc67..ce2f3e9 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -175,6 +175,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bb_transc, &bb_transc->mo.nm_state, false); + break; case NM_EV_GET_ATTR_REP: bb_transc->mo.get_attr_rep_received = true; bb_transc->mo.get_attr_sent = false; @@ -234,6 +237,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bb_transc, &bb_transc->mo.nm_state, true); + break; case NM_EV_GET_ATTR_REP: bb_transc->mo.get_attr_rep_received = true; bb_transc->mo.get_attr_sent = false; @@ -375,6 +381,7 @@ }, [NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_RSL_CONNECT_ACK) | @@ -390,6 +397,7 @@ }, [NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_RSL_CONNECT_ACK) | diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 544efb4..937b63d 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -179,6 +179,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bts, &bts->mo.nm_state, false); + break; case NM_EV_GET_ATTR_REP: rx_get_attr_rep(bts, false); return; @@ -232,6 +235,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bts, &bts->mo.nm_state, true); + break; case NM_EV_GET_ATTR_REP: rx_get_attr_rep(bts, true); return; @@ -366,6 +372,7 @@ }, [NM_BTS_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | @@ -380,6 +387,7 @@ }, [NM_BTS_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c index cb67099..70b0656 100644 --- a/src/osmo-bsc/nm_bts_sm_fsm.c +++ b/src/osmo-bsc/nm_bts_sm_fsm.c @@ -120,6 +120,7 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -160,6 +161,9 @@ struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(site_mgr, &site_mgr->mo.nm_state, true); + break; case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; new_state = &nsd->new_state; @@ -255,6 +259,7 @@ }, [NM_BTS_SM_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = @@ -266,6 +271,7 @@ }, [NM_BTS_SM_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index af201cf..1309ebd 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -136,6 +136,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(ts, &ts->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: ts->mo.set_attr_ack_received = true; ts->mo.set_attr_sent = false; @@ -186,6 +189,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(ts, &ts->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: ts->mo.set_attr_ack_received = true; ts->mo.set_attr_sent = false; @@ -312,6 +318,7 @@ }, [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -325,6 +332,7 @@ }, [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index 2f139a6..40514a8 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -145,6 +145,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(cell, &cell->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: cell->mo.set_attr_ack_received = true; cell->mo.set_attr_sent = false; @@ -196,6 +199,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(cell, &cell->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: cell->mo.set_attr_ack_received = true; cell->mo.set_attr_sent = false; @@ -325,6 +331,7 @@ }, [NM_GPRS_CELL_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -338,6 +345,7 @@ }, [NM_GPRS_CELL_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c index 882dbaf..df4113c 100644 --- a/src/osmo-bsc/nm_gprs_nse_fsm.c +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -146,6 +146,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(nse, &nse->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: nse->mo.set_attr_ack_received = true; nse->mo.set_attr_sent = false; @@ -197,6 +200,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(nse, &nse->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: nse->mo.set_attr_ack_received = true; nse->mo.set_attr_sent = false; @@ -327,6 +333,7 @@ }, [NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -340,6 +347,7 @@ }, [NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index d441f58..e6e3b39 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -176,6 +176,7 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: case NM_EV_FEATURE_NEGOTIATED: configure_loop(nsvc, &nsvc->mo.nm_state, false); return; @@ -229,6 +230,7 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: case NM_EV_FEATURE_NEGOTIATED: configure_loop(nsvc, &nsvc->mo.nm_state, true); return; @@ -355,6 +357,7 @@ }, [NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_FEATURE_NEGOTIATED) | X(NM_EV_SET_ATTR_ACK) | @@ -369,6 +372,7 @@ }, [NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_FEATURE_NEGOTIATED) | X(NM_EV_SET_ATTR_ACK) | diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 824b2ed..15e7c9f 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -151,6 +151,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(trx, &trx->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: trx->mo.set_attr_ack_received = true; trx->mo.set_attr_sent = false; @@ -201,6 +204,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(trx, &trx->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: trx->mo.set_attr_ack_received = true; trx->mo.set_attr_sent = false; @@ -348,6 +354,7 @@ }, [NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -361,6 +368,7 @@ }, [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34470?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00a423adcde5c34977f4c4dad920874687fa493c Gerrit-Change-Number: 34470 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34471?usp=email ) Change subject: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP ...................................................................... abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP Even though the Abis/OML message flow looks the way it should look on the wire, it does not actually reflect the sequence/flow of events and actions in the NM FSMs. For example (extracted from a PCAP): GPRS Cell(00,00,ff) State Changed Event Report GPRS Cell(00,00,ff) Software Activate Request GPRS Cell(00,00,ff) Software Activate Request ACK GPRS Cell(00,00,ff) Activate Software GPRS Cell(00,00,ff) Activate Software ACK [a] GPRS Cell(00,00,ff) State Changed Event Report [b] GPRS Cell(00,00,ff) Software Activated Report [c] GPRS Cell(00,00,ff) Get Attributes GPRS Cell(00,00,ff) Get Attributes Response [d] GPRS Cell(00,00,ff) IPA Set Attributes GPRS Cell(00,00,ff) IPA Set Attributes ACK GPRS Cell(00,00,ff) Change Administrative State GPRS Cell(00,00,ff) Change Administrative State ACK GPRS Cell(00,00,ff) State Changed Event Report GPRS Cell(00,00,ff) Opstart GPRS Cell(00,00,ff) Opstart ACK A follow-up patch [1] changes the logic generating message [d], so that the IPA Object Version of the GPRS Cell MO is taken into account when adding the attributes. The problem is that both messages [c] and [d] are generated and queued for transmission on the receipt of message [a], but *before* message [b] has been processed. So the IPA Object Version is not known and assumed to be 0 at that point in time. This patch delays configure_loop() until message [b] is received. So far only for nanoBTS and only for those MOs, for which Figure 2 in 3GPP TS 52.021 explicitly mentions that the SW downloading and activation procedures may be required, plus for the ip.access specific MOs which all seem to support the SW activation. osmo-bts does send SW Activated Report only for a subset of MOs, which does not include Baseband Transceiver, Radio Carrier, and Radio Channel. 3GPP TS 52.021 is not clear on whether this message shall be sent by all MOs either, so we consider it optional and delay configure_loop() only for nanoBTS. Change-Id: I3953a5e41eb27165f9ff203cac7447ee9d311abf Related: [1] Ie0fb3eaf76e1f70e5a19bb088e1674b7e553d32a --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_bts_sm_fsm.c M src/osmo-bsc/nm_gprs_cell_fsm.c M src/osmo-bsc/nm_gprs_nse_fsm.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c 9 files changed, 146 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 3f7958c..6974dca 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -692,6 +692,17 @@ return false; } +static inline bool is_nanobts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_NANOBTS: + return true; + default: + break; + } + return false; +} + static inline bool is_osmobts(const struct gsm_bts *bts) { switch (bts->type) { diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2876d24..275e4f1 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -528,6 +528,7 @@ struct gsm_nm_state nm_state; struct gsm_bts *bts; struct osmo_fsm_inst *fi; + bool sw_act_rep_received; bool opstart_sent; bool adm_unlock_sent; bool get_attr_sent; diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index ce2f3e9..0243c0b 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -61,6 +61,7 @@ { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + bb_transc->mo.sw_act_rep_received = false; bb_transc->mo.get_attr_sent = false; bb_transc->mo.get_attr_rep_received = false; bb_transc->mo.adm_unlock_sent = false; @@ -71,11 +72,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + bb_transc->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -109,6 +113,11 @@ if (bts_setup_ramp_wait(trx->bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(trx->bts) && !bb_transc->mo.sw_act_rep_received) + return; + /* Request TRX-level attributes */ if (!bb_transc->mo.get_attr_sent && !bb_transc->mo.get_attr_rep_received) { uint8_t attr_buf[3]; /* enlarge if needed */ @@ -176,6 +185,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bb_transc->mo.sw_act_rep_received = true; configure_loop(bb_transc, &bb_transc->mo.nm_state, false); break; case NM_EV_GET_ATTR_REP: @@ -238,6 +248,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bb_transc->mo.sw_act_rep_received = true; configure_loop(bb_transc, &bb_transc->mo.nm_state, true); break; case NM_EV_GET_ATTR_REP: diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 937b63d..0bcc8e7 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -48,6 +48,7 @@ { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + bts->mo.sw_act_rep_received = false; bts->mo.get_attr_sent = false; bts->mo.get_attr_rep_received = false; bts->mo.set_attr_sent = false; @@ -58,11 +59,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts *bts = (struct gsm_bts *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + bts->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -96,6 +100,11 @@ if (bts_setup_ramp_wait(bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(bts) && !bts->mo.sw_act_rep_received) + return; + /* Request generic BTS-level attributes */ if (!bts->mo.get_attr_sent && !bts->mo.get_attr_rep_received) { uint8_t attr_buf[3]; /* enlarge if needed */ @@ -180,6 +189,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bts->mo.sw_act_rep_received = true; configure_loop(bts, &bts->mo.nm_state, false); break; case NM_EV_GET_ATTR_REP: @@ -236,6 +246,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bts->mo.sw_act_rep_received = true; configure_loop(bts, &bts->mo.nm_state, true); break; case NM_EV_GET_ATTR_REP: diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c index 70b0656..5e7b558 100644 --- a/src/osmo-bsc/nm_bts_sm_fsm.c +++ b/src/osmo-bsc/nm_bts_sm_fsm.c @@ -49,6 +49,7 @@ struct gsm_bts *bts = gsm_bts_sm_get_bts(site_mgr); site_mgr->peer_has_no_avstate_offline = (bts->type == GSM_BTS_TYPE_NANOBTS); + site_mgr->mo.sw_act_rep_received = false; site_mgr->mo.opstart_sent = false; } @@ -61,6 +62,8 @@ switch (event) { case NM_EV_SW_ACT_REP: + site_mgr->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -107,6 +110,11 @@ if (bts_setup_ramp_wait(bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(bts) && !site_mgr->mo.sw_act_rep_received) + return; + if (allow_opstart && !site_mgr->mo.opstart_sent) { site_mgr->mo.opstart_sent = true; abis_nm_opstart(bts, NM_OC_SITE_MANAGER, 0xff, 0xff, 0xff); @@ -116,11 +124,15 @@ static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + site_mgr->mo.sw_act_rep_received = true; + configure_loop(site_mgr, &site_mgr->mo.nm_state, false); + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -162,6 +174,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + site_mgr->mo.sw_act_rep_received = true; configure_loop(site_mgr, &site_mgr->mo.nm_state, true); break; case NM_EV_STATE_CHG_REP: diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index 40514a8..308e7e0 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -48,6 +48,7 @@ { struct gsm_gprs_cell *cell = (struct gsm_gprs_cell *)fi->priv; + cell->mo.sw_act_rep_received = false; cell->mo.set_attr_sent = false; cell->mo.set_attr_ack_received = false; cell->mo.adm_unlock_sent = false; @@ -56,11 +57,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_gprs_cell *cell = (struct gsm_gprs_cell *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + cell->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -98,6 +102,11 @@ if (bts_setup_ramp_wait(bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(bts) && !cell->mo.sw_act_rep_received) + return; + if (!cell->mo.set_attr_sent && !cell->mo.set_attr_ack_received) { cell->mo.set_attr_sent = true; msgb = nanobts_gen_set_cell_attr(bts); @@ -146,6 +155,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + cell->mo.sw_act_rep_received = true; configure_loop(cell, &cell->mo.nm_state, false); break; case NM_EV_SET_ATTR_ACK: @@ -200,6 +210,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + cell->mo.sw_act_rep_received = true; configure_loop(cell, &cell->mo.nm_state, true); break; case NM_EV_SET_ATTR_ACK: diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c index df4113c..319775c 100644 --- a/src/osmo-bsc/nm_gprs_nse_fsm.c +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -49,6 +49,7 @@ { struct gsm_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; + nse->mo.sw_act_rep_received = false; nse->mo.set_attr_sent = false; nse->mo.set_attr_ack_received = false; nse->mo.adm_unlock_sent = false; @@ -57,11 +58,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_gprs_nse *nse = (struct gsm_gprs_nse *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + nse->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -97,6 +101,11 @@ if (bts_setup_ramp_wait(bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(bts) && !nse->mo.sw_act_rep_received) + return; + if (!nse->mo.set_attr_sent && !nse->mo.set_attr_ack_received) { nse->mo.set_attr_sent = true; msgb = nanobts_gen_set_nse_attr(bts_sm); @@ -147,6 +156,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + nse->mo.sw_act_rep_received = true; configure_loop(nse, &nse->mo.nm_state, false); break; case NM_EV_SET_ATTR_ACK: @@ -201,6 +211,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + nse->mo.sw_act_rep_received = true; configure_loop(nse, &nse->mo.nm_state, true); break; case NM_EV_SET_ATTR_ACK: diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index e6e3b39..a3555aa 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -49,6 +49,7 @@ { struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv; + nsvc->mo.sw_act_rep_received = false; nsvc->mo.set_attr_sent = false; nsvc->mo.set_attr_sent = false; nsvc->mo.set_attr_ack_received = false; @@ -58,12 +59,15 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_gprs_nsvc *nsvc = (struct gsm_gprs_nsvc *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { - case NM_EV_FEATURE_NEGOTIATED: case NM_EV_SW_ACT_REP: + nsvc->mo.sw_act_rep_received = true; + break; + case NM_EV_FEATURE_NEGOTIATED: case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -116,6 +120,11 @@ if (bts_setup_ramp_wait(nsvc->bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(nsvc->bts) && !nsvc->mo.sw_act_rep_received) + return; + /* We need to know BTS features in order to know if we can set IPv6 addresses */ if (gsm_bts_features_negotiated(nsvc->bts) && !nsvc->mo.set_attr_sent && !nsvc->mo.set_attr_ack_received) { @@ -177,6 +186,8 @@ switch (event) { case NM_EV_SW_ACT_REP: + nsvc->mo.sw_act_rep_received = true; + /* fall-through */ case NM_EV_FEATURE_NEGOTIATED: configure_loop(nsvc, &nsvc->mo.nm_state, false); return; @@ -231,6 +242,8 @@ switch (event) { case NM_EV_SW_ACT_REP: + nsvc->mo.sw_act_rep_received = true; + /* fall-through */ case NM_EV_FEATURE_NEGOTIATED: configure_loop(nsvc, &nsvc->mo.nm_state, true); return; diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 15e7c9f..9f8f5f3 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -58,6 +58,7 @@ { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + trx->mo.sw_act_rep_received = false; trx->mo.set_attr_sent = false; trx->mo.set_attr_ack_received = false; trx->mo.adm_unlock_sent = false; @@ -66,11 +67,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + trx->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -104,6 +108,11 @@ if (bts_setup_ramp_wait(trx->bts)) return; + /* nanoBTS only: delay until SW Activated Report is received, which + * tells us the IPA Object version (may be used to set attr conditionally). */ + if (is_nanobts(trx->bts) && !trx->mo.sw_act_rep_received) + return; + if (!trx->mo.set_attr_sent && !trx->mo.set_attr_ack_received) { trx->mo.set_attr_sent = true; msgb = nanobts_gen_set_radio_attr(trx->bts, trx); @@ -152,6 +161,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + trx->mo.sw_act_rep_received = true; configure_loop(trx, &trx->mo.nm_state, false); break; case NM_EV_SET_ATTR_ACK: @@ -205,6 +215,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + trx->mo.sw_act_rep_received = true; configure_loop(trx, &trx->mo.nm_state, true); break; case NM_EV_SET_ATTR_ACK: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34471?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3953a5e41eb27165f9ff203cac7447ee9d311abf Gerrit-Change-Number: 34471 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: oml: ipacc: print all supported versions of MOs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34472?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: oml: ipacc: print all supported versions of MOs ...................................................................... oml: ipacc: print all supported versions of MOs The first byte is the default version, the other bytes describe the optional other versions supported by the MO. Print them all. Change-Id: I01da4883cf59101ddaef575979519ac48fcf54b0 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: dexter: 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/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index d99489b..c690b46 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -217,11 +217,18 @@ mo->ipaccess.obj_version = 0; /* implicit default */ if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) { + const uint8_t *versions = TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); + char buf[256]; + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + /* nanoBTS may report several Object Versions; the first one will * be used by default unless requested explicitly before OPSTARTing. */ - mo->ipaccess.obj_version = *TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); - LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u (default)\n", - mo->ipaccess.obj_version); + mo->ipaccess.obj_version = versions[0]; + + OSMO_STRBUF_PRINTF(sb, "%u (default)", versions[0]); + for (uint16_t i = 1; i < TLVP_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION); i++) + OSMO_STRBUF_PRINTF(sb, ", %u", versions[i]); + LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Versions supported: %s\n", buf); } osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34472?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I01da4883cf59101ddaef575979519ac48fcf54b0 Gerrit-Change-Number: 34472 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: oml: ipacc: fix sending hard-coded GPRS Cell attributes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email ) Change subject: oml: ipacc: fix sending hard-coded GPRS Cell attributes ...................................................................... oml: ipacc: fix sending hard-coded GPRS Cell attributes Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Related: OS#4505 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 3 files changed, 40 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 96c4d50..23196fc 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -1,6 +1,6 @@ /* ip.access nanoBTS specific code, OML attribute table generator */ -/* (C) 2016 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> +/* (C) 2016-2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved * * Author: Philipp Maier @@ -228,6 +228,7 @@ struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts) { const struct gsm_gprs_cell *cell = &bts->gprs.cell; + const struct gprs_rlc_cfg *rlcc = &cell->rlc_cfg; struct msgb *msgb; uint8_t buf[2]; @@ -239,26 +240,26 @@ buf[0] = bts->gprs.rac; msgb_tl16v_put(msgb, NM_ATT_IPACC_RAC, 1, buf); - buf[0] = 5; /* repeat time (50ms) */ - buf[1] = 3; /* repeat count */ + buf[0] = rlcc->paging.repeat_time / 50; /* units of 50ms */ + buf[1] = rlcc->paging.repeat_count; msgb_tl16v_put(msgb, NM_ATT_IPACC_GPRS_PAGING_CFG, 2, buf); /* BVCI 925 */ - buf[0] = bts->gprs.cell.bvci >> 8; - buf[1] = bts->gprs.cell.bvci & 0xff; + buf[0] = cell->bvci >> 8; + buf[1] = cell->bvci & 0xff; msgb_tl16v_put(msgb, NM_ATT_IPACC_BVCI, 2, buf); /* all timers in seconds, unless otherwise stated */ const struct abis_nm_ipacc_att_rlc_cfg rlc_cfg = { - .t3142 = 20, /* T3142 */ - .t3169 = 5, /* T3169 */ - .t3191 = 5, /* T3191 */ - .t3193_10ms = 160, /* T3193 (units of 10ms) */ - .t3195 = 5, /* T3195 */ - .n3101 = 10, /* N3101 */ - .n3103 = 4, /* N3103 */ - .n3105 = 8, /* N3105 */ - .rlc_cv_countdown = 15, /* RLC CV countdown */ + .t3142 = rlcc->parameter[RLC_T3142], + .t3169 = rlcc->parameter[RLC_T3169], + .t3191 = rlcc->parameter[RLC_T3191], + .t3193_10ms = rlcc->parameter[RLC_T3193], + .t3195 = rlcc->parameter[RLC_T3195], + .n3101 = rlcc->parameter[RLC_N3101], + .n3103 = rlcc->parameter[RLC_N3103], + .n3105 = rlcc->parameter[RLC_N3105], + .rlc_cv_countdown = rlcc->parameter[CV_COUNTDOWN], }; msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG, sizeof(rlc_cfg), (const uint8_t *)&rlc_cfg); @@ -268,12 +269,15 @@ break; /* fall-through */ case GSM_BTS_TYPE_OSMOBTS: + /* CS1..CS4 flags encoded in the first octet */ + buf[0] = rlcc->cs_mask & 0x0f; + /* MCS1..MSC8 flags encoded in the second octet */ + buf[1] = 0x00; if (bts->gprs.mode == BTS_GPRS_EGPRS) { - buf[0] = 0x8f; - buf[1] = 0xff; - } else { - buf[0] = 0x0f; - buf[1] = 0x00; + /* MSC9 is special and also goes to the first octet */ + if (rlcc->cs_mask & (1 << GPRS_MCS9)) + buf[0] |= (1 << 7); + buf[1] = (rlcc->cs_mask >> 4) & 0xff; } msgb_tl16v_put(msgb, NM_ATT_IPACC_CODING_SCHEMES, 2, buf); break; @@ -289,9 +293,9 @@ case GSM_BTS_TYPE_OSMOBTS: { const struct abis_nm_ipacc_att_rlc_cfg_2 rlc_cfg_2 = { - .t_dl_tbf_ext_10ms = htons(250), /* 0..500 */ - .t_ul_tbf_ext_10ms = htons(250), /* 0..500 */ - .initial_cs = 2, /* CS2 */ + .t_dl_tbf_ext_10ms = htons(rlcc->parameter[T_DL_TBF_EXT] / 10), + .t_ul_tbf_ext_10ms = htons(rlcc->parameter[T_UL_TBF_EXT] / 10), + .initial_cs = rlcc->initial_cs, }; msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_2, sizeof(rlc_cfg_2), (const uint8_t *)&rlc_cfg_2); @@ -309,7 +313,7 @@ case GSM_BTS_TYPE_OSMOBTS: { const struct abis_nm_ipacc_att_rlc_cfg_3 rlc_cfg_3 = { - .initial_mcs = 2, /* MCS2 */ + .initial_mcs = rlcc->initial_mcs, }; msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_3, sizeof(rlc_cfg_3), (const uint8_t *)&rlc_cfg_3); diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 6a09d27..9ef90ae 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -213,7 +213,7 @@ 0x02, 0x00, 0x02, 0xa3, 0x00, 0x09, 0x14, 0x05, 0x05, 0xa0, 0x05, 0x0a, 0x04, 0x08, 0x0f, 0xa8, 0x00, 0x02, 0x0f, 0x00, 0xa9, 0x00, 0x05, 0x00, - 0xfa, 0x00, 0xfa, 0x02, 0xac, 0x00, 0x01, 0x02, + 0xfa, 0x00, 0xfa, 0x02, 0xac, 0x00, 0x01, 0x06, }; /* Parameters needed to test nanobts_gen_set_nsvc_attr() */ diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok index 7e7ba69..e2f109e 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok @@ -9,8 +9,8 @@ ok. Testing nanobts_gen_set_cell_attr()... -result= 9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02ac000102 -expected=9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02ac000102 +result= 9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02ac000106 +expected=9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02ac000106 ok. Testing nanobts_gen_set_nsvc_attr()... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Gerrit-Change-Number: 34357 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023