Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Enable egprs support through PCUIF from BTS/BSC This VTY command was added due to EGPRS being introduced later as an experimental feature. It's no longer needed and causes more problems than goodness (since people sometimes forgets to enable it). Let's rather simply enable EGPRS support based on what BTS/BSC requests over PCUIF. Related: OS#4544 Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 --- M src/pcu_l1_if.cpp M src/pcu_vty.c 2 files changed, 14 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4f96567..127029b 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -623,12 +623,15 @@ } bts_set_max_cs(bts, bts->vty.max_cs_dl, bts->vty.max_cs_ul); /* recalc max CS values */ + bts->egprs_enabled = false; bts->mcs_mask = 0; for (i = 0; i < 9; i++) { uint8_t allowed = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 << i)); bts->mcs_mask |= allowed << i; - if (allowed) + if (allowed) { + bts->egprs_enabled = true; LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i + 1); + } } bts_set_max_mcs(bts, bts->vty.max_mcs_dl, bts->vty.max_mcs_ul); /* recalc max MCS values */ diff --git a/src/pcu_vty.c b/src/pcu_vty.c index bd83544..5e5dfbe 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -108,9 +108,6 @@ unsigned int i; vty_out(vty, "pcu%s", VTY_NEWLINE); - if (bts->egprs_enabled) - vty_out(vty, " egprs only%s", VTY_NEWLINE); - vty_out(vty, " flow-control-interval %d%s", bts->fc_interval, VTY_NEWLINE); if (bts->fc_bvc_bucket_size) @@ -273,29 +270,21 @@ #define EGPRS_STR "EGPRS configuration\n" -DEFUN_USRATTR(cfg_pcu_egprs, - cfg_pcu_egprs_cmd, - X(PCU_VTY_ATTR_NEW_TBF), - "egprs only", - EGPRS_STR "Use EGPRS and disable plain GPRS\n") +DEFUN_DEPRECATED(cfg_pcu_egprs, +cfg_pcu_egprs_cmd, +"egprs only", +EGPRS_STR "Use EGPRS and disable plain GPRS\n") { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->egprs_enabled = true; - + vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_pcu_no_egprs, - cfg_pcu_no_egprs_cmd, - X(PCU_VTY_ATTR_NEW_TBF), - "no egprs", - NO_STR EGPRS_STR) +DEFUN_DEPRECATED(cfg_pcu_no_egprs, +cfg_pcu_no_egprs_cmd, +"no egprs", +NO_STR EGPRS_STR) { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->egprs_enabled = false; - + vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 03 Nov 2020 23:00:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:26:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 to look at the new patch set (#6). Change subject: Enable egprs support through PCUIF from BTS/BSC .. Enable egprs support through PCUIF from BTS/BSC This VTY command was added due to EGPRS being introduced later as an experimental feature. It's no longer needed and causes more problems than goodness (since people sometimes forgets to enable it). Let's rather simply enable EGPRS support based on what BTS/BSC requests over PCUIF. Related: OS#4544 Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 --- M src/pcu_l1_if.cpp M src/pcu_vty.c 2 files changed, 14 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/28/20928/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 5: Code-Review-1 does "egprs only" no longer exclude GPRS-only mobile stations? The entire point of the VTY command is that as soon as we enabled EGPRS in the PCU, we loose GPRS capability. The fact that the BTS is stating "I support EGPRS" doesn't mean that the PCU can forget about interoperability with classig GPRS-only MSQ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 09:18:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 5: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/20928/5/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/20928/5/src/pcu_vty.c@278 PS5, Line 278: vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); Please prefix the message with '%%' like we usually do. https://gerrit.osmocom.org/c/osmo-pcu/+/20928/5/src/pcu_vty.c@287 PS5, Line 287: vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); Please prefix the message with '%%' like we usually do. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 31 Oct 2020 12:51:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 5: > Patch Set 2: > > > Patch Set 2: > > > > At least for now, pure GPRS service (without EDGE) works more reliably for > > me. I am fine with enabling it automatically, but would still be nice to > > have a kill-switch. > > Well then do so from BTS/BSC, because imho it makes no sense setting "mode > egprs" in BTS/BSC and then setting the opposite in PCU. ACK. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 31 Oct 2020 12:51:28 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 30 Oct 2020 19:52:52 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Enable egprs support through PCUIF from BTS/BSC This VTY command was added due to EGPRS being introduced later as an experimental feature. It's no longer needed and causes more problems than goodness (since people sometimes forgets to enable it). Let's rather simply enable EGPRS support based on what BTS/BSC requests over PCUIF. Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 --- M src/pcu_l1_if.cpp M src/pcu_vty.c 2 files changed, 19 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/28/20928/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4491c4e..4f9eccb 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -643,6 +643,15 @@ bts->cs4 = !!(info_ind->flags & PCU_IF_FLAG_CS4); if (!bts->cs1 && !bts->cs2 && !bts->cs3 && !bts->cs4) bts->cs1 = 1; + bts->egprs_enabled = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 | + PCU_IF_FLAG_MCS2 | + PCU_IF_FLAG_MCS3 | + PCU_IF_FLAG_MCS4 | + PCU_IF_FLAG_MCS5 | + PCU_IF_FLAG_MCS6 | + PCU_IF_FLAG_MCS7 | + PCU_IF_FLAG_MCS8 | + PCU_IF_FLAG_MCS9)); if (info_ind->t3142) { /* if timer values are set */ osmo_tdef_set(bts->T_defs_bts, 3142, info_ind->t3142, OSMO_TDEF_S); osmo_tdef_set(bts->T_defs_bts, 3169, info_ind->t3169, OSMO_TDEF_S); diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 6dfcdf5..1bd2081 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -108,9 +108,6 @@ unsigned int i; vty_out(vty, "pcu%s", VTY_NEWLINE); - if (bts->egprs_enabled) - vty_out(vty, " egprs only%s", VTY_NEWLINE); - vty_out(vty, " flow-control-interval %d%s", bts->fc_interval, VTY_NEWLINE); if (bts->fc_bvc_bucket_size) @@ -273,29 +270,21 @@ #define EGPRS_STR "EGPRS configuration\n" -DEFUN_USRATTR(cfg_pcu_egprs, - cfg_pcu_egprs_cmd, - X(PCU_VTY_ATTR_NEW_TBF), - "egprs only", - EGPRS_STR "Use EGPRS and disable plain GPRS\n") +DEFUN_DEPRECATED(cfg_pcu_egprs, +cfg_pcu_egprs_cmd, +"egprs only", +EGPRS_STR "Use EGPRS and disable plain GPRS\n") { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->egprs_enabled = true; - + vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_pcu_no_egprs, - cfg_pcu_no_egprs_cmd, - X(PCU_VTY_ATTR_NEW_TBF), - "no egprs", - NO_STR EGPRS_STR) +DEFUN_DEPRECATED(cfg_pcu_no_egprs, +cfg_pcu_no_egprs_cmd, +"no egprs", +NO_STR EGPRS_STR) { - struct gprs_rlcmac_bts *bts = bts_main_data(); - - bts->egprs_enabled = false; - + vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange