aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-06-18rsl_lchan_lookup: drop redundant conditionNeels Hofmeyr1-1/+1
'vamos' is only set to true for osmobts types, hence no need to check that condition again. fixup for commit d37dcb9f6854a4d15dd2ba098fcbaa212251684f 'RSL: rx and tx VAMOS Channel Number cbits for VAMOS lchans' I957eff0d2c33ec795eda75a4bff21965b0179f73 Related: CID#236318 Related: SYS#5315 OS#4940 Change-Id: I4d9afc2996d95fdc15ee1a04e31d781b595023e3
2021-06-18rsl_data_request() check lchan pointer before accessNeels Hofmeyr1-5/+7
fixup for commit 43aeeaf05ad814ccab0e93227b1248a20302c8ec 'RSL chan_nr: replace OSMO_ASSERT with error handling' I71ed6437c403a3f9336e17a94b4948fca295d853 Related: CID#236319 Related: SYS#5315 OS#4940 Change-Id: I873c1a27f9449a56c525984ea50bfcf6daa4b5f8
2021-06-18hodec2: don't apply AFS bias to same-cell lchansNeels Hofmeyr2-12/+9
The AFS bias actually should not apply to local cell lchans, because it makes no sense for intra-cell considerations: - same-cell lchans obviously have identical rxlev; - any nonzero AFS bias thus always raises the TCH/F above the TCH/H; - for intra-cell reassignment, the power budget hysteresis is, naturally, not applied. So, before this patch, setting AFS bias even to only 1 would unconditionally move all (AMR) TCH/H lchans over to free TCH/F lchans in the same cell. Recent patch Id40d1cf8b58410c7d4eb87407fe8b8106e352438 implements explicit upgrade from TCH/H to TCH/F *if* the TCH/H is experiencing low rxqual or low rxlev, as a proper replacement for intra-cell AFS bias. Related: SYS#5198 SYS#5365 Change-Id: I315f24123ae016887ab91666870ce252e096f90f
2021-06-17Introduce counters to track SRVCC proceduresPau Espin Pedrol4-0/+53
Related: SYS#5337 Change-Id: I5c20da56d465dbcf4366130394f7c42635a24cc7
2021-06-17Introduce VTY command to disable srvcc fast-return on target BTSPau Espin Pedrol8-13/+47
Related: SYS#5337 Change-Id: I2ac91b5dffc9b6de60576aabe21a15f24fea38cb
2021-06-16handover_cfg: add missing VTY_CMD_PREFIX in commentPhilipp Maier1-1/+1
The comment that explains HO_CFG_ONE_MEMBER lacks VTY_CMD_PREFIX in the sample macro definistion. Change-Id: I80db198178cfd1e8669589eb3b468766f0c30ea2
2021-06-15vty: reassign: add missing check for valid target lchanNeels Hofmeyr1-0/+4
Make sure that the target lchan has been initialized before attempting to reassign. I ran into this in the VAMOS tests, forgetting to set the BTS_FEAT_VAMOS in osmo-bts-omldummy: the vty command from ttcn attempts to reassign to a non-initialized lchan, and aborts osmo-bsc. Change-Id: Ia77a3312dde0e4b8df9ad2f33339266bae06439d
2021-06-15fixup for vamos: fix wrong cbits in rsl_lchan_lookup()Neels Hofmeyr1-1/+1
The RSL_CHAN_OSMO_VAMOS_MASK mask applies to the chan_nr, but the cbits variable in rsl_lchan_lookup() is chan_nr >> 3. So the mask didn't do its job. Now it does. A bit embarrassing how i took the suggestion to use this mask and put it into code without testing it. It looked good enough... Change-Id: I005c5f319bb6f14651aeb613cdff52e79f761913
2021-06-13hodec2: implement upgrade TCH/H -> TCH/F (without AFS bias)Neels Hofmeyr5-54/+34
Pass flag into find_alternative_lchan() indicating that a TCH/H channel has low ratings (rxqual or rxlev, doesn't matter). Heed this flag in the last round, the requirement A check, and allow candidates that have equal rxlev, if they result in an upgrade from TCH/H to TCH/F. This allows intra-cell upgrades to TCH/F. An important point is that this patch allows upgrade to TCH/F *without* the AFS bias setting. See also I315f24123ae016887ab91666870ce252e096f90f. Related: SYS#5198 SYS#5365 Change-Id: Id40d1cf8b58410c7d4eb87407fe8b8106e352438
2021-06-10gsm_data.h: add comments about immutable activ/modif/assign request infoNeels Hofmeyr1-0/+18
Change-Id: I7997b802d997073ae6a05db2f40e82cb8e83764f
2021-06-10lchan_fsm: lchan_fail() strings should not have a terminating newlineNeels Hofmeyr2-10/+10
Change-Id: I063fd5598add75c39338d90798189c10a0714094
2021-06-10RSL: set default TEI according to TRX numberNeels Hofmeyr1-0/+2
Change-Id: I3c500f7a5afc9143d4ea7102ab96e52aeb67b4b6
2021-06-10cosmetic loop simplification in gsm48_multirate_config()Neels Hofmeyr1-3/+3
Change-Id: I52424ad6a0bf499fe040cf0a1de00e636a0a40fe
2021-06-10get_any_lchan(): reduce minor code dupNeels Hofmeyr1-11/+4
Change-Id: I304a7333adc265e156f04b42a10bac6912f58ad2
2021-06-10clarify bts_chan_loadNeels Hofmeyr1-7/+6
Change-Id: I9bd80a08472018e69360ac5739979c7056d4f063
2021-06-10log: assignment_fsm: tweak err msg for incompatible chanNeels Hofmeyr1-2/+4
Related: SYS#5315 OS#4940 Change-Id: Ifd8790923d54a27061708ff8077d509238b9c7dd
2021-06-10log: assignment_fsm: drop newline from assignment_failNeels Hofmeyr1-1/+1
Drop terminating newline from an assignment_fail() call which causes an erratic line feed in logging. Change-Id: Ib56e1f6a45c7e2c235f8ef0c8dea7151481677ab
2021-06-10VTY: add lchan re-assignment commandNeels Hofmeyr4-0/+129
Add VTY command to trigger an intra-cell re-assignment, also allowing to re-assign to a secondary VAMOS lchan. Related: SYS#5315 OS#4940 Change-Id: If006f5caaf83b07675f57e5665cfa79328da55e6
2021-06-10VTY: add 'vamos-subslot' to activate a secondary lchanNeels Hofmeyr2-10/+27
Related: SYS#5315 OS#4940 Change-Id: If44b6bdb78046502eb0b66529ae190a955d9978c
2021-06-10VTY: 'show lchan': show that lchan is in VAMOS modeNeels Hofmeyr1-1/+4
Related: SYS#5315 OS#4940 Change-Id: I9f38712f941d60531526cc3395875655455909d9
2021-06-10RSL: rx and tx VAMOS Channel Number cbits for VAMOS lchansNeels Hofmeyr7-42/+83
Add the Osmocom-specific extension to indicate VAMOS shadow lchans in RSL, in lchan lookup and RSL message transmission. Note that RR messages containing cbits (Assignment Command, Handover Command, ...) must *not* send Osmocom specific cbits to the MS. Only the RSL messages directed to the BTS send Osmocom specific bits. Related: SYS#5315 OS#4940 Depends: If33c1695922d110c0d2c60d5c0136caf2587194e (libosmocore) Change-Id: I957eff0d2c33ec795eda75a4bff21965b0179f73
2021-06-10RSL chan_nr: replace OSMO_ASSERT with error handlingNeels Hofmeyr8-59/+183
It's bad to abort the program for an incompatible chan_nr. Instead of OSMO_ASSERT(), make sure that error handling happens all they way to the original callers of gsm_lchan2chan_nr etc. This is also preparation to add further error causes: Osmocom specific cbits needed for a non-Osmo BTS. Related: SYS#5315 OS#4940 Change-Id: I71ed6437c403a3f9336e17a94b4948fca295d853
2021-06-10rsl_lchan_lookup(): add comment explaining ts_is_capable_of_pchan()Neels Hofmeyr1-0/+4
Change-Id: Ie3699db496cfb690ac9302ccd177cdd77dc57ebb
2021-06-10rsl_lchan_lookup(): turn cbits if-cascade into a switch()Neels Hofmeyr1-7/+28
There is some odd repetition of macros with all possible subslot indexes, but now we are using the defined macros instead of magic numbers, making it easier to see that it is correct. Also this allows trivially adding VAMOS cbits cases to the existing switch() in a subsequent patch. Change-Id: I4c6ce2f4ca999c19a58909b9adb849a3b8b6ffc8
2021-06-10update the lchan name to always reflect VAMOS shadownessNeels Hofmeyr7-12/+25
Change gsm_lchan_name_compute() to a function that in-place updates the lchan->name. That allows calling it numerous times with the talloc handled internally. Rename it to lchan_update_name(). Add 'shadow' to lchan_update_name() and lchan_fsm_update_id() for VAMOS shadow lchans, and also print the lchan index that it is a shadow for, instead of the index in the lchan array. When set_pchan_is() updates the VAMOSness of the lchans, call lchan_fsm_update_id(). From lchan_fsm_update_id() also call lchan_update_name(). This is a bit convoluted for legacy reasons. There are utility programs and C tests using bts_trx.c but not lchan_fsm.c. lchan_update_name() lives in gsm_data.c for that reason. This patch calls lchan_update_name() from lchan_fsm_update_id() and not vice versa to avoid having to add stubbed lchan_fsm_update_id() functions to all utility programs and C tests. We can't easily unify the lchan->name and lchan->fi->id without lots of refactoring rippling through all those little utility programs and C tests. Change-Id: I7c2bae3b895a91f1b99b4147ecc0e3009cb7439a
2021-06-10add VAMOS secondary lchans to timeslot structNeels Hofmeyr5-12/+105
So far there is a bunch of code setting a primary lchan in VAMOS mode. This patch now adds the actual secondary "shadow" lchans that may be combined with a primary lchan in VAMOS mode to form a multiplex. VAMOS lchans are put in the same ts->lchan[] array that keeps the primary lchans. They are at most two additional usable lchans (for a TCH/H shadow) added to either TCH/F or TCH/H. Keeping these in the same array allows looping over all lchans easily. The ts->max_primary_lchans indicates the index of the first VAMOS shadow lchan. Related: SYS#5315 OS#4940 Change-Id: I928af99498bba488d317693f3144d4fccbbe9af3
2021-06-10RR Assignment for VAMOS: send TSC SetNeels Hofmeyr1-0/+6
We already send the TSC Set in the RSL Channel Activation, telling the BTS about the TSC Set. The MS needs to be instructed of the TSC Set in the RR Assignment Command. The first code to actually do an Assignment to a VAMOS activated lchan will follow in If006f5caaf83b07675f57e5665cfa79328da55e6. Change-Id: Ibf3b6d276fadf724c16a5225c03e96a27a056153
2021-06-10implement CHANnel ACTIVate to VAMOS modeNeels Hofmeyr5-17/+54
Related: SYS#5315 OS#4940 Change-Id: If3ac584e4223ef7656c7fedc3bf11df87e4309ec
2021-06-10add missing AMR config for RTP activation after mode modifyNeels Hofmeyr1-11/+19
Add function lchan_activate_set_ch_mode_rate_and_mr_config() and call it for both plain channel activation and after a mode modify that needs RTP activation. The AMR config was missing after Mode Modify. Related: SYS#5315 OS#4940 Change-Id: I842fe7a14a91d1ec123cb4a3f52afe34456c03e3
2021-06-10lchan_fsm: introduce lchan.activate.ch_mode_rate to allow tweakingNeels Hofmeyr5-13/+20
lchan->activate.info.ch_mode_rate should remain unchanged, it is the immutable request data. However, for VAMOS, we will want to automatically see that the chan_mode is chosen correctly. As a first step, place a mutable ch_mode_rate copy at lchan->activate.ch_mode_rate, i.e. not in .activate.info, but in .activate. Use that everywhere. This is mostly a non-functional change, preparing for a subsequent patch that adds handling of VAMOS shadow lchans. As side effect of adding lchan_activate_set_ch_mode_rate_and_mr_config() after MODE_MODIF_ACK (enabling the voice stream after a channel mode modify), fix AMR config: the call to lchan_mr_config() was missing. Change-Id: Icc9cc7481b3984fdca34eef49ea91ad3388c06fe
2021-06-10vty-test: osmo-bsc.vty: test doc of lchan activate cmdNeels Hofmeyr1-0/+56
A subsequent patch will add to this VTY command, so let's first test the current status as a baseline. Change-Id: I6379e306fb8fa6ec227125c6cf14893d674e7596
2021-06-10add lchan->vamos.is_secondary flagNeels Hofmeyr2-2/+9
VAMOS shadow lchans do not exist yet, but add the indicator flag that tells whether an lchan pointer is a primary or a shadow lchan. In Mode Modify: based on the flag, choose a different default TSC Set for shadow lchans; do BTS type compat checking for shadow lchan use. Actual lchans with vamos.is_secondary == true will be introduced by patch: 'add VAMOS secondary lchans to timeslot struct' I928af99498bba488d317693f3144d4fccbbe9af3 Change-Id: I4072fc7703c592df699fe8e27c02df09acde0909
2021-06-10vty: add lchan modify '(vamos|non-vamos)' commandNeels Hofmeyr2-28/+113
Change-Id: If44c3483d4d3d86f5822c5ad882aaeeaff27e3af
2021-06-10implement Channel Mode Modify to VAMOS modeNeels Hofmeyr4-6/+53
Put a (primary) lchan in VAMOS speech mode. This is not yet about activating shadow lchans, this merely puts any lchan in a VAMOS capable channel- and speech mode. Protocol: In RR Channel Mode Modify, send a spec conforming VAMOS channel mode as well as an Extended TSC Set, wich adds the TSC Set to the training sequence code value. In RSL MODE MODIFY, send Osmocom specific extensions to indicate the TSC Set and TSC, as well as the VAMOS channel mode; only to OsmoBTS type cells. - Set the Channel Mode's Channel Rate to Osmocom specific RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm / RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm - Add the Osmocom specific Training Sequence IE containing both TSC Set and TSC. (These are documented in the Abis manual.) Implementation: The internal API to request a Mode Modify is lchan_modify(info). Add to this info the 'vamos' bool, set to true when the modification should put the lchan in VAMOS channel mode or not. When info.vamos == true, make sure the channel mode value is a VAMOS one: in the copy of info->ch_mode_rate at lchan->modify.ch_mode_rate, convert to the right VAMOS/non-VAMOS equivalent channel mode. When the modification is through, set lchan->vamos.enabled appropriately. This patch also builds on Ic665125255d7354f5499d10dda1dd866ab243d24 'allow explixit TSC Set and TSC on chan activ / modif / assignment' placing tsc_set and tsc values in the TSC related IEs. Related: SYS#5315 OS#4940 Change-Id: Ibf53f4797d7491b17a33946fd7d920f038362b4c
2021-06-09vty: Drop unused old node enum fieldsPau Espin Pedrol1-2/+0
Change-Id: Ifccd1e477c36bee976a61760b0fedc395f675c1f
2021-06-09allow mode modify when RTP stream is activeNeels Hofmeyr1-9/+0
Get rid of this artificial barrier, because Modify with active voice stream is supported since commit "lchan and assignment FSMs: make Channel Mode Modify more sane" d5cb0eb8fda3ade89c7b2e23a626b68dfda96f46 I4986844f839b1c9672c61d916eb3d33d0042d747 Change-Id: I25f4a881fa32a07f97d7d6e6b812f8afc699d951
2021-06-08hodec2: fix is_upgrade_to_tchf() for requirement ANeels Hofmeyr1-1/+1
Add missing REQUIREMENT_A_TCHF to form a full REQUIREMENT_TCHF_MASK. That allows detecting TCH/F -> TCH/H upgrades also in the requirement A flags, where we look for any viable lchan. Prepares for upcoming patch Id40d1cf8b58410c7d4eb87407fe8b8106e352438 which implements TCH/H to TCH/F upgrades within the same cell. Related: SYS#5198 SYS#5365 Change-Id: Ic44615b314782423bab0ceef5810311776f92754
2021-06-08cosmetic prep: hodec2: move is_upgrade_to_tchf() further upNeels Hofmeyr1-7/+7
Preparation for Id40d1cf8b58410c7d4eb87407fe8b8106e352438 Related: SYS#5198 SYS#5365 Change-Id: I3fd0e257e033c573017ce62e3efc19b094acf73c
2021-06-08hodec2: add handover_test cases for upgrade of TCH/H -> TCH/FNeels Hofmeyr6-0/+210
Add test_amr_tch_h_and_afs_bias.ho_vty test_amr_tch_h_to_f_rxlev.ho_vty test_amr_tch_h_to_f_rxlev_congested.ho_vty test_amr_tch_h_to_f_rxqual.ho_vty test_amr_tch_h_to_f_rxqual_congested.ho_vty Related: SYS#5198 SYS#5365 Change-Id: Ib88f7e00d8bd77e2b02a7242a0fab4dd79333037
2021-06-07src/utils/meas_vis.c: fix bs_power -> bs_power_dbOliver Smith1-1/+1
Fix build error: meas_vis.c:196:16: error: 'struct gsm_meas_rep' has no member named 'bs_power'; did you mean 'bs_power_db'? Output the value in the same format as before the change that introduced this regression (dB / 2). We didn't catch this regression with jenkins because meas_vis is only built if libcdk is installed. Related: OS#5173 Fixes: d9b7aedb ("change bs_power to bs_power_db") Change-Id: I9ba9b491ccbde9aa14cfb14ecc551acb2bfd7674
2021-06-05fixup: pass tsc = -1 for previous default training sequence codeNeels Hofmeyr4-1/+13
An unintended change in default behavior was introduced in patch: "allow explixit TSC Set and TSC on chan activ / modif / assignment" Ic665125255d7354f5499d10dda1dd866ab243d24 c33eb8d56943b8981523754b081967e6ff5f245d Set tsc_set and tsc = -1 for all lchan_activate_info and assignment_request requests to actually yield the default behavior of selecting the TSC based on the timeslot cfg or the BSIC value. By setting tsc = 0 implicitly, the patch caused all requests to ask for tsc 0 instead of calling gsm_ts_tsc(). For a Channel Mode Modify in assignment_fsm, pass the lchan's current TSC to keep it unchanged. osmo-ttcn3-hacks Id67a949e0f61ec8123976eb8d336f04510c55c01 adds a test to verify the expected TSC in all of the activation, assignment and modify messages. Current osmo-bsc master fails, this patch fixes. Related: SYS#5315 OS#4940 Ic665125255d7354f5499d10dda1dd866ab243d24 Change-Id: If12df11511fe22ea167782f776736a1a9c484b1f
2021-06-05meas rep logging: use log_check_level() to skip a logging loopNeels Hofmeyr1-6/+7
A side effect is that the final cleanup part of that function is now always called, also when num_cell == 7. (Whether we should really clear that logging context at that place is a different question, out of scope here.) Change-Id: I71a402a0940857bbedbaf25d293429934706a83c
2021-06-05meas rep logging: replace a dozen DEBUGPC() with one DEBUGP()Neels Hofmeyr1-24/+45
Instead of calling DEBUGPC() over and over, compose a string using osmo_strbuf and then log it once. Rationale: a) DEBUGPC() is a bad idea for gsmtap_log, because each DEBUGPC() dispatches a separate gsmtap_log packet, fragmenting the actual log line in wireshark. b) DEBUGPC() is a bad idea because it checks the logging categories for every DEBUGPC() invocation. c) using a separate function with osmo_strbuf and OTC_SELECT, we can actually skip the entire string composition in case the DMEAS logging category is disabled, with a single logging category check. Change-Id: I4cb607ff43a1cb30408427d99d97c103776b6e69
2021-06-05change bs_power to bs_power_dbNeels Hofmeyr8-18/+21
The RSL BS Power IE in measurement reports is encoded as dB / 2. Instead of using this coding all over the code, converting to dB and often printing confusing values in logging etc, store as plain dB. The conversions should be at the points where a "weird" format is defined: the RSL encoding needs divided-by-two, so apply it there. The meas_vis is (now unfortunately) defined as div-two, and so on. But internally we now just store the plain dB value and calculate with it without duplicating the wire decoding step everywhere. Rename to bs_power_db to clarify the unit of the stored value. Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616
2021-06-05handover: apply meas report BS Power to RXLEV, fix ho oscillationNeels Hofmeyr2-10/+9
This fixes handover oscillation in the presence of power reduction on the downlink: apply the reduced power to the cell's RXLEV in order to not rate the current cell as weaker than it actually is. Related: SYS#5339 Change-Id: Ifcf59964b5e2d550d79e4ba14d90962808f79dae
2021-06-04Make interference measurement parameters configurableVadim Yanitskiy8-5/+139
According to 3GPP TS 45.008, the BSS shall monitor the levels of interference on its IDLE traffic channels. The actual measurements are performed in the BTS and then reported to the BSC over the A-bis/RSL link(s) in RF RESource INDication messages. 3GPP TS 45.008 defines the following measurement parameters: * Intave: Interference Averaging period (see table A.1), * Interference level Boundaries (see table A.1). Both parameters are sent to the BTS over the A-bis/OML, and can now be configured via the VTY interface. Only those BTS models which 'speak' the OML protocol defined in 3GPP TS 52.021 will actually get the configured parameters, others will keep using the hard-coded parameters. Change-Id: I99ebf57aac1f3ca7e0497c3b4f6b0738c6ed7e47 Related: SYS#5313, OS#1866
2021-06-04bts_uptime(): do not spam logs with 'OML link uptime unavailable'Vadim Yanitskiy1-3/+1
This message periodically appears in the logs with subsys=DNM and level=INFO for every disconnected BTS. I find this message useless and even annoying, so I propose to remove it in this patch. Change-Id: I7e2498cc61d311ca08585b2f1c49de021b17a5a1
2021-06-04VTY: fix NULL-pointer dereference in lchan_act_single()Vadim Yanitskiy1-0/+4
Without this guard, a command like this can crash osmo-bsc: OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 activate fr when timeslot 0 is configured as non-combined 'CCCH'. Change-Id: I0197a6a2595ff9dade58e37383d44d2df3b03288 CLoses: OS#5170
2021-06-04Use new stat item/ctr getter APIsPau Espin Pedrol19-181/+179
Generated with following and similar spatch snippets: """ @@ expression E1, E2; @@ - &E2->ctr[E1] + rate_ctr_group_get_ctr(E2, E1) """ Change-Id: I0b43f922a595d694ac0aeda80107ef9bf4e755e7
2021-06-04drop unused func decl gsm_lchan_as_pchan2chan_nr()Neels Hofmeyr1-2/+0
Change-Id: I1c14e72d4387767349723ec8948149841b45d85a
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 12:59:59 +0000