Skip to content

nrf_wifi: Update RPU patch to rev#c96a720c9e4 #1488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

nrf_wifi: Update RPU patch to rev#c96a720c9e4 #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified nrf_wifi/fw_bins/default/nrf70.bin
View file
Open in desktop
Binary file not shown.
Binary file modified nrf_wifi/fw_bins/radio_test/nrf70.bin
View file
Open in desktop
Binary file not shown.
Binary file modified nrf_wifi/fw_bins/scan_only/nrf70.bin
View file
Open in desktop
Binary file not shown.
Binary file modified nrf_wifi/fw_bins/system_with_raw/nrf70.bin
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions nrf_wifi/fw_if/umac_if/inc/fw/lmac_if_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#define RPU_MEM_LMAC_BOOT_SIG 0xB7000D50
#define RPU_MEM_LMAC_VER 0xB7000D54

#define RPU_MEM_LMAC_PATCH_BIN 0x80044000
#define RPU_MEM_LMAC_PATCH_BIMG 0x8004B400
#define RPU_MEM_LMAC_PATCH_BIN 0x80043A80
#define RPU_MEM_LMAC_PATCH_BIMG 0x8004BC00

#define NRF_WIFI_LMAC_VER(ver) ((ver & 0xFF000000) >> 24)
#define NRF_WIFI_LMAC_VER_MAJ(ver) ((ver & 0x00FF0000) >> 16)
Expand Down
19 changes: 13 additions & 6 deletions nrf_wifi/fw_if/umac_if/src/fmac_api_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,12 +901,6 @@ int nrf_wifi_phy_rf_params_init(struct nrf_wifi_phy_rf_params *prf,
prf->pd_adjust_val.pd_adjt_hb_mid_chan = PD_ADJUST_VAL;
prf->pd_adjust_val.pd_adjt_hb_high_chan = PD_ADJUST_VAL;

/* Configure systematic offset value */
prf->syst_tx_pwr_offset.syst_off_lb_chan = SYSTEM_OFFSET_LB;
prf->syst_tx_pwr_offset.syst_off_hb_low_chan = SYSTEM_OFFSET_HB_CHAN_LOW;
prf->syst_tx_pwr_offset.syst_off_hb_mid_chan = SYSTEM_OFFSET_HB_CHAN_MID;
prf->syst_tx_pwr_offset.syst_off_hb_high_chan = SYSTEM_OFFSET_HB_CHAN_HIGH;

/* RX Gain offsets */
prf->rx_gain_offset.rx_gain_lb_chan = RX_GAIN_OFFSET_LB_CHAN;
prf->rx_gain_offset.rx_gain_hb_low_chan = RX_GAIN_OFFSET_HB_LOW_CHAN;
Expand All @@ -915,6 +909,13 @@ int nrf_wifi_phy_rf_params_init(struct nrf_wifi_phy_rf_params *prf,

if (package_info == CSP_PACKAGE_INFO) {
prf->xo_offset.xo_freq_offset = CSP_XO_VAL;

/* Configure systematic offset value */
prf->syst_tx_pwr_offset.syst_off_lb_chan = CSP_SYSTEM_OFFSET_LB;
prf->syst_tx_pwr_offset.syst_off_hb_low_chan = CSP_SYSTEM_OFFSET_HB_CHAN_LOW;
prf->syst_tx_pwr_offset.syst_off_hb_mid_chan = CSP_SYSTEM_OFFSET_HB_CHAN_MID;
prf->syst_tx_pwr_offset.syst_off_hb_high_chan = CSP_SYSTEM_OFFSET_HB_CHAN_HIGH;

/* TX power ceiling */
prf->max_pwr_ceil.max_dsss_pwr = CSP_MAX_TX_PWR_DSSS;
prf->max_pwr_ceil.max_lb_mcs7_pwr = CSP_MAX_TX_PWR_LB_MCS7;
Expand Down Expand Up @@ -949,6 +950,12 @@ int nrf_wifi_phy_rf_params_init(struct nrf_wifi_phy_rf_params *prf,
/* Initialize XO */
prf->xo_offset.xo_freq_offset = QFN_XO_VAL;

/* Configure systematic offset value */
prf->syst_tx_pwr_offset.syst_off_lb_chan = QFN_SYSTEM_OFFSET_LB;
prf->syst_tx_pwr_offset.syst_off_hb_low_chan = QFN_SYSTEM_OFFSET_HB_CHAN_LOW;
prf->syst_tx_pwr_offset.syst_off_hb_mid_chan = QFN_SYSTEM_OFFSET_HB_CHAN_MID;
prf->syst_tx_pwr_offset.syst_off_hb_high_chan = QFN_SYSTEM_OFFSET_HB_CHAN_HIGH;

/* TX power ceiling */
prf->max_pwr_ceil.max_dsss_pwr = QFN_MAX_TX_PWR_DSSS;
prf->max_pwr_ceil.max_lb_mcs7_pwr = QFN_MAX_TX_PWR_LB_MCS7;
Expand Down
36 changes: 22 additions & 14 deletions nrf_wifi/hw_if/hal/inc/fw/phy_rf_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
/* Temperature based calibration params */
#define NRF_WIFI_DEF_PHY_TEMP_CALIB (NRF_WIFI_PHY_CALIB_FLAG_RXDC |\
NRF_WIFI_PHY_CALIB_FLAG_TXDC |\
NRF_WIFI_PHY_CALIB_FLAG_ENHANCED_TXDC |\
NRF_WIFI_PHY_CALIB_FLAG_RXIQ |\
NRF_WIFI_PHY_CALIB_FLAG_TXIQ |\
NRF_WIFI_PHY_CALIB_FLAG_TXPOW |\
Expand Down Expand Up @@ -88,11 +89,7 @@
#define RX_GAIN_OFFSET_HB_MID_CHAN 0
#define RX_GAIN_OFFSET_HB_HIGH_CHAN 0

/** Systematic error between set power and measured power in dBm */
#define SYSTEM_OFFSET_LB 3
#define SYSTEM_OFFSET_HB_CHAN_LOW 3
#define SYSTEM_OFFSET_HB_CHAN_MID 3
#define SYSTEM_OFFSET_HB_CHAN_HIGH 3


/** End of package independent params */

Expand All @@ -102,6 +99,12 @@
/** XO adjustment value */
#define QFN_XO_VAL 0x2A

/** Systematic error between set power and measured power in dBm */
#define QFN_SYSTEM_OFFSET_LB 3
#define QFN_SYSTEM_OFFSET_HB_CHAN_LOW 3
#define QFN_SYSTEM_OFFSET_HB_CHAN_MID 3
#define QFN_SYSTEM_OFFSET_HB_CHAN_HIGH 3

/** Max TX power allowed for DSSS and OFDM in 2.4GHz band */
#define QFN_MAX_TX_PWR_DSSS 0x54
#define QFN_MAX_TX_PWR_LB_MCS7 0x40
Expand Down Expand Up @@ -154,24 +157,29 @@
/** XO adjustment value */
#define CSP_XO_VAL 0x2A

/** Systematic error between set power and measured power in dBm */
#define CSP_SYSTEM_OFFSET_LB 5
#define CSP_SYSTEM_OFFSET_HB_CHAN_LOW 5
#define CSP_SYSTEM_OFFSET_HB_CHAN_MID 5
#define CSP_SYSTEM_OFFSET_HB_CHAN_HIGH 5
/** Max TX power allowed for DSSS and OFDM in 2.4GHz band */
#define CSP_MAX_TX_PWR_DSSS 0x48
#define CSP_MAX_TX_PWR_LB_MCS7 0x44
#define CSP_MAX_TX_PWR_LB_MCS0 0x44
#define CSP_MAX_TX_PWR_DSSS 0x40
#define CSP_MAX_TX_PWR_LB_MCS7 0x3C
#define CSP_MAX_TX_PWR_LB_MCS0 0x3C

/** Max TX power allowed for MCS7 for channels in the range,
* 36 to 64, 96 to 132 and 136 to 177
*/
#define CSP_MAX_TX_PWR_HB_LOW_CHAN_MCS7 0x3C
#define CSP_MAX_TX_PWR_HB_MID_CHAN_MCS7 0x3C
#define CSP_MAX_TX_PWR_HB_HIGH_CHAN_MCS7 0x3C
#define CSP_MAX_TX_PWR_HB_LOW_CHAN_MCS7 0x34
#define CSP_MAX_TX_PWR_HB_MID_CHAN_MCS7 0x34
#define CSP_MAX_TX_PWR_HB_HIGH_CHAN_MCS7 0x34

/** Max TX power allowed for MCS0 for channels in the range,
* 36 to 64, 96 to 132 and 136 to 177
*/
#define CSP_MAX_TX_PWR_HB_LOW_CHAN_MCS0 0x3C
#define CSP_MAX_TX_PWR_HB_MID_CHAN_MCS0 0x3C
#define CSP_MAX_TX_PWR_HB_HIGH_CHAN_MCS0 0x3C
#define CSP_MAX_TX_PWR_HB_LOW_CHAN_MCS0 0x34
#define CSP_MAX_TX_PWR_HB_MID_CHAN_MCS0 0x34
#define CSP_MAX_TX_PWR_HB_HIGH_CHAN_MCS0 0x34

/** Max chip temperature at which the TX power backoff to be applied. */
#define CSP_MAX_CHIP_TEMP 0x43
Expand Down
Loading