Commit Graph
1605 Commits
Author SHA1 Message Date
Louis Adrien Dufrene 0e6431a7b9 Moved code for HARQ process from PHY layer to MAC layer 2019-04-18 11:51:20 +02:00
Louis Adrien Dufrene 5ae494e974 merge from develop 2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene 36cd05bcba Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR when dci0 is ongoing. 2019-04-16 08:22:54 +02:00
Louis Adrien Dufrene d7cddc2825 Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate 2019-04-15 10:57:39 +02:00
Cedric Roux 9ea7073c68 Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2019-04-15 10:50:38 +02:00
Louis Adrien Dufrene 4c931888e6 Add dci0_ongoing_timer. Commit to build and test. 2019-04-15 08:54:00 +02:00
Rohit Gupta a05255d246 increased size of maximum SI allocation (to mcs 9 with 3 PRBs) Fixes issues with SI message using eMTC information elementswq 2019-04-13 01:12:33 +02:00
Louis Adrien Dufrene 46b0a9fb38 Remove bypass_cdrx variable and add cdrx_waiting_ack. The CDRX is now activated at RRC COnnection Reconfiguration Complete reception. To Test 2019-04-11 07:36:05 +02:00
Louis Adrien Dufrene 3406634b6b This is version 1.0. To test. Cleanup of phy_procedures_lte_eNb.c eNB_scheduler_dlsch.c eNB_scheduler_ulsch.c pre_processor.c and asn1_msg.c 2019-04-10 08:48:37 +02:00
Raphael Defosseux 064d7fd917 CI: fixing the build report and a few warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-08 11:54:03 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene 7817358197 Cleanup of enb_config.c config.c asn1_msg.c asn1_msg.h 2019-04-05 11:56:29 +02:00
Louis Adrien Dufrene 8359b9684e Cleanup of mac.h and mac_proto.h 2019-04-05 08:28:23 +02:00
Louis Adrien Dufrene ca11800087 Cleanup of eNB_scheduler.c 2019-04-05 08:14:27 +02:00
Stefan Schaffelder 42e0929a0c apply last diff from ssr to local orange_cdrx branch. Remove SSR comments 2019-04-04 10:15:38 +02:00
Louis Adrien Dufrene 81f04d2982 Apply diff between ssr (CDRX) branch and develop 2019-04-04 08:17:26 +02:00
Cedric Roux a5a1690394 bugfixes for UL scheduling
- size of PUCCH has been fixed to:
    - 2 RBs for N_RB_UL = 25 (1 RB at top of resource grid, 1 RB at bottom)
    - 4 RBs for N_RB_UL = 50
    - 6 RBs for N_RB_UL = 100
  this is arbitrary and will need some rework at some point.
  This may be also wrong. PUCCH size actually depends on DL traffic
  (if the ack/nack is not done in PUSCH) and scheduling request
  configurations.
- add sched_frame %= 1024 at one needed place
- reserve RBs for retransmission
  this was not done so new transmissions were scheduled in the same
  RBs. Since the code works with the notion of 'first_rb' only, it
  was decided to skip all RBs lower than those retransmitted. This
  works but is not correct (imagine we have to retransmit RB 23, then
  all RBs < 23 will not be used for new transmission). The work to
  fix this properly is complex, a lot has to change, so let's do it
  this simple way for now.
- sort_ue_ul was not correct
  - add the function maxround_ul to use the correct 'round' (the one
    from DL was used, which is totally wrong)
  - be sure to use the correct frame/subframe to get the correct HARQ pid
2019-03-30 15:19:27 +01:00
Cedric Roux 0e38852b05 bugfix: access correctly round_UL 2019-03-30 15:18:18 +01:00
Cedric Roux 26118ed860 bugfix: fix cqi_req usage in UL scheduler
For retransmission, let's use cqi_req used for the 1st transmission.

