nrf71 system level parameter

Syncing  nrf71 system parameters to firmware code base
and relevant changes to make system level working.

Signed-off-by: Ajay Parida <[email protected]>

Author: ajayparida

fw_if/umac_if/inc/fw/host_rpu_sys_if.h

@@ -224,6 +224,9 @@ enum rpu_ch_bw {
  *
  */
 struct chan_params {
+#ifdef WIFI_NRF71
+	unsigned int op_band;
+#endif /* WIFI_NRF71 */
 	/** Primary channel number */
 	unsigned int primary_num;
 	/** Channel bandwidth */
@@ -340,6 +343,14 @@ struct umac_rx_dbg_params {
 	unsigned int null_skb_pointer_from_lmac;
 	/** Number of unexpected management packets received in coalesce event */
 	unsigned int unexpected_mgmt_pkt;
+#ifdef WIFI_NRF71
+	/** Number of packets flushed from reorder buffer
+	 *  before going to sleep
+	 */
+	unsigned int reorder_flush_pkt_count;
+	/** Unprotected error data frames received in security mode */
+	unsigned int unsecured_data_error;
+#endif /* WIFI_NRF71 */
 } __NRF_WIFI_PKD;
 
 /**
@@ -847,6 +858,11 @@ enum op_band {
 	BAND_ALL,
 	/** 2.4Ghz band */
 	BAND_24G,
+#ifdef WIFI_NRF71
+	BAND_5G,
+	/** 6 GHz band */
+	BAND_6G
+#endif /* WIFI_NRF71 */
 };
 
 /**

fw_if/umac_if/inc/fw/host_rpu_umac_if.h

@@ -260,7 +260,11 @@ enum nrf_wifi_band {
 	/** Around 5 GHz band (4.9 - 5.7 GHz) */
 	NRF_WIFI_BAND_5GHZ,
 	/** Unused */
+#ifdef WIFI_NRF71
+	NRF_WIFI_BAND_6GHZ,
+#else
 	NRF_WIFI_BAND_60GHZ,
+#endif /* WIFI_NRF71 */
 	/** Invalid */
 	NRF_WIFI_BAND_INVALID
 };
