diff options
| author | Jeremy Rocher <jeremy.rocher@qorvo.com> | 2022-02-18 16:41:47 +0100 |
|---|---|---|
| committer | Victor Liu <victorliu@google.com> | 2022-02-18 11:17:41 -0800 |
| commit | fa97645125d84428dbe34e4d7a8315820caa614e (patch) | |
| tree | 6dcf5f4765429db396a12b73e8bac834dc3905c7 | |
| parent | fa9994eaec17937354e8dc2570544da8a539ba84 (diff) | |
| download | uwb-fa97645125d84428dbe34e4d7a8315820caa614e.tar.gz | |
Qorvo UWB Mobile stack kernel release 2022_02_18
- Change NFCC watchdog from 200 ms to 2400 ms
- Ensure consistency between pib and llhw channel info
Bug: 220173516
Signed-off-by: Jeremy Rocher <jeremy.rocher@qorvo.com>
Change-Id: Ia5aa533182f359a9d967d2bb309cfbb75780580c
| -rw-r--r-- | kernel/drivers/net/ieee802154/dw3000_nfcc_coex_mcps.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/net/ieee802154/dw3000_spi.c | 2 | ||||
| -rw-r--r-- | mac/ops.c | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/kernel/drivers/net/ieee802154/dw3000_nfcc_coex_mcps.c b/kernel/drivers/net/ieee802154/dw3000_nfcc_coex_mcps.c index 99779be..6e759ed 100644 --- a/kernel/drivers/net/ieee802154/dw3000_nfcc_coex_mcps.c +++ b/kernel/drivers/net/ieee802154/dw3000_nfcc_coex_mcps.c @@ -28,7 +28,7 @@ #include "dw3000_trc.h" #include "dw3000_core.h" -#define DW3000_NFCC_COEX_WATCHDOG_DEFAULT_DURATION_MS 200 +#define DW3000_NFCC_COEX_WATCHDOG_DEFAULT_DURATION_MS 24000 /** * dw3000_nfcc_coex_handle_access() - handle access to provide to NFCC. diff --git a/kernel/drivers/net/ieee802154/dw3000_spi.c b/kernel/drivers/net/ieee802154/dw3000_spi.c index e64d0a4..561d55a 100644 --- a/kernel/drivers/net/ieee802154/dw3000_spi.c +++ b/kernel/drivers/net/ieee802154/dw3000_spi.c @@ -116,7 +116,7 @@ static int dw3000_spi_probe(struct spi_device *spi) hrtimer_init(&dw->idle_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); dw->idle_timer.function = dw3000_idle_timeout; - dev_info(dw->dev, "Loading driver...11_02_2022"); + dev_info(dw->dev, "Loading driver...2022_02_18"); dw3000_sysfs_init(dw); /* Setup SPI parameters */ @@ -37,6 +37,11 @@ static int mcps802154_start(struct ieee802154_hw *hw) WARN_ON(local->started); mutex_lock(&local->fsm_lock); + local->pib.phy_current_channel.page = local->hw->phy->current_page; + local->pib.phy_current_channel.channel = + local->hw->phy->current_channel; + local->pib.phy_current_channel.preamble_code = + local->llhw.current_preamble_code; r = llhw_set_channel(local, local->pib.phy_current_channel.page, local->pib.phy_current_channel.channel, local->pib.phy_current_channel.preamble_code); |