Maybe incorrect, should check the specs. (In the worst case, we
simply won't decode this transmission at all. No big deal.)
2019-03-30 15:18:18 +01:00
Cedric Roux 9565544e3f bugfix: test free RBs and CCE allocation feasible only for new transmissions 2019-03-30 15:18:18 +01:00
Cedric Roux 04c24ff698 minor cleanup 2019-03-30 15:13:37 +01:00
Cedric Roux daee800e3e bugfix: keep frame in [0..1023] 2019-03-30 15:13:37 +01:00
Cedric Roux 35a38fbee8 bugfix: fix T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION parameters 2019-03-30 15:13:37 +01:00
Raphael Defosseux 551319ef87 Fix segmentation fault. The si_Periodicity value was taking very lage values.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-26 13:52:53 +01:00
Robert Schmidt 024007716a Check type of node using NODE_IS_CU/DU/MONOLITHIC macros 2019-03-26 13:15:02 +01:00
Robert Schmidt c1f142cc44 Fix warnings: space between literal and identifier in macro
This resolves the following warning:
"error: invalid suffix on literal; C++11 requires a space between literal and
identifier"
Since this file might be included from a C++11 file. It only adds spaces.
2019-03-23 17:32:28 +01:00
Robert Schmidt 10a5e5fd75 Use OAI NUM_ENB/UE defines for F1U (removes warnings) 2019-03-23 16:57:26 +01:00
Cedric Roux b7155f0276 cleanup: remove a file that should not be here 2019-03-21 10:49:32 +01:00
Robert Schmidt 9fd0f9f8bf Re-comment Assert for unconfigured RLC as in current develop 2019-03-19 15:48:00 +01:00
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Raphael Defosseux 2fcd4fcec1 Fixing error in LTE-M MAC scheduling 2019-03-18 11:40:38 +01:00
Robert Schmidt 62d9b8cf36 Merge branch 'develop' into feature-127-protocol-split 2019-03-14 13:10:21 +01:00
Raphael Defosseux d8e16e37a5 Merge remote-tracking branch 'origin/develop' into eMTC-testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 14:17:24 +01:00
Raphael Defosseux cd5e140eb7 Fixes for FDD attachment
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 12:07:17 +01:00
Raphael Defosseux 95569173d5 Merge remote-tracking branch 'origin/issue407_nos1_siml1_datapath' into develop_integration_2019_w10 2019-03-11 10:37:42 +01:00
frtabu 753c2f446d apply astyle, fix compilation warnings in raw aeth transport and kernel modules 2019-03-10 00:04:12 +01:00
Robert Schmidt 20c35748ca Fix lte-uesoftmodem: segfaults & logic errors
* prevent segfault: guard access to RC.rrc with UETARGET
* in rlc_data_ind(): correct logic to test for all cases eNB, CU, DU, UE
2019-03-08 16:52:34 +01:00
frtabu c9dcaa53af noS1 woking with tun interfaces and basic simu 2019-03-08 16:00:09 +01:00
Robert Schmidt ede37e56b8 Use correct RNTI for RRC data req 2019-03-07 12:46:34 +01:00
Robert Schmidt 66d4c4e92d Fix cppcheck issues in PROTO_AGENT 2019-03-06 13:43:09 +01:00
Robert Schmidt 56af9c60e4 Fix compilation/linking errors in lte-uesoftmodem 2019-03-05 18:47:29 +01:00
Konstantinos Alexandris f76f1f1e1c x2: bugfix: pass correct rach resource type 2019-03-05 14:56:42 +01:00
Robert Schmidt f9c4c501e3 Merge branch 'develop' into feature-127-protocol-split 2019-03-05 14:17:38 +01:00
nepes 40cb79e44f Merge remote-tracking branch 'origin/develop' into eMTC-testing 2019-03-02 22:41:48 +01:00
nepes 1d2ee01b6c removal of logs 2019-02-28 18:28:35 +01:00
Raphael Defosseux 0f11865fa4 Merge remote-tracking branch 'origin/issue-404-pdcp-integrity' into develop_integration_2019_w09
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-02-28 14:37:10 +01:00
Cedric Roux e3782b5ca2 bugfix: fix PDCP sequence management (plus some cleanup)
With the introduction of X2AP into develop, the UEs now have to regularly
send measurement reports.

In the logs of the eNB, we see:

[OSA]   Mismatch found in integrity for algorithm 2,
        got e0.a0.c2.66, expecting a5.9c.cb.57
[PDCP]   [OSA][RB 1] eNB failed to validate MAC-I of incoming PDU

This is a bug in the PDCP layer that uses wrong parameters to compute the
integrity.

This commit fixes this bug.

The function pdcp_is_rx_seq_number_valid was removed. Its processing
has been directly integrated into the function pdcp_data_ind.

The function pdcp_mark_current_pdu_as_received is not called anymore.
Its processing was not used later on, so as of today, not calling it does
not introduce any functional change.

The function pdcp_validate_security takes now as parameters both
SN and HFN. Same for the function pdcp_get_next_count_rx.

Useless constants PDCP_SN_5BIT, PDCP_SN_7BIT and PDCP_SN_12BIT have been
removed.

The compilation option ENABLE_SECURITY has been removed. It's now always
on. (This may impact some use cases.)

The PDCP for DRB using RLC AM is not correct. It was not correct before
this commit (apart from the integrity bug). We should deal with a list
of PDUs and transmit packets to upper layers as detailed in the specs.
Today we transmit the PDU as soon as we get it. We don't care about
duplicates, in-order delivery, timeouts.

Also, we don't deal with "PDCP re-establishment". Not sure how that impacts
the software.

And, last but not least, there is still no ROHC.
2019-02-27 12:33:04 +01:00
frtabu 43f827351f Fix basic-simulator (pdcp.c) 2019-02-26 16:49:55 +01:00
OAI-admin c22f10aa72 Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling 2019-02-26 12:44:59 +01:00
Louis Adrien Dufrene 9b9ef32a20 Fix RRC version variable to allow dlsch scheduling for eMTC 2019-02-26 11:04:55 +01:00