Merge "ath10k: Define wlan hardware param for pdev suspend option"

3 files changed, 12 insertions, 5 deletions

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 55033aed6d6b..4ed144d48e2b 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2088,7 +2088,7 @@ void ath10k_core_stop(struct ath10k *ar)
 	/* try to suspend target */
 	if (ar->state != ATH10K_STATE_RESTARTING &&
 	    ar->state != ATH10K_STATE_UTF)
-		ath10k_wait_for_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR);
+		ath10k_wait_for_suspend(ar, ar->hw_values->pdev_suspend_option);
 
 	ath10k_hif_stop(ar);
 	ath10k_htt_tx_free(&ar->htt);
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
index caf63b8bbba4..1437b5d29a17 100644
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -460,6 +460,7 @@ struct ath10k_hw_ce_regs qcax_ce_regs = {
 };
 
 const struct ath10k_hw_values qca988x_values = {
+	.pdev_suspend_option		= WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
 	.rtc_state_val_on		= 3,
 	.ce_count			= 8,
 	.msi_assign_ce_max		= 7,
@@ -469,6 +470,7 @@ const struct ath10k_hw_values qca988x_values = {
 };
 
 const struct ath10k_hw_values qca6174_values = {
+	.pdev_suspend_option		= WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
 	.rtc_state_val_on		= 3,
 	.ce_count			= 8,
 	.msi_assign_ce_max		= 7,
@@ -478,6 +480,7 @@ const struct ath10k_hw_values qca6174_values = {
 };
 
 const struct ath10k_hw_values qca99x0_values = {
+	.pdev_suspend_option		= WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
 	.rtc_state_val_on		= 5,
 	.ce_count			= 12,
 	.msi_assign_ce_max		= 12,
@@ -487,6 +490,7 @@ const struct ath10k_hw_values qca99x0_values = {
 };
 
 const struct ath10k_hw_values qca9888_values = {
+	.pdev_suspend_option		= WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
 	.rtc_state_val_on		= 3,
 	.ce_count			= 12,
 	.msi_assign_ce_max		= 12,
@@ -496,13 +500,15 @@ const struct ath10k_hw_values qca9888_values = {
 };
 
 const struct ath10k_hw_values qca4019_values = {
-	.ce_count                       = 12,
-	.num_target_ce_config_wlan      = 10,
-	.ce_desc_meta_data_mask         = 0xFFF0,
-	.ce_desc_meta_data_lsb          = 4,
+	.pdev_suspend_option		= WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
+	.ce_count			= 12,
+	.num_target_ce_config_wlan	= 10,
+	.ce_desc_meta_data_mask		= 0xFFF0,
+	.ce_desc_meta_data_lsb		= 4,
 };
 
 const struct ath10k_hw_values wcn3990_values = {
+	.pdev_suspend_option		= WMI_PDEV_SUSPEND,
 	.rtc_state_val_on		= 5,
 	.ce_count			= 12,
 	.msi_assign_ce_max		= 12,
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 8aa696ed2e72..a37b956c558f 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -363,6 +363,7 @@ extern struct ath10k_hw_ce_regs qcax_ce_regs;
 extern struct fw_flag wcn3990_fw_flags;
 
 struct ath10k_hw_values {
+	u32 pdev_suspend_option;
 	u32 rtc_state_val_on;
 	u8 ce_count;
 	u8 msi_assign_ce_max;