evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2018-01-09 15:40:31 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3808c1b2e9
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ath/ath10k/core.c
View file

@ -2088,7 +2088,7 @@ void ath10k_core_stop(struct ath10k *ar)
/* try to suspend target */ /* try to suspend target */
if (ar->state != ATH10K_STATE_RESTARTING && if (ar->state != ATH10K_STATE_RESTARTING &&
ar->state != ATH10K_STATE_UTF) 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_hif_stop(ar);
ath10k_htt_tx_free(&ar->htt); ath10k_htt_tx_free(&ar->htt);

14
drivers/net/wireless/ath/ath10k/hw.c
View file

@ -460,6 +460,7 @@ struct ath10k_hw_ce_regs qcax_ce_regs = {
}; };
const struct ath10k_hw_values qca988x_values = { const struct ath10k_hw_values qca988x_values = {
.pdev_suspend_option = WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
.rtc_state_val_on = 3, .rtc_state_val_on = 3,
.ce_count = 8, .ce_count = 8,
.msi_assign_ce_max = 7, .msi_assign_ce_max = 7,
@ -469,6 +470,7 @@ const struct ath10k_hw_values qca988x_values = {
}; };
const struct ath10k_hw_values qca6174_values = { const struct ath10k_hw_values qca6174_values = {
.pdev_suspend_option = WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
.rtc_state_val_on = 3, .rtc_state_val_on = 3,
.ce_count = 8, .ce_count = 8,
.msi_assign_ce_max = 7, .msi_assign_ce_max = 7,
@ -478,6 +480,7 @@ const struct ath10k_hw_values qca6174_values = {
}; };
const struct ath10k_hw_values qca99x0_values = { const struct ath10k_hw_values qca99x0_values = {
.pdev_suspend_option = WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
.rtc_state_val_on = 5, .rtc_state_val_on = 5,
.ce_count = 12, .ce_count = 12,
.msi_assign_ce_max = 12, .msi_assign_ce_max = 12,
@ -487,6 +490,7 @@ const struct ath10k_hw_values qca99x0_values = {
}; };
const struct ath10k_hw_values qca9888_values = { const struct ath10k_hw_values qca9888_values = {
.pdev_suspend_option = WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
.rtc_state_val_on = 3, .rtc_state_val_on = 3,
.ce_count = 12, .ce_count = 12,
.msi_assign_ce_max = 12, .msi_assign_ce_max = 12,
@ -496,13 +500,15 @@ const struct ath10k_hw_values qca9888_values = {
}; };
const struct ath10k_hw_values qca4019_values = { const struct ath10k_hw_values qca4019_values = {
.ce_count = 12, .pdev_suspend_option = WMI_PDEV_SUSPEND_AND_DISABLE_INTR,
.num_target_ce_config_wlan = 10, .ce_count = 12,
.ce_desc_meta_data_mask = 0xFFF0, .num_target_ce_config_wlan = 10,
.ce_desc_meta_data_lsb = 4, .ce_desc_meta_data_mask = 0xFFF0,
.ce_desc_meta_data_lsb = 4,
}; };
const struct ath10k_hw_values wcn3990_values = { const struct ath10k_hw_values wcn3990_values = {
.pdev_suspend_option = WMI_PDEV_SUSPEND,
.rtc_state_val_on = 5, .rtc_state_val_on = 5,
.ce_count = 12, .ce_count = 12,
.msi_assign_ce_max = 12, .msi_assign_ce_max = 12,

1
drivers/net/wireless/ath/ath10k/hw.h
View file

@ -363,6 +363,7 @@ extern struct ath10k_hw_ce_regs qcax_ce_regs;
extern struct fw_flag wcn3990_fw_flags; extern struct fw_flag wcn3990_fw_flags;
struct ath10k_hw_values { struct ath10k_hw_values {
u32 pdev_suspend_option;
u32 rtc_state_val_on; u32 rtc_state_val_on;
u8 ce_count; u8 ce_count;
u8 msi_assign_ce_max; u8 msi_assign_ce_max;