summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-26Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2android-s-qpr3-beta-3_r0.5android-s-qpr3-beta-2_r0.5android-s-qpr3-beta-1_r0.6android-s-qpr3-beta-1_r0.5android-12.1.0_r0.40android-12.1.0_r0.35android-12.1.0_r0.28android-gs-raviole-5.10-s-qpr3-beta-3android-gs-raviole-5.10-s-qpr3-beta-2android-gs-raviole-5.10-android12-qpr3android-gs-bluejay-5.10-android12L-d2PixelBot AutoMerger
SBMerger: 410055097 Change-Id: I052d9573ac8ae5995792cff6e9e78759f9f2fd4b Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-12-22dw3000: rework stm locking strategyClément Viel
Use wait_event_lock_irq to make the wait uninterrutpible. This needed to use another lock than waitqueue's one. Bug: 199454999 Change-Id: Id1b51ead3b8fb9d72899699f8c35136d7cbf34c7 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-12-20CCC Deep sleep can now be controlled by the UWB-claibration.conf parameter.android-s-v2-beta-3_r0.6android-12.1.0_r0.6android-12.1.0_r0.22android-12.1.0_r0.16android-gs-raviole-5.10-s-v2-beta-3android-gs-raviole-5.10-android12LThierry Carré
Aligning its behaviour with Fira. Bug: 205787340 Change-Id: Id5b62c16c2b4d3dea1cdf557472c114be886645e Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-12-13Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2Roger Liao
Bug: 199698959 Change-Id: I46854cdb8915a66a24c01c9529abddb82951696a Signed-off-by: Roger Liao <rogerliao@google.com>
2021-12-09dw3000: rework stm locking strategyClément Viel
Use wait_event_lock_irq to make the wait uninterrutpible. This needed to use another lock than waitqueue's one. Bug: 199454999 Change-Id: Id1b51ead3b8fb9d72899699f8c35136d7cbf34c7 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-11-30mac: ensure consistency between pib and llhw channel infoClément Viel
BUG: 208180285 Change-Id: Ifbcc44c213b38dddbe7b21ac83d3460ac6360e3b Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-11-30dw3000: ensure supported channels correctly updatedDavid Girault
Since antenna configuration may be (is) not known at time of update of restricted_channels calibration value, it must be checked AFTER supported channel is updated. BUG: 205787340 Change-Id: Iffe3bf9e0d3d9d18163539dd7063697763d77518 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-11-25Merge "Merge android12-gs-pixel-5.10-sc-qpr2 into ↵Roger Liao
android12-gs-pixel-5.10-sc-v2" into android12-gs-pixel-5.10-sc-v2
2021-11-24Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2PixelBot AutoMerger
Bug: 199698959 SBMerger: 410055097 Change-Id: I39778353d7682f2b75c8398b9a7ef7f3a558f91b Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-11-23Revert "dw3000_stm: uninterruptedly wait for pending_work to complete"Fred Chiou
This reverts commit 0ea8be1ed473db3a0fe5dab4ed11d13ea8fd63ee. Reason for revert: 100% deadlock if receive signal during wait Bug: 205397250 Change-Id: If14f51b68714f554742ec1e94c095cb3382e3659
2021-11-18ccc: integrate nfcc v2Thierry Carré
- update time descriptor where t_start and t_end are now expressed in uus unit. - new t_start_uus and t_end_uus will enhance handling UWBtime0 - modify the cooperation interface AP/NFCC in TLV messages in order to support bigger RAN multiplier values ( for the biggest value RAN multiplier = 255, we will have 1 ranging every 24sec) BUG: 205787340 Change-Id: Ibeba03ccfbeb15ca8b772f738850de3b1c48b14d Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-11-18Add Block Striding supportSaad Zouiten
Calculate next ranging block based on the following formula : current_block + stride_len _+1 Take hopping into account when computing the next ranging block. Change the calculation of max_rr_retry when striding is used Add striding flag in capabilities for users-ace applications Add new debug traces. BUG: 198606126 Change-Id: I0c7625178b5416aa592fe55ea0154430c54f46d1 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-11-11Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2Roger Liao
Change-Id: Ia366d0a8d4e2744634275bbefa9023afc1f4e53e Signed-off-by: Roger Liao <rogerliao@google.com>
2021-11-11Merge android12-gs-pixel-5.10-sc-qpr1 into android12-gs-pixel-5.10-sc-qpr2Roger Liao
Change-Id: I01cc5adcf578c5d210aa0f6a7368899b2e59585e Signed-off-by: Roger Liao <rogerliao@google.com>
2021-11-10Revert "dw3000_stm: uninterruptedly wait for pending_work to complete"Victor Liu
This reverts commit 57015c2904c9853fbf89b7b2ecb6889a934d9cd4. Reason for revert: b/205397250 regression from this change. Change-Id: I7f6166bdda68f5aa2d0a6407f7e47651b98faba9
2021-11-10Revert "dw3000_stm: uninterruptedly wait for pending_work to complete"android-12.0.0_r0.42android-12.0.0_r0.36android-12.0.0_r0.26android-gs-raviole-5.10-android12-qpr1-dJonglin Lee
This reverts commit 558a7ed1bf3c14ba0f01b91d04a1bac51ab9c97e. Reason for revert: 100% deadlock if receive signal during wait Bug: 205397250 Change-Id: I985a84699732c3221ff842ab5f90dda3cb82bf39 Signed-off-by: Jonglin Lee <jonglin@google.com>
2021-11-02dw3000_stm: uninterruptedly wait for pending_work to completeWoody Lin
Data assigned to stm->generic_work can be a local variable (e.g.: dw3000_state_start) that discarded after function returns, and in this case, dw3000_event_thread will get an invalid generic_work that causes data abort. To fix it, repeats the wait_event_interruptible_locked_irq until the event condition meets, that is, ignore the signal interrupting case. Bug: 199454999 Change-Id: I1a244e2e50c14de2c471f0e0f696c8b403881fcb (cherry picked from commit 0ea8be1ed473db3a0fe5dab4ed11d13ea8fd63ee)
2021-11-01dw3000_stm: uninterruptedly wait for pending_work to completeWoody Lin
Data assigned to stm->generic_work can be a local variable (e.g.: dw3000_state_start) that discarded after function returns, and in this case, dw3000_event_thread will get an invalid generic_work that causes data abort. To fix it, repeats the wait_event_interruptible_locked_irq until the event condition meets, that is, ignore the signal interrupting case. Bug: 199454999 Change-Id: I1a244e2e50c14de2c471f0e0f696c8b403881fcb (cherry picked from commit 0ea8be1ed473db3a0fe5dab4ed11d13ea8fd63ee)
2021-11-01dw3000: rework deep sleep according dwt driver, refs UWB-1877Romuald Despres
Alignment with dwt driver. Revert the loop for checking the backup because it causes a hw race condition that stuck the chip BUG: 199275459 BUG: 198650370 Change-Id: I50f9e6e565d55ab1a19165d925051e4444711e93 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com> (cherry picked from commit 054af86ad5e1ffb3b8c3ce901d74c0eda9beb897)
2021-10-30dw3000: rework deep sleep according dwt driver, refs UWB-1877Romuald Despres
Alignment with dwt driver. Revert the loop for checking the backup because it causes a hw race condition that stuck the chip BUG: 199275459 BUG: 198650370 Change-Id: I50f9e6e565d55ab1a19165d925051e4444711e93 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-10-28dw3000_stm: uninterruptedly wait for pending_work to completeWoody Lin
Data assigned to stm->generic_work can be a local variable (e.g.: dw3000_state_start) that discarded after function returns, and in this case, dw3000_event_thread will get an invalid generic_work that causes data abort. To fix it, repeats the wait_event_interruptible_locked_irq until the event condition meets, that is, ignore the signal interrupting case. Bug: 199454999 Change-Id: I1a244e2e50c14de2c471f0e0f696c8b403881fcb
2021-09-26Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2PixelBot AutoMerger
SBMerger: 379283923 Change-Id: I9cbcdaa3c318f75b06b397055ffd170750e5fc06 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-09-26Merge android12-gs-pixel-5.10-sc-qpr1 into android12-gs-pixel-5.10-sc-qpr2PixelBot AutoMerger
SBMerger: 379283923 Change-Id: Ia8b4ade724ed386332e8d5579128428991c81ae1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-09-24dw3000: increase the wifi coex margin from 300ms to 500ms to avoid ↵Clement Viel
interferences. Bug: 171489641 Signed-off-by: Clement Viel <clement.viel@qorvo.com> Change-Id: I7f8179b99d058a67e180a2d6e13df7965c693397
2021-09-21Uwb stack feature complete for MCTTJean-Michel RIOT
mac/fira: update mac with QSWG fixes Improve: - sts index and hopping calculation - UCI max measurements testing - Controlee behaviour, don't keep Rx on all time after sy dw3000: fix CFO adjust in rx_get_frame(), closes UWB-1878 mac/fira: coding style dw3000: change default xtal trim to 0x1f This value is measured on multiple E0 samples, it's a mean value to have a maximum CFO of 8 ppm mac/fira: add 2us margin on tx frames after rcm mac/fira: use a helper to set the ranging info status mac: add slot_index to identify faulty status BUG: 194303361 Change-Id: I463b341fc4ac617593358d8f64f90f4b5753a3d1 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-09-21dw3000: add rx event counters tracesClement Viel
dw3000_get_counters_first_part and dw3000_get_counters_second_part activates counters for rx events. Bug: 194303455 Signed-off-by: Clement Viel <clement.viel@qorvo.com> Change-Id: I908cf02ec06d545f009f979dac78f868c5d51969
2021-09-20dw3000: override SP0 rx antennaClement Viel
To activate "insmod dw3000.ko sp0_rx_antenna=-1" Bug: 197922222 Signed-off-by: Clement Viel <clement.viel@qorvo.com> Change-Id: I3d68c8086493f5e459351ef6ff902ef60150a5cc
2021-09-20Revert "UWB: pdoa snapping fix - new feature"Victor Liu
This reverts commit 9b4d2c16be040ce1529bac9cd5df1a3aa972352b. Bug: 198208484 Change-Id: I36d9ada165563177bba89b437142fe84126cdf98
2021-09-19Merge android12-gs-pixel-5.10-sc-qpr2 into android12-gs-pixel-5.10-sc-v2PixelBot AutoMerger
SBMerger: 379283923 Change-Id: I9f372a223b7e217bcecfcbdf1c3ac70ed80a2d90 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-09-15kernel/drivers/net: implement preamble code interface change, refs UWB-1125David Girault
mac/fira: use channel and preamble code from session parameters, refs UWB-1125 - If specified, use the channel and preamble code from the session parameters, else use the current PIB parameters. - FiRa interface change: - Now channel and preamble code session parameters are used to setup the radio, they were previously only used for crypto. - Also if not set, the real values are taken from the current driver setting. Previously, they have to be set manually or else 0 was used, which was not valid. mac: allow setting channel parameters for multiple frame accesses, refs UWB-1125 - When a specific channel (page, channel and preamble code) is requested for an access, set it at access start and restore channel after the access. - LLHW interface change: - UWB drivers should set llhw->current_preamble_code before registration to the default preamble code index for this device. - MCPS no longer calls set_channel with a zero preamble code, it uses the value set in llhw->current_preamble_code. - MCPS can now call set_channel when the device is started. In this case, the new channel parameters should be set so that they are used for the following transmissions and receptions. Special care should be taken by the driver to avoid any significant clock discontinuity. - When only preamble code is changed, the driver can be optimized to avoid costly operations done on channel change. dw3000: update set_channel() callback, refs UWB-1880 - Ensure only pcode is changed if channel stay the same - Support reconfigure during wakeup - Move calib update in dw3000_configure_chan_ctrl() BUG: 196395783 Change-Id: Ic5664cf64c15df6d4f2e6abd03042f682ab01f00 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-09-13Merge android12-gs-pixel-5.10-sc-qpr2 into -sc-v2Petri Gynther
Signed-off-by: Petri Gynther <pgynther@google.com> Change-Id: I26caf6e5870313e2c7ac32d648bc04f749581b4c
2021-08-31dw3000 : change PLL calibration routineClément Viel
- clear PLL lock bit when configuring rf - disable Pre-buffer-enable for Ch9 PLL calibration for E0 - Clear ICAS, RCAS and CH5_CAL_PREBUF bits in PLL_CAL_ID register Bug: 196842697 Change-Id: I3e42b5c36feec29c8fdbbc5c128155fb7b1d9915 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-08-29Merge android12-gs-pixel-5.10-sc-qpr1 into android12-gs-pixel-5.10-sc-v2PixelBot AutoMerger
SBMerger: 379283923 Change-Id: Id97d783393f6a8326c7f2cd535d819accb55f636 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-08-27dw3000: use wifi coex gpio 4 and increase wifi coex margin to 400usSaad Zouiten
Bug: 171489641 Change-Id: Id17b68a64d01307341b1ce2356568301bfb454c8 Signed-off-by: Jonathan Diguet <jonathan.diguet@qorvo.com>
2021-08-26Improve Fira frame duration calculationJohann Cahier
dw3000: improve frame duration calculation dw3000: re-enable with_shr in smart power calculation dw3000: disable sts for conttx Bug: 189155078 Change-Id: Ia0ddaabdab59ef2a5d34c98cfcfba5731f551de8 Signed-off-by: Jonathan Diguet <jonathan.diguet@qorvo.com>
2021-08-26dw3000: add runtime modification of pgdelayJerome Grard
BUG: 194510102 Change-Id: Ib078d9097a6edf7b5212f12b8e5d4b44543c9ea9 Signed-off-by: Mathieu Perrier <mathieu.perrier@qorvo.com>
2021-08-19dw3000: backport fixes on smart power calculation, refs UWB-1729Johann Cahier
BUG: 189155078 Change-Id: Iae908ca2308f5e719b88a2515e4e943e98505578 Signed-off-by: Mathieu Perrier <mathieu.perrier@qorvo.com>
2021-08-19mac/fira: add rx margin to controlees access, refs UWB-1559Martin Frétigné
BUG: 194543247 Change-Id: Ic640feb9f6d2d70b119366ceeebcc18c430c5bfd Signed-off-by: Mathieu Perrier <mathieu.perrier@qorvo.com>
2021-08-19Avoid synchronizing the clock in the middle of a blockSaad Zouiten
BUG: 196974358 Change-Id: I3ecb5a188879d2a66af4374fb8c014079871a026 Signed-off-by: Mathieu Perrier <mathieu.perrier@qorvo.com>
2021-08-19dw3000_core: fix dw3000_force_clocks.Philippe Skowronski
This fixes the wpan-testmode error BUG: 194941105 Change-Id: I4e85f70ab0086aae5848bb8c8c3d0f591ac5a9f0 Signed-off-by: Mathieu Perrier <mathieu.perrier@qorvo.com>
2021-08-17UWB: pdoa snapping fix - new featureClement Viel
contains the following 5403bebe: dw3000: update xtal_trim in controlee if needed, closes UWB-1653 8d574d79: dw3000: Add DW3000_CFO_THRESHOLD define, refs UWB-1653 ea7eee91: dw3000: oscillate XTAL trim if controller, closes UWB-1654 564eb550: dw3000: change dw3000_prog_xtrim to include xtal_bias, refs UWB-1654 b00f265d: dw3000: take care of CFO when returning PDoA FOM, refs UWB-1652 248bfa89: dw3000: add dw3000_read_clockoffset() function, refs UWB-1652 644c9568: dw3000: move and fix header of dw3000_read_all_sys_status() 96556dae: mac/fira: use new RANGING_ROUND flags to inform driver, refs UWB-1651 4585486e: mac/simple_ranging: use new RANGING_ROUND flags to inform driver, refs UWB-1651 f942bc96: mac: add MCPS802154_(TX_FRAME|RX_INFO)_RANGING_ROUND flags, refs UWB-1651 BUG: 191704701 Change-Id: I2962a276fc8068389ca37286875bf624c847ee9c Signed-off-by: Mathieu Perrier <mathieu.perrier@qorvo.com>
2021-08-15Merge android12-gs-pixel-5.10-sc-qpr1 into android-gs-pixel-5.10PixelBot AutoMerger
SBMerger: 379283923 Change-Id: I8e35d7842bc73fe899cbf99214a99e254b6c6fdd Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-08-14Revert "mac: fix timing issues for MCTT / new feature"Philippe Skowronski
This reverts commit c9e3334cabf922eab40888bbd0ed522841c5d621. BUG: 192387172 Change-Id: I5348240ed10cbc0b112ff5301e7be1776f1a8f37 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-08-13dw3000: fix the limit of DW3000_RSSI_REPORTS_MAX rssi reports, refs UWB-1713 ↵Yvan Roch
b/194303455 BUG: 194303455 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com> Change-Id: I8822531adb19e250489e69d2419ced23a392a0ed
2021-08-13[Regulatory] Test setup instructions b/194941105Romuald Despres
dw3000: add continuous TX testmode a451db482c94eb0e3dc995bc1b13405ef3ed15ca dw3000: add calibration key for phrMode a4c73d0bcf4ee0677b574b01983e85fd88a29b74 dw3000: fix channel 9 on D0, closes UWB-1685 01fab899e7e797a52789084013e2f8080673aef4 BUG: 194941105 Change-Id: I235f20d6cb1966a1097a5a1d1411dba15ee4f791 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-08-12Fira access controlee rx frame: add MCPS802154_RX_INFO_TIMESTAMP_DTU flags ↵Philippe Skowronski
b/192407649 Add MCPS802154_RX_INFO_TIMESTAMP_DTU flag to handle timestamp_dtu field. BUG: 192407649 Change-Id: I4888b8674b83f47d7b56c78c5369e69f53b38753 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-08-12dw3000_stm: increase dw3000 worker thread priority b/171489641 b/194543247.Philippe Skowronski
Increase dw3000 worker thread priority to MAX_USER_RT_PRIO minus one (maximum priority for the real-time policies). Increase dw3000 worker thread sched_util_min attr to SCHED_CAPACITY_SCALE to increase CPU freg. To be improved later. BUG: 171489641 BUG: 194543247 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com> Change-Id: Ib7d7964e8b6bb65c7803b01b8303809c96333a04
2021-08-12mac/fira_access.c return is missingJean-Michel RIOT
BUG: 192387172 Change-Id: Ib2778b3706cee0025f3ae292befec57b39616363 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>
2021-08-12Revert "mac: do not propagate ARFE error upper than fproc layer b/192407649."Jean-Michel RIOT
This reverts commit 1b05dccf71ec88c68748789b037eb3c01c724201. BUG: 192407649 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com> Change-Id: Ib2e141d65fdcc215792e455d11a73fa38b55f5cf
2021-08-12Revert dw3000: change XTAL_TRIM default value b-194303361Jean-Michel RIOT
BUG: 194303361 Change-Id: Ide16b5554dc0a80d5d9e3820e4e41cdc27615c64 Signed-off-by: Jean-Michel RIOT <jean-michel.riot@qorvo.com>