aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2023-06-12Remove unused GPRS_RLCMAC_FLAG_TO_MASKpespin/t3193Pau Espin Pedrol3-11/+6
We are no longer making use of the 4 high bits in state_flags, so we can safely drop masking them. Change-Id: I1402310919578a09669530786296f34bf3b23ef2
2023-06-12Abort UL TBF PACCH Ass based on T3168Pau Espin Pedrol6-31/+83
It makes no sense to continue trying to assign the UL TBF over PACCH after T3168 * 4 retrans time out. This helps in releasing the TBF after we got rid of incorrect use of N3015 in UL TBFs. While at it, update tbf_ul_fsm to use T3168 instead of X2001, since it really needs to match T3168. Ideally it would not even have a timer itself and receive an event from tbf_ul_ass_fsm, but that's left as a TODO (it was already before) and simply the timer is updated. Change-Id: I87dff68dedd06b60501e7586d20faf02bb1f0c93
2023-06-11tbf_ul_fsm: Remove 3195 references, simplify T3169 set up as consequencePau Espin Pedrol3-24/+7
T3195 is triggered as consequence of N3105 reaching MAX, which only occurs in DL TBFs. Hence, T3195 also only applies to DL TBFs. The references to T3195 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I07a43c13289d50707115187a3f22df21443a7b4a
2023-06-09tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequencePau Espin Pedrol2-24/+4
T3169 is triggered as consequence of N3101 and N3103 reaching MAX. Those counters are related to UL TBF only, and hence T3169 also only applies to UL TBFs. The references to T3169 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I02f7654518da617ce6704d807d34761dbadecf07
2023-06-09Avoid using N3105 in UL TBFsPau Espin Pedrol4-42/+15
This counter is only used in DL TBFs as per TS 44.060. section 13.4 "N3105": "When the network after sending a RRBP field in the _downlink RLC data block_ ..." (DL data blocks are only sent in DL TBFs). section 8.1.2.1: "If N3105 = N3105max, the network shall release the downlink TBF internally and start timer T3195 for that TBF. When T3195 expires, the network may reuse the TFI" Change-Id: I4d4f4d4d3e6e0539ea8ec2395bed00d059b84e04
2023-06-09Avoid using N3103 in DL TBFsPau Espin Pedrol1-0/+4
N3103 counts retransmits of PACKET UPLINK ACK/NACK with FinalACK=1. As a consequence, this counter only applies to UL TBFs. Current code is only using it in UL TBF, but add an assert to clarify and make sure it is not used unproperly in the future. Change-Id: I026d6145249ef19694f673ec7b4928af9d401dd6
2023-06-09Avoid using N3101 in DL TBFsPau Espin Pedrol2-21/+10
TS 44.060 13.4 "N3101" clearly states this counter relates to UL TBFs, since it only applies to TBFs for which USFs are set: "When the network after setting USF for a given TBF, receives a valid data block of this TBF from the mobile station in a block assigned for this USF, it will reset counter N3101. If PS Handover is not ongoing, the network will increment counter N3101 for each USF for which no data is received for this TBF." Furthermore, N3101 must only be reset for data blocks, so drop all rx CTRL block patches on UL TBF resetting the counter. Change-Id: I207f3906d13fc6feea2282e261f468a09db37d86
2023-06-09tbf_{ul,dl}_fsm: remove impossible dst state transitionsPau Espin Pedrol2-6/+3
There's no code path triggering change to those states. Change-Id: I05b3019e12ec37e11ac2561a94b2eacec8718755
2023-06-09tbf_{ul,dl}_fsm: Remove unneeded assertsPau Espin Pedrol2-6/+0
Those are leftovers from the time where we had a single tbf_fsm for both UL and DL TBF. Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea
2023-06-09tbf_dl_fsm: Apply T3193 using FSM infrastructure instead of manuallyPau Espin Pedrol2-40/+7
Change-Id: Ic2a9d4b3c812c1533b2b7f97f27799b28b636c21
2023-06-06Log MS information in error message using usual MS APIPau Espin Pedrol1-10/+3
Also, drop duplicated TRX+TS info which is already displayed as part of LOGPDCH. Change-Id: I66211f4fa8a139ddd109623d90a926a53f180cfd
2023-06-03Document pcu_lsb() functionPau Espin Pedrol3-3/+6
While at it, fix a typo in the test output. This function is nowadays only used in ms_current_pacch_slots(), which is used only to print the PACCH TS (the first common UL & DL TS). Change-Id: Id1d0b681f6866618f9f3a8c64d6a6c809ca50ea7
2023-06-03pcu_utils.h: Replace software based bitcount impl with gcc builtinPau Espin Pedrol1-9/+2
The cast for different types it's not really needed, simply use the unsigned long long version to make sure we don't drop 1s, in any case __builtin_popcountll() will be quicker than what we used to have. Change-Id: I80ae72d34d53564fc3da1601ee48c8b2ffe79735
2023-06-02Use OSMO_UNLIKELY() in bts_rfn_to_fn()Pau Espin Pedrol1-1/+1
That case should only happen under really rare conditions, like receiving a RACH.ind before having received any DATA.ind. Change-Id: I4c71f3481764b501a4441bc735a87725884a3e75
2023-06-02Move call to bts_set_current_frame_number() earlier in the code pathPau Espin Pedrol3-51/+21
The FN time counter is not really PDCH specific, but to the whole BTS, and all other calls t the bts_set_current_frame_number() are already laced in pcu_l1_if.cpp; move it there. Change-Id: If36f22a1067c904fa7fda87bed5062b6738f0dd1
2023-06-02Use fn_valid() helper in pcu_rx_time_ind()Pau Espin Pedrol1-3/+1
Change-Id: I5b1f1d4cd621d81fb99b87761a878af242227a10
2023-06-02Derive FN from RFN once and cache it in struct rach_ind_paramsPau Espin Pedrol4-4/+6
Change-Id: Iaefb9650dfc5083360a4a24b9c17fdbf3115e51f
2023-06-02encoding: pass RFN to write_immediate_assignment(_reject)()Pau Espin Pedrol4-31/+31
Those function don't really require the full FN, hence let's pass only the required information. This makes the implementation here less dependent on how/if we are able to calculate full FNs based on RFN: We get an RFN, and we have to encode so that the RFN can be derived again, so feels less cumbersome having to go through RFN->FN->RFN which may only cause possible issues if there's some FN timing bug. 3GPP TS 44.018 10.5.2.30 Request Reference: "The purpose of the Request Reference information element is to provide the random access information used in the channel request and the frame number, FN modulo 42432" 3GPP TS 44.018 10.5.2.38 Starting Time: "The purpose of the Starting Time information element is to provide the start TDMA frame number, FN modulo 42432." Change-Id: If9b758434c00f2a3868534d5be84946809c989a9
2023-05-31bts: use RFN directly to calculate fn416Pau Espin Pedrol1-1/+1
RFN_MODULUS (42432) used to calculate is a multiple of 416: 416 * 102 = 42432 Hence, (X % 42432) % 416 == X % 416. So, there's no need to derive the full FN. Change-Id: If7a6a15c373a068bcc757d27937dd6eeac2e0bae
2023-05-31Error trying to obtain FN from RFN if curr_fn not knownPau Espin Pedrol1-4/+11
This may happen if a RACH.ind is received before any DATA.ind has been received. With usual osmo-bts-trx or osmo-bts-sysmo, this shouldn't happen nowadays, but it is still a problem with osmo-bts-virtual, where lower layers don't submit NOPE.ind in the absence of data, and hence it won't sent DATA.ind to osmo-pcu all the time. This change helps in showcasing confusing scenarios where the RFN generated in the Imm Ass was wrong. Change-Id: I29b7ba828fe890f90e35686bbb04d4abfe56b955
2023-05-31Use always RFN when handling RACH indicationsPau Espin Pedrol5-23/+27
The previous code was really confusing, passing full FNs as RFNs under certain external conditions, and then assuming the RFN input of rfn_to_fn() function could actually be a FN. As a result, we had a lot of code behaving slightly different depending on whether the incomding FN from pcuif was filled in by a BSC or a BTS. Avoid this b ehavior differentiation and always assume the most restricted one, aka RFN. Change-Id: Ib3b5702168195b595711cd0ff32c211b9aba429d
2023-05-31cosmetic: tbf_ul_ack_fsm: Clean up use of ul_tbf and tbf pointersPau Espin Pedrol1-6/+6
Change-Id: I51ebe8174006380821eb978bbd78f600c10b02e7
2023-05-31tbf: Improve TBF name description in logsPau Espin Pedrol7-301855/+301854
Change format to print the state at the end, to resemble more the same format used by FSMs. Furthermore, by moving it at the end, print it only when "enclousure" is requested, aka when not requested by FSM to update its internal name. The consequence of this logc is that log lines printed from FSM don't end up with the same state string printed twice in different places. While at it, shorten the EGPRS/GPRS indicator to one character, which should be understandable enough since it matches what's usually seen in mobile phones to signal one or another. Change-Id: I86b5f042fae77721b22fc026228677bd56768ba9
2023-05-26systemd: depend on networking-online.targetOliver Smith1-0/+2
Related: SYS#6400 Change-Id: Ifbac18a38e086e42c67499b7818cdf08629d0000
2023-05-22gprs_rlcmac: also use PCU_IF_SAPI_PCH_DT for paging MAC blocksPhilipp Maier3-9/+12
In the current code we still send PAGING COMMAND MAC blocks via SAPI PCU_IF_SAPI_PCH, which technically belongs to the older PCUIF version (v.10), which we are going to deprecate soon. Let's change this so that PAGING COMMAND MAC blocks will also be sent through PCU_IF_SAPI_PCH_DT. Since PAGING COMMAND messages require no confirmation by the receiving end we may set the TLLI field to GSM_RESERVED_TMSI. Depends: osmo-bsc.git I82443f2b402aa2416469c8c50b1c050323ef3b8f Related: OS#5927 Change-Id: I99cfe373fa157cfb32b74c113ad9935347653a71
2023-05-18copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbHVadim Yanitskiy3-4/+4
Change-Id: If51895e67271c0913e000ff9d28db8d8fe761201
2023-05-12ctrl: drop deprecated neighbor resolution interfaceMax5-108/+1
Related: OS#5809 Change-Id: Iff008c77ab49dd8855d54d2d44198475086012e4
2023-05-10pcu_l1_if: replace magic numbers with IMSI_DIGITS_FOR_PAGINGPhilipp Maier1-2/+3
we have defined IMSI_DIGITS_FOR_PAGING but some parts of the code still use magic numbers (3), let's replace those as well. Change-Id: I9a1b6ba4578e2a8875d8d1a9e56c36dc2b33fe0d
2023-05-03pcu_l1_if_phy: fix API function namesPhilipp Maier19-35/+35
The functions l1if_open_pdch and l1if_close_pdch have a misleading naming since what they actually do is opening and closing the TRX since they return and accept a context (obj) that is valid for a whole TRX. This also explains why the other functions accept a timeslot as parameter in addition to the context. Let's rename those functions so that it is clear what they do. Related: OS#6022 Change-Id: I395a60b2fba39bac4facec78989bac20f0cef0d3
2023-05-03er_ccu_l1_if: use one ccu_desr per timeslotPhilipp Maier2-25/+46
At the moment only allocate one CCU descriptor and use it as context for the whole TRX. This is fine when running with one PDCH only but as soon as multiple PDCHs are used the CCU descriptor gets messed up. Let's fix this by introducing a TRX descriptor that contains an array of 8 CCU descriptors, one for each timeslot. Related: OS#6022 Change-Id: I09a51f34ce0edef79a797c4686c7b1d27c376e49
2023-04-28cosmetic: ms: fix formatting of function commentPau Espin Pedrol1-1/+2
Change-Id: I717c0ebd6e9af5388e94482842f5638777758b32
2023-04-28ms: Fix unsafe iterating freeing items in listPau Espin Pedrol1-1/+1
Change-Id: I35cba6d617b3356515769405c7d05ba28cd5132b
2023-04-28ms: Mark ms_reset() as staticPau Espin Pedrol1-1/+1
Change-Id: Idc42be62f9911b7e2fad3dade884e72e5c2965f4
2023-04-27debian: set compat level to 10Oliver Smith2-2/+2
Related: OS#5958 Change-Id: Icdb0f4107fa426afb1e7c2bb4a808ea6f9cc46a8
2023-04-26pcu_l1_if: cosmetic: reformat commentPhilipp Maier1-3/+1
Change-Id: Ib4ae65e1bc118572135fbec02e64dbec35f208b4
2023-04-26Move resource allocation outside of tbf allocationPau Espin Pedrol18-1476/+25202
This patch finally decouples TBF allocation from resource allocation. This will allow in the future reserving resources without having to require a TBF object to exist. Change-Id: I2856c946cb62d6e5372a1099b60e5f3456eb8fd4
2023-04-26Move out of alloc_algo code modifying the data modelPau Espin Pedrol11-375/+377
This way the alloc_algo() becomes idempotent, simplifying implementation of new alloc_algos as well as rolling back if allocation fails (for instance because some resource is exhausted at the time). For now the code applying the results is moved to tbf::alloc_algo(), but it will eventually get out of tbf code, so that the MS object is responsible for running it. As a result, there's no even need to create TBF object before trying to allocate resources, which will help furher in rollback operations described above. Change-Id: I5ffd00f5f80bde4b73b78db44896f65e70e12b20
2023-04-21alloc_algo: Move printing outside of update_ms_reserved_slots()Pau Espin Pedrol2-15/+13
Change-Id: I0d8838829c519bb6da8a68d62947b98bab35a39f
2023-04-21alloc_algo: Pass a struct containing all req paramsPau Espin Pedrol7-130/+148
This is a first step towards isolating the allocation algorithm from applying changes on PCU state. In next steps the tbf pointer will be dropped and the allocation algorithm will only result a "result" struct which then the caller can apply to whatever TBF object it requires. Change-Id: Ie4d9ace526ad012d97738bc55bdb5cc1472c632d
2023-04-21vty: Several improvements to 'show ms' output formatPau Espin Pedrol1-14/+14
* Use UL/DL acronyms to decrease output verbosity * Keep more stable MS properties at the top, move link quality changing entries to the bottom putting them together. Change-Id: If9f4c6ba1a4a6f9060222cc04254054ad03d7a96
2023-04-21ms: Log MS active/idle state in 'show ms' VTY commandsPau Espin Pedrol3-0/+15
Change-Id: Ibcd34055c9ae390510c5c3ba26621fd96d2368fd
2023-04-21ms: Rename field timer -> release_timerPau Espin Pedrol3-7/+7
Rename it so that it becomes clear what the timer is used for. Change-Id: Id4738ea196b232858e1ec9cdc439f9b81839058f
2023-04-21ms: Get rid of ms->delay fieldPau Espin Pedrol7-24/+17
Simply apply the content of the configured timer when the MS goes idle. Having that field is convenient to do tricky stuff in unit tests, but makes the main osmo-pcu app more complex for no good enough reason. Change-Id: I8d44318b37b6605afd84db8ccec0d75e6db293b9
2023-04-21meas: Improve logging formattingPau Espin Pedrol1-7/+6
Change-Id: I15d66da3f41a9f14a542b96436d65a0581bbb45a
2023-04-21ms: Increase log level when scheduling release timerPau Espin Pedrol2-1/+2
Change-Id: Ie470b5b0c7b01d91f4ad693e52afd51860d6da2d
2023-04-21Add new log category 'ms'Pau Espin Pedrol7-30/+38
This is useful to track the lifecycle of MS objects. The RLCMAC cateogry used so far in those log messages is too broad. Change-Id: Ib4ce88d0f7309ac77c064a94bb0d667e8dbc33dd
2023-04-21dl_tbf: Set BandWidth timestamps to current time directlyPau Espin Pedrol1-5/+2
Change-Id: I01654534aef5255c6d1c3ba0c553190a0319e8e1
2023-04-21ms: Hold a reference during ms_allocPau Espin Pedrol14-114/+258
Make the caller hold a reference to the MS object just allocated, so that it hs to explicitly unref it and, in turn, if no new references were added during its use, trigger release of the MS object. This is useful to avoid leaking MS object if it was allocated and then no TBF is attached to it because allocation of TBF failed. Related: OS#6002 Change-Id: I2088a7ddd76fe9157b6626ef96ae4315e88779ea
2023-04-21cosmetic: Fix indentation in commentPau Espin Pedrol1-1/+1
Change-Id: I15063346e4ff0367c0bf04f6b48ac62b9bdf2929
2023-04-21tbf: Move enable_egprs() to constructorPau Espin Pedrol5-13/+20
Whether the TBF is GPRS or EGPRS is known at allocation time since it comes from the information known in the MS object used to create it. Hence, no need to delay calling it to later steps such as setup(). So far it was probably left in setup() due to the constrains about requiring the subclass to be constructed (use of window() virtual API). Change-Id: I2e9d2a98c666a930333d52fb6c0463d7593c2615