@@ -683,8 +687,12 @@ struct nrf_wifi_channel {
 
 
 #define NRF_WIFI_SCAN_MAX_NUM_SSIDS 2
+#ifdef WIFI_NRF71
+#define NRF_WIFI_SCAN_MAX_NUM_FREQUENCIES 89
+#define MAX_NUM_CHANNELS 42
+#else /* WIFI_NRF71 */
 #define NRF_WIFI_SCAN_MAX_NUM_FREQUENCIES 64
-
+#endif /* !WIFI_NRF71 */
 #define NRF_WIFI_SCAN_BAND_2GHZ	(1 << 0)
 #define NRF_WIFI_SCAN_BAND_5GHZ	(1 << 1)
 #define NRF_WIFI_SCAN_BAND_6GHZ	(1 << 2)
@@ -1807,8 +1815,11 @@ struct nrf_wifi_ext_capability {
 
 } __NRF_WIFI_PKD;
 
+#ifdef WIFI_NRF71
+#define NRF_WIFI_SUPPORTED_CHANNELS_MAX_LEN 89
+#else /* WIFI_NRF71 */
 #define NRF_WIFI_SUPPORTED_CHANNELS_MAX_LEN 64
-
+#endif /* !WIFI_NRF71 */
 /**
  * @brief Supported channels.
  */
@@ -2948,8 +2959,10 @@ struct nrf_wifi_umac_event_power_save_info {
 	unsigned int ps_timeout;
 	/** Listen interval value */
 	unsigned short listen_interval;
+#ifndef WIFI_NRF71
 	/** Power save exit strategy */
 	unsigned char ps_exit_strategy;
+#endif /* !WIFI_NRF71 */
 	/** Number TWT flows */
 	unsigned char num_twt_flows;
 	/** TWT info of each flow nrf_wifi_umac_config_twt_info */

fw_if/umac_if/src/system/fmac_api.c

@@ -384,8 +384,13 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_dev_init(struct nrf_wifi_fmac_dev_ctx *fm
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 #ifndef NRF71_ON_IPC
+#ifdef WIFI_NRF71
+	struct nrf_wifi_phy_rf_params phy_rf_params = { 0};
+	int ret = -1;
+#else /* WIFI_NRF71 */
         struct nrf_wifi_fmac_otp_info otp_info;
 	struct nrf_wifi_phy_rf_params phy_rf_params;
+#endif /* !WIFI_NRF71 */
 #endif /* !NRF71_ON_IPC */
 
 	if (!fmac_dev_ctx) {
@@ -414,6 +419,21 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_dev_init(struct nrf_wifi_fmac_dev_ctx *fm
 	}
 
 #ifndef NRF71_ON_IPC
+#ifdef WIFI_NRF71
+	nrf_wifi_osal_mem_set(&phy_rf_params,
+			      0x0,
+			      sizeof(phy_rf_params));
+
+	ret = nrf_wifi_utils_hex_str_to_val(
+			(unsigned char *)&phy_rf_params.phy_params,
+			sizeof(phy_rf_params.phy_params),
+			NRF_WIFI_SYS_DEF_RF_PARAMS);
+	if (ret == -1) {
+		nrf_wifi_osal_log_err("%s: Initialization of RF params with default values failed", __func__);
+		status = NRF_WIFI_STATUS_FAIL;
+		goto out;
+	}
+#else /* WIFI_NRF71 */
 	nrf_wifi_osal_mem_set(&otp_info,
 			      0xFF,
 			      sizeof(otp_info));
@@ -435,6 +455,7 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_dev_init(struct nrf_wifi_fmac_dev_ctx *fm
 				      __func__);
 		goto out;
 	}
+#endif  /* !WIFI_NRF71 */
 #endif /* !NRF71_ON_IPC */
 
 	status = nrf_wifi_sys_fmac_fw_init(fmac_dev_ctx,
@@ -3722,13 +3743,14 @@ static int nrf_wifi_sys_fmac_phy_rf_params_init(struct nrf_wifi_phy_rf_params *p
 						unsigned char *str)
 {
 	int ret = -1;
+#ifndef WIFI_NRF71
 	unsigned int rf_param_offset = BAND_2G_LW_ED_BKF_DSSS_OFST - NRF_WIFI_RF_PARAMS_CONF_SIZE;
-
+#endif /* !WIFI_NRF71 */
 	/* Initilaize reserved bytes */
 	nrf_wifi_osal_mem_set(prf,
 			      0x0,
 			      sizeof(prf));
-
+#ifndef WIFI_NRF71
 	/* Initialize PD adjust values for MCS7. Currently these 4 bytes are not being used */
 	prf->pd_adjust_val.pd_adjt_lb_chan = PD_ADJUST_VAL;
 	prf->pd_adjust_val.pd_adjt_hb_low_chan = PD_ADJUST_VAL;
@@ -3849,7 +3871,7 @@ static int nrf_wifi_sys_fmac_phy_rf_params_init(struct nrf_wifi_phy_rf_params *p
 	prf->phy_params[rf_param_offset + 31]  = NRF70_PCB_LOSS_5G_BAND1;
 	prf->phy_params[rf_param_offset + 32]  = NRF70_PCB_LOSS_5G_BAND2;
 	prf->phy_params[rf_param_offset + 33]  = NRF70_PCB_LOSS_5G_BAND3;
-
+#endif /* !WIFI_NRF71 */
 	return(ret);
 }
 
@@ -3864,9 +3886,10 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_rf_params_get(struct nrf_wifi_fmac_dev_ct
 	/* If package_info is not written to OTP then the default value will be 0xFF. */
 	unsigned int package_info = 0xFFFFFFFF;
 	struct nrf_wifi_tx_pwr_ceil_params *tx_pwr_ceil_params;
+#ifndef WIFI_NRF71
 	unsigned char backoff_2g_dsss = 0, backoff_2g_ofdm = 0;
 	unsigned char backoff_5g_lowband = 0, backoff_5g_midband = 0, backoff_5g_highband = 0;
-
+#endif /* !WIFI_NRF71 */
 	if (!fmac_dev_ctx || !phy_rf_params) {
 		nrf_wifi_osal_log_err("%s: Invalid parameters",
 				      __func__);
@@ -3920,7 +3943,7 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_rf_params_get(struct nrf_wifi_fmac_dev_ct
 		status = NRF_WIFI_STATUS_FAIL;
 		goto out;
 	}
-
+#ifndef WIFI_NRF71
 	if (!(otp_info.flags & (~CALIB_XO_FLAG_MASK))) {
 		nrf_wifi_osal_mem_cpy(&phy_rf_params->xo_offset.xo_freq_offset,
 				      (char *)otp_info.info.calib + OTP_OFF_CALIB_XO,
@@ -3977,7 +4000,7 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_rf_params_get(struct nrf_wifi_fmac_dev_ct
 	MIN(tx_pwr_ceil_params->max_pwr_5g_high_mcs0,
 	        phy_rf_params->max_pwr_ceil.max_hb_high_chan_mcs0_pwr) - backoff_5g_highband;
 #endif /* NRF70_2_4G_ONLY */
-
+#endif /* !WIFI_NRF71 */
 	status = NRF_WIFI_STATUS_SUCCESS;
 out:
 	return status;

fw_if/umac_if/src/system/fmac_cmd.c

@@ -115,7 +115,7 @@ enum nrf_wifi_status umac_cmd_sys_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ct
 	umac_cmd_data->temp_vbat_config_params.vth_very_low = NRF_WIFI_VBAT_VERYLOW;
 
 	umac_cmd_data->op_band = op_band;
-
+#ifndef CONFIG_NRF71
 	nrf_wifi_osal_mem_cpy(&umac_cmd_data->sys_params.rf_params[PCB_LOSS_BYTE_2G_OFST],
 			      &board_params->pcb_loss_2g,
 			      NUM_PCB_LOSS_OFFSET);
@@ -127,7 +127,7 @@ enum nrf_wifi_status umac_cmd_sys_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ct
 	nrf_wifi_osal_mem_cpy(&umac_cmd_data->sys_params.rf_params[BAND_2G_LW_ED_BKF_DSSS_OFST],
 			      &tx_pwr_ctrl_params->band_edge_2g_lo_dss,
 			      NUM_EDGE_BACKOFF);
-
+#endif /* !CONFIG_NRF71 */
 	nrf_wifi_osal_mem_cpy(umac_cmd_data->country_code,
 			      country_code,
 			      NRF_WIFI_COUNTRY_CODE_LEN);
@@ -157,6 +157,7 @@ enum nrf_wifi_status umac_cmd_sys_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ct
 	umac_cmd_data->coex_disable_ptiwin_for_wifi_scan = 0;
 #endif /* NRF_WIFI_COEX_DISABLE_PRIORITY_WINDOW_FOR_SCAN */
 
+#ifndef WIFI_NRF71
 #ifdef WIFI_MGMT_RAW_SCAN_RESULTS
 	umac_cmd_data->raw_scan_enable = 1;
 #else
@@ -176,6 +177,7 @@ enum nrf_wifi_status umac_cmd_sys_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ct
 		umac_cmd_data->dynamic_ed = 1;
 	#endif /* NRF_WIFI_DYNAMIC_ED */
 
+#endif /* !WIFI_NRF71 */
 	status = nrf_wifi_hal_ctrl_cmd_send(fmac_dev_ctx->hal_dev_ctx,
 					    umac_cmd,
 					    (sizeof(*umac_cmd) + len));

hw_if/hal/inc/common/phy_rf_params_common.h

@@ -24,10 +24,20 @@
 	#define NRF_WIFI_PHY_CALIB_FLAG_TXDC 2
 #endif
 
+#ifdef WIFI_NRF71
+#define NRF_WIFI_PHY_CALIB_FLAG_RXDC 1
+#define NRF_WIFI_PHY_CALIB_FLAG_TXDC 2
+#define NRF_WIFI_PHY_CALIB_FLAG_TXPOW 0
+#define NRF_WIFI_PHY_CALIB_FLAG_TXIQ 8//8
+#define NRF_WIFI_PHY_CALIB_FLAG_RXIQ 16//16
+#define NRF_WIFI_PHY_CALIB_FLAG_DPD  0
+#else /* WIFI_NRF71 */
 #define NRF_WIFI_PHY_CALIB_FLAG_TXPOW 0
 #define NRF_WIFI_PHY_CALIB_FLAG_TXIQ 8
 #define NRF_WIFI_PHY_CALIB_FLAG_RXIQ 16
 #define NRF_WIFI_PHY_CALIB_FLAG_DPD 32
+#endif /* !WIFI_NRF71 */
+
 #define NRF_WIFI_PHY_CALIB_FLAG_ENHANCED_TXDC 64
 #define NRF_WIFI_PHY_SCAN_CALIB_FLAG_RXDC (1<<16)
 #ifdef NRF70_PASSIVE_SCAN_ONLY
@@ -318,6 +328,9 @@ struct nrf_wifi_temp_volt_depend_params {
  * first 42 bytes of RF parameters.
  */
 struct nrf_wifi_phy_rf_params {
+#ifdef WIFI_NRF71
+	unsigned char phy_params[NRF_WIFI_RF_PARAMS_SIZE];
+#else /* WIFI_NRF71 */
 	unsigned char reserved[6];
 	struct nrf_wifi_xo_freq_offset xo_offset;
 	struct nrf_wifi_pd_adst_val pd_adjust_val;
@@ -326,6 +339,7 @@ struct nrf_wifi_phy_rf_params {
 	struct nrf_wifi_rx_gain_offset rx_gain_offset;
 	struct nrf_wifi_temp_volt_depend_params temp_volt_backoff;
 	unsigned char phy_params[NRF_WIFI_RF_PARAMS_SIZE - NRF_WIFI_RF_PARAMS_CONF_SIZE];
+#endif /* !WIFI_NRF71 */
 } __NRF_WIFI_PKD;
 
 /** The byte offsets of RF parameters indicate the start offset

hw_if/hal/inc/system/phy_rf_params.h

@@ -12,6 +12,10 @@
 #define _PHY_RF_PARAMS_SYS_H_
 #include "common/phy_rf_params_common.h"
 
+#ifdef WIFI_NRF71
+/* Currnet working phy_rf_params */
+#define NRF_WIFI_SYS_DEF_RF_PARAMS "0000000000001C00000000000000004030303838383838380000000050EC000000000000000000000000214365003F032424001000002800323500000CF008007D8105010071630300EED501001F6F00003B350100F52E0000E35E0000B7B6000066EFFEFFB5F60000896200007A840200E28FFCFF08080808040A140100000000A1A10178000000680150003B0207262D2D28281A120A140E0600"
+#else /* WIFI_NRF71 */
 #define NRF_WIFI_SYS_DEF_RF_PARAMS "007077003F032424001000002800323500000CF008087D8105010071630300EED501001F6F00003B350100F52E0000E35E0000B7B6000066EFFEFFB5F60000896200007A840200E28FFCFF080808080408120100000000A1A10178000000080050003B020726181818181A120A140E0600"
-
+#endif  /* !WIFI_NRF71 */
 #endif /* _PHY_RF_PARAMS_SYS_H_ */