April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmo-bts-trx: use C/I in the AMR link adaptation loop

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27758 ) Change subject: osmo-bts-trx: use C/I in the AMR link adaptation loop ...................................................................... osmo-bts-trx: use C/I in the AMR link adaptation loop Change-Id: Ide84bf864f56020c0265cfb9731615d4f7bad7f5 Related: SYS#5917, OS#4984 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/amr_loop.c M src/osmo-bts-trx/amr_loop.h M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 6 files changed, 48 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/58/27758/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index e39315f..eab904c 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -114,8 +114,8 @@ /* AMR */ uint8_t codec[4]; /* 4 possible codecs for amr */ int codecs; /* number of possible codecs */ - float ber_sum; /* sum of bit error rates */ - int ber_num; /* number of bit error rates */ + int lqual_cb_sum; /* sum of link quality samples (in cB) */ + int lqual_cb_num; /* number of link quality samples */ uint8_t ul_ft; /* current uplink FT index */ uint8_t dl_ft; /* current downlink FT index */ uint8_t ul_cmr; /* current uplink CMR index */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 96189ef..8ec9ccf 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1185,8 +1185,8 @@ chan_state->dl_ft = initial_id; chan_state->ul_cmr = initial_id; chan_state->dl_cmr = initial_id; - chan_state->ber_sum = 0; - chan_state->ber_num = 0; + chan_state->lqual_cb_sum = 0; + chan_state->lqual_cb_num = 0; } rc = 0; } diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c index afb9c37..1d40bb5 100644 --- a/src/osmo-bts-trx/amr_loop.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -32,16 +32,11 @@ #include "amr_loop.h" void trx_loop_amr_input(struct l1sched_chan_state *chan_state, - int n_errors, int n_bits_total) + const struct l1sched_meas_set *meas_set) { - struct gsm_lchan *lchan = chan_state->lchan; - float ber; - - /* calculate BER (Bit Error Ratio) */ - if (n_bits_total == 0) - ber = 1.0; /* 100% BER */ - else - ber = (float) n_errors / (float) n_bits_total; + const struct gsm_lchan *lchan = chan_state->lchan; + const struct amr_multirate_conf *cfg = &lchan->tch.amr_mr; + int lqual_cb = meas_set->ci_cb; /* cB (centibel) */ /* check if loop is enabled */ if (!chan_state->amr_loop) @@ -53,46 +48,49 @@ /* count bit errors */ if (lchan->type == GSM_LCHAN_TCH_H) { - chan_state->ber_num += 2; - chan_state->ber_sum += (ber + ber); + chan_state->lqual_cb_num += 2; + chan_state->lqual_cb_sum += (lqual_cb + lqual_cb); } else { - chan_state->ber_num++; - chan_state->ber_sum += ber; + chan_state->lqual_cb_num++; + chan_state->lqual_cb_sum += lqual_cb; } /* count frames */ - if (chan_state->ber_num < 48) + if (chan_state->lqual_cb_num < 48) return; - /* calculate average (reuse ber variable) */ - ber = chan_state->ber_sum / chan_state->ber_num; + /* calculate average (reuse lqual_cb variable) */ + lqual_cb = chan_state->lqual_cb_sum / chan_state->lqual_cb_num; - /* reset bit errors */ - chan_state->ber_num = 0; - chan_state->ber_sum = 0; + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "AVG link quality (C/I) is %d cB, " + "codec mode=%d\n", lqual_cb, chan_state->ul_ft); - LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f " - "codec id %d\n", ber, chan_state->ul_ft); + /* reset the link quality measurements */ + chan_state->lqual_cb_num = 0; + chan_state->lqual_cb_sum = 0; - /* degrade */ if (chan_state->dl_cmr > 0) { - /* degrade, if ber is above threshold FIXME: C/I */ - if (ber > - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) { - LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " - "from codec id %d to %d\n", ber, chan_state->dl_cmr, - chan_state->dl_cmr - 1); + const int thresh_lower_cb = cfg->bts_mode[chan_state->dl_cmr - 1].threshold / 2 * 10; + + /* Degrade if the link quality is below THR_MX_Dn(i - 1) */ + if (lqual_cb < thresh_lower_cb) { + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Degrading AMR codec mode: " + "%d -> %d due to link quality %d cB < THR_MX_Dn=%d cB\n", + chan_state->dl_cmr, chan_state->dl_cmr - 1, + lqual_cb, thresh_lower_cb); chan_state->dl_cmr--; } } else if (chan_state->dl_cmr < chan_state->codecs - 1) { - /* degrade, if ber is above threshold FIXME: C/I*/ - if (ber < - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold - - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) { - LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " - "from codec id %d to %d\n", ber, chan_state->dl_cmr, - chan_state->dl_cmr + 1); - chan_state->dl_cmr++; + const int thresh_upper_cb = cfg->bts_mode[chan_state->dl_cmr].threshold / 2 * 10 + + cfg->bts_mode[chan_state->dl_cmr].hysteresis / 2 * 10; + + /* Upgrade if the link quality is above THR_MX_Up(i) */ + if (lqual_cb > thresh_upper_cb) { + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Upgrading AMR codec mode: " + "%d -> %d due to link quality %d cB > THR_MX_Up=%d cB\n", + chan_state->dl_cmr, chan_state->dl_cmr + 1, + lqual_cb, thresh_upper_cb); + chan_state->dl_cmr--; } } } @@ -107,9 +105,9 @@ if (!chan_state->amr_loop && loop) { chan_state->amr_loop = 1; - /* reset bit errors */ - chan_state->ber_num = 0; - chan_state->ber_sum = 0; + /* reset the link quality measurements */ + chan_state->lqual_cb_num = 0; + chan_state->lqual_cb_sum = 0; return; } diff --git a/src/osmo-bts-trx/amr_loop.h b/src/osmo-bts-trx/amr_loop.h index 85f73fd..efff76c 100644 --- a/src/osmo-bts-trx/amr_loop.h +++ b/src/osmo-bts-trx/amr_loop.h @@ -11,6 +11,6 @@ */ void trx_loop_amr_input(struct l1sched_chan_state *chan_state, - int n_errors, int n_bits_total); + const struct l1sched_meas_set *meas_set); void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 8ca0961..fb19dd2 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -197,8 +197,6 @@ break; } - if (rc) - trx_loop_amr_input(chan_state, n_errors, n_bits_total); /* only good speech frames get rtp header */ if (rc != GSM_MACBLOCK_LEN && rc >= 4) { if (chan_state->amr_last_dtx == AMR_OTHER) { @@ -225,6 +223,9 @@ /* meas_avg.fn now contains TDMA frame number of the first burst */ fn_begin = meas_avg.fn; + if (tch_mode == GSM48_CMODE_SPEECH_AMR) + trx_loop_amr_input(chan_state, &meas_avg); + /* Check if the frame is bad */ if (rc < 0) { LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Received bad data (%u/%u)\n", diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index e3ce600..1b4aa40 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -233,9 +233,6 @@ break; } - if (rc) - trx_loop_amr_input(chan_state, n_errors, n_bits_total); - /* only good speech frames get rtp header */ if (rc != GSM_MACBLOCK_LEN && rc >= 4) { if (chan_state->amr_last_dtx == AMR_OTHER) { @@ -264,6 +261,9 @@ /* meas_avg.fn now contains TDMA frame number of the first burst */ fn_begin = meas_avg.fn; + if (tch_mode == GSM48_CMODE_SPEECH_AMR) + trx_loop_amr_input(chan_state, &meas_avg); + /* Check if the frame is bad */ if (rc < 0) { LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Received bad data (%u/%u)\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide84bf864f56020c0265cfb9731615d4f7bad7f5 Gerrit-Change-Number: 27758 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: amr: check-in default multi-rate config from osmo-bsc

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27756 ) Change subject: amr: check-in default multi-rate config from osmo-bsc ...................................................................... amr: check-in default multi-rate config from osmo-bsc This configuration will be used as a fall-back when the MultiRate configuration IE is not included in the CHAN ACT/MODIFY messages. Change-Id: I423d9953e9f65e49db599ea72197c2a0c5999271 Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917, OS#4984 --- M src/common/amr.c 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/27756/1 diff --git a/src/common/amr.c b/src/common/amr.c index 837757f..8545d58 100644 --- a/src/common/amr.c +++ b/src/common/amr.c @@ -6,6 +6,85 @@ #include <osmo-bts/logging.h> #include <osmo-bts/amr.h> +/* Reasonable defaults for AMR-FR and AMR-HR rate configuration. + * The values are taken from 3GPP TS 51.010-1 (version 13.11.0). + * See 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively. + * + * ^ C/I (dB) | FR / HR | + * | | + * | | + * MODE4 | | + * = | ----+---- THR_MX_Up(3) | 20.5 / 18.0 | + * | | | + * | = ----+---- THR_MX_Dn(4) | 18.5 / 16.0 | + * MODE3 | | + * | = ----+---- THR_MX_Up(2) | 14.5 / 14.0 | + * | | | + * = | ----+---- THR_MX_Dn(3) | 12.5 / 12.0 | + * MODE2 | | + * = | ----+---- THR_MX_Up(1) | 8.5 / 10.0 | + * | | | + * | = ----+---- THR_MX_Dn(2) | 6.5 / 8.0 | + * MODE1 | | + * | | + * | | + */ +static const struct gsm48_multi_rate_conf amr_fr_mr_cfg_def = { + .m4_75 = 1, + .m5_90 = 1, + .m7_95 = 1, + .m12_2 = 1, +}; +static const struct amr_mode amr_fr_bts_mode_def[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 13, /* THR_MX_Dn(2): 6.5 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 8.5 dB */ + }, + { + .mode = 2, /* 5.90k */ + .threshold = 25, /* THR_MX_Dn(3): 12.5 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.5 dB */ + }, + { + .mode = 5, /* 7.95k */ + .threshold = 37, /* THR_MX_Dn(4): 18.5 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 20.5 dB */ + }, + { + .mode = 7, /* 12.2k */ + /* this is the last mode, so no threshold */ + }, +}; + +static const struct gsm48_multi_rate_conf amr_hr_mr_cfg_def = { + .m4_75 = 1, + .m5_90 = 1, + .m6_70 = 1, + .m7_95 = 1, +}; +static const struct amr_mode amr_hr_bts_mode_def[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 16, /* THR_MX_Dn(2): 8.0 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 10.0 dB */ + }, + { + .mode = 2, /* 5.90k */ + .threshold = 24, /* THR_MX_Dn(3): 12.0 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.0 dB */ + }, + { + .mode = 3, /* 6.70k */ + .threshold = 32, /* THR_MX_Dn(4): 16.0 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 18.0 dB */ + }, + { + .mode = 5, /* 7.95k */ + /* this is the last mode, so no threshold */ + }, +}; + void amr_log_mr_conf(int ss, int logl, const char *pfx, struct amr_multirate_conf *amr_mrc) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I423d9953e9f65e49db599ea72197c2a0c5999271 Gerrit-Change-Number: 27756 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: use hard-coded defaults if the MultiRate conf IE is absent

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27757 ) Change subject: rsl: use hard-coded defaults if the MultiRate conf IE is absent ...................................................................... rsl: use hard-coded defaults if the MultiRate conf IE is absent Change-Id: Ie96af636105ee1ffe2d9a0bd9eea375faebad149 Related: SYS#5917, OS#4984 --- M include/osmo-bts/amr.h M src/common/amr.c M src/common/rsl.c 3 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/57/27757/1 diff --git a/include/osmo-bts/amr.h b/include/osmo-bts/amr.h index f313287..3fa4b8f 100644 --- a/include/osmo-bts/amr.h +++ b/include/osmo-bts/amr.h @@ -14,5 +14,6 @@ void amr_set_mode_pref(uint8_t *data, const struct amr_multirate_conf *amr_mrc, uint8_t cmi, uint8_t cmr); unsigned int amr_get_initial_mode(struct gsm_lchan *lchan); +void amr_init_mr_conf_def(struct gsm_lchan *lchan); #endif /* _OSMO_BTS_AMR_H */ diff --git a/src/common/amr.c b/src/common/amr.c index 8545d58..53ce24d 100644 --- a/src/common/amr.c +++ b/src/common/amr.c @@ -250,3 +250,26 @@ } } } + +void amr_init_mr_conf_def(struct gsm_lchan *lchan) +{ + const struct gsm48_multi_rate_conf *mr_cfg; + const struct amr_mode *bts_mode; + unsigned int num_modes; + + if (lchan->type == GSM_LCHAN_TCH_F) { + num_modes = ARRAY_SIZE(amr_fr_bts_mode_def); + bts_mode = &amr_fr_bts_mode_def[0]; + mr_cfg = &amr_fr_mr_cfg_def; + } else { + num_modes = ARRAY_SIZE(amr_hr_bts_mode_def); + bts_mode = &amr_hr_bts_mode_def[0]; + mr_cfg = &amr_hr_mr_cfg_def; + } + + memcpy(lchan->tch.amr_mr.gsm48_ie, mr_cfg, + sizeof(lchan->tch.amr_mr.gsm48_ie)); + memcpy(&lchan->tch.amr_mr.bts_mode[0], &bts_mode[0], + sizeof(lchan->tch.amr_mr.bts_mode)); + lchan->tch.amr_mr.num_modes = num_modes; +} diff --git a/src/common/rsl.c b/src/common/rsl.c index 961e065..5c4a2cd 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1628,7 +1628,9 @@ if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) { LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Missing MultiRate conf IE " "(TCH mode is %s)\n", gsm48_chan_mode_name(lchan->tch_mode)); - /* TODO: init lchan->tch.amr_mr with some default values */ + /* Init lchan->tch.amr_mr with hard-coded default values */ + amr_init_mr_conf_def(lchan); + goto parsed; } return 0; } @@ -1648,6 +1650,7 @@ return -RSL_ERR_IE_CONTENT; } +parsed: amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr); lchan->tch.last_cmr = AMR_CMR_NONE; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie96af636105ee1ffe2d9a0bd9eea375faebad149 Gerrit-Change-Number: 27757 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: rsl_rx_chan_{activ,modif}: do not sent an Error Report

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27754 ) Change subject: rsl: rsl_rx_chan_{activ,modif}: do not sent an Error Report ...................................................................... rsl: rsl_rx_chan_{activ,modif}: do not sent an Error Report Sending an Error Report along with a NACK makes no sense. Change-Id: Idae55645c34970f839bb0eef61a7326a1026b20c Related: SYS#5917, OS#4984 --- M src/common/rsl.c 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/27754/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 09444d1..2da954d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1855,10 +1855,8 @@ /* 9.3.52 MultiRate Configuration */ rc = parse_multirate_config(lchan, &tp); - if (rc < 0) { - rsl_tx_error_report(msg->trx, -rc, &dch->chan_nr, NULL, msg); + if (rc < 0) return rsl_tx_chan_act_acknack(lchan, -rc); - } /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ @@ -2204,10 +2202,8 @@ /* 9.3.52 MultiRate Configuration */ rc = parse_multirate_config(lchan, &tp); - if (rc < 0) { - rsl_tx_error_report(msg->trx, -rc, &dch->chan_nr, NULL, msg); + if (rc < 0) return rsl_tx_mode_modif_nack(lchan, -rc); - } /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idae55645c34970f839bb0eef61a7326a1026b20c Gerrit-Change-Number: 27754 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: de-duplicate parsing of MultiRate configuration IE

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27753 ) Change subject: rsl: de-duplicate parsing of MultiRate configuration IE ...................................................................... rsl: de-duplicate parsing of MultiRate configuration IE Change-Id: I98e10c3e947b9a4605e9db5bf7f499dc24bccad7 Related: SYS#5917, OS#4984 --- M src/common/rsl.c 1 file changed, 33 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/27753/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 5112ee5..09444d1 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1617,6 +1617,28 @@ return 0; } +/* Parse (O) MultiRate configuration IE (see 9.3.52) */ +static int parse_multirate_config(struct gsm_lchan *lchan, + const struct tlv_parsed *tp) +{ + int rc; + + if (!TLVP_PRESENT(tp, RSL_IE_MR_CONFIG)) + return 0; + + rc = amr_parse_mr_conf(&lchan->tch.amr_mr, + TLVP_VAL(tp, RSL_IE_MR_CONFIG), + TLVP_LEN(tp, RSL_IE_MR_CONFIG)); + if (rc < 0) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); + return -RSL_ERR_IE_CONTENT; + } + + amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr); + lchan->tch.last_cmr = AMR_CMR_NONE; + return 0; +} + /* 8.4.1 CHANnel ACTIVation is received */ static int rsl_rx_chan_activ(struct msgb *msg) { @@ -1830,20 +1852,14 @@ /* use standard SACCH filling of the BTS */ copy_sacch_si_to_lchan(lchan); } - /* 9.3.52 MultiRate Configuration */ - if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) { - rc = amr_parse_mr_conf(&lchan->tch.amr_mr, - TLVP_VAL(&tp, RSL_IE_MR_CONFIG), - TLVP_LEN(&tp, RSL_IE_MR_CONFIG)); - if (rc < 0) { - LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); - rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); - return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); - } - amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr); - lchan->tch.last_cmr = AMR_CMR_NONE; + /* 9.3.52 MultiRate Configuration */ + rc = parse_multirate_config(lchan, &tp); + if (rc < 0) { + rsl_tx_error_report(msg->trx, -rc, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, -rc); } + /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ @@ -2187,19 +2203,12 @@ /* 9.3.45 Main channel reference */ /* 9.3.52 MultiRate Configuration */ - if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) { - rc = amr_parse_mr_conf(&lchan->tch.amr_mr, - TLVP_VAL(&tp, RSL_IE_MR_CONFIG), - TLVP_LEN(&tp, RSL_IE_MR_CONFIG)); - if (rc < 0) { - LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); - rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); - return rsl_tx_mode_modif_nack(lchan, RSL_ERR_IE_CONTENT);; - } - - amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr); - lchan->tch.last_cmr = AMR_CMR_NONE; + rc = parse_multirate_config(lchan, &tp); + if (rc < 0) { + rsl_tx_error_report(msg->trx, -rc, &dch->chan_nr, NULL, msg); + return rsl_tx_mode_modif_nack(lchan, -rc); } + /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I98e10c3e947b9a4605e9db5bf7f499dc24bccad7 Gerrit-Change-Number: 27753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: parse_multirate_config(): check if AMR codec is used

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27755 ) Change subject: rsl: parse_multirate_config(): check if AMR codec is used ...................................................................... rsl: parse_multirate_config(): check if AMR codec is used 3GPP TS 48.058 defines the MultiRate configuration IE as optional, and states that it's "included if the Channel Mode indicates that a multi-rate codec is used". If I understand this correctly, it may be omitted even if a multi-rate codec is requested. Otherwise it would have been defined as a conditional IE. For now let's print a warnig if this IE was expected, but missing. We may need to apply some hard-coded defaults in this case. If this IE is present, but the Channel Mode indicates a codec other than AMR, let's send NACK with cause=RSL_ERR_OPT_IE_ERROR, assuming that the CHAN ACT/MODIFY message is malformed. Change-Id: I6ddc0b46a268ed56ac727cda57d0d68b2746fd59 Related: SYS#5917, OS#4984 --- M src/common/rsl.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/27755/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 2da954d..961e065 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1623,8 +1623,22 @@ { int rc; - if (!TLVP_PRESENT(tp, RSL_IE_MR_CONFIG)) + if (!TLVP_PRESENT(tp, RSL_IE_MR_CONFIG)) { + /* Included if the Channel Mode indicates that a multi-rate codec is used */ + if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) { + LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Missing MultiRate conf IE " + "(TCH mode is %s)\n", gsm48_chan_mode_name(lchan->tch_mode)); + /* TODO: init lchan->tch.amr_mr with some default values */ + } return 0; + } + + /* Included if the Channel Mode indicates that a multi-rate codec is used */ + if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Unexpected MultiRate conf IE " + "(TCH mode is %s)\n", gsm48_chan_mode_name(lchan->tch_mode)); + return -RSL_ERR_OPT_IE_ERROR; + } rc = amr_parse_mr_conf(&lchan->tch.amr_mr, TLVP_VAL(tp, RSL_IE_MR_CONFIG), -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ddc0b46a268ed56ac727cda57d0d68b2746fd59 Gerrit-Change-Number: 27755 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use '#pragma once' in amr_loop.h

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27751 ) Change subject: osmo-bts-trx: use '#pragma once' in amr_loop.h ...................................................................... osmo-bts-trx: use '#pragma once' in amr_loop.h Change-Id: I98e42485955de4a261b6c8d865e84c313c1145d5 Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/amr_loop.h 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/51/27751/1 diff --git a/src/osmo-bts-trx/amr_loop.h b/src/osmo-bts-trx/amr_loop.h index 4aa05c4..85f73fd 100644 --- a/src/osmo-bts-trx/amr_loop.h +++ b/src/osmo-bts-trx/amr_loop.h @@ -1,5 +1,4 @@ -#ifndef _TRX_LOOPS_H -#define _TRX_LOOPS_H +#pragma once #include <osmo-bts/scheduler.h> @@ -15,5 +14,3 @@ int n_errors, int n_bits_total); void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); - -#endif /* _TRX_LOOPS_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I98e42485955de4a261b6c8d865e84c313c1145d5 Gerrit-Change-Number: 27751 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: amr_loop: remove unneeded #includes

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27752 ) Change subject: osmo-bts-trx: amr_loop: remove unneeded #includes ...................................................................... osmo-bts-trx: amr_loop: remove unneeded #includes Change-Id: I6d181f19711dc14695abd0f8e2586329e91aa68d Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/amr_loop.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/27752/1 diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c index 6cfb0fc..afb9c37 100644 --- a/src/osmo-bts-trx/amr_loop.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -27,12 +27,8 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/logging.h> -#include <osmo-bts/l1sap.h> -#include <osmocom/core/bits.h> #include <osmocom/gsm/gsm_utils.h> -#include "trx_if.h" -#include "l1_if.h" #include "amr_loop.h" void trx_loop_amr_input(struct l1sched_chan_state *chan_state, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6d181f19711dc14695abd0f8e2586329e91aa68d Gerrit-Change-Number: 27752 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: rename 'loops.[ch]' to 'amr_loop.[ch]'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27750 ) Change subject: osmo-bts-trx: rename 'loops.[ch]' to 'amr_loop.[ch]' ...................................................................... osmo-bts-trx: rename 'loops.[ch]' to 'amr_loop.[ch]' There is nothing else except the AMR link adaptation loop in these files. Change-Id: Iff2c0d32da5cd89824197d05f4732ce974c12f28 Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/Makefile.am R src/osmo-bts-trx/amr_loop.c R src/osmo-bts-trx/amr_loop.h M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/trx_vty.c 6 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/27750/1 diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index afa5414..f6094dd 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -32,7 +32,7 @@ sched_utils.h \ trx_if.h \ l1_if.h \ - loops.h \ + amr_loop.h \ trx_provision_fsm.h \ $(NULL) @@ -51,7 +51,7 @@ sched_lchan_tchh.c \ trx_provision_fsm.c \ trx_vty.c \ - loops.c \ + amr_loop.c \ probes.d \ $(NULL) diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/amr_loop.c similarity index 97% rename from src/osmo-bts-trx/loops.c rename to src/osmo-bts-trx/amr_loop.c index 4c70e8d..6cfb0fc 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -1,4 +1,4 @@ -/* Loop control for OsmoBTS-TRX */ +/* AMR link adaptation loop (see 3GPP TS 45.009, section 3) */ /* (C) 2013 by Andreas Eversberg <jolly(a)eversberg.eu> * @@ -33,7 +33,7 @@ #include "trx_if.h" #include "l1_if.h" -#include "loops.h" +#include "amr_loop.h" void trx_loop_amr_input(struct l1sched_chan_state *chan_state, int n_errors, int n_bits_total) diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/amr_loop.h similarity index 100% rename from src/osmo-bts-trx/loops.h rename to src/osmo-bts-trx/amr_loop.h diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index f886e59..8ca0961 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -43,7 +43,7 @@ #include <osmo-bts/msg_utils.h> #include <sched_utils.h> -#include <loops.h> +#include <amr_loop.h> /* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Uplink TCH/F. * diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index c9811da..e3ce600 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -43,7 +43,7 @@ #include <osmo-bts/msg_utils.h> #include <sched_utils.h> -#include <loops.h> +#include <amr_loop.h> /* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Uplink TCH/H. * diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 2b8bc24..bd6b3b1 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -46,7 +46,7 @@ #include "l1_if.h" #include "trx_if.h" -#include "loops.h" +#include "amr_loop.h" #define X(x) (1 << x) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iff2c0d32da5cd89824197d05f4732ce974c12f28 Gerrit-Change-Number: 27750 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn-pgw-test: Improve osmo-uecups cfg file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27748 ) Change subject: ttcn-pgw-test: Improve osmo-uecups cfg file ...................................................................... ttcn-pgw-test: Improve osmo-uecups cfg file Bind to specific container IP address. Use more uniform logging config settings as most of the other osmocom processes. Change-Id: I36bb04a388ab65aaa03a82c159a1b258886ec0d0 --- M ttcn3-pgw-test/osmo-uecups-daemon.cfg 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ttcn3-pgw-test/osmo-uecups-daemon.cfg b/ttcn3-pgw-test/osmo-uecups-daemon.cfg index e268277..06f9362 100644 --- a/ttcn3-pgw-test/osmo-uecups-daemon.cfg +++ b/ttcn3-pgw-test/osmo-uecups-daemon.cfg @@ -1,3 +1,6 @@ +log gsmtap 172.18.18.202 + logging level set-all debug + logging filter all 1 log stderr logging filter all 1 logging print extended-timestamp 1 @@ -6,11 +9,9 @@ logging print category 1 logging print level 1 logging timestamp 1 - logging color 0 -! - logging level set-all debug - logging level linp info + logging color 1 + logging level set-all info line vty - bind 0.0.0.0 + bind 172.18.18.20 uecups - local-ip 0.0.0.0 + local-ip 172.18.18.20 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I36bb04a388ab65aaa03a82c159a1b258886ec0d0 Gerrit-Change-Number: 27748 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022