xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath10k: re-arrange PCI init code

Browse Source 
This patch moves irq registering after necessary
structures have been allocated and initialized.
This should prevent interrupts from causing
tasklet access invalid memory pointers.

Reported-By: Ben Greear <greearb@candelatech.com>
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Michal Kazior
2013-11-08 08:01:33 +01:00
committed by Kalle Valo
parent 2415fc1639
commit 98563d5aaf
3 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/ath/ath10k/ce.c
View File

@@ -792,6 +792,21 @@ static void ath10k_ce_per_engine_handler_adjust(struct ath10k_ce_pipe *ce_state,
ath10k_pci_sleep(ar);
}
int ath10k_ce_enable_err_irq(struct ath10k *ar)
{
int i, ret;
ret = ath10k_pci_wake(ar);
if (ret)
return ret;
for (i = 0; i < CE_COUNT; i++)
ath10k_ce_error_intr_enable(ar, ath10k_ce_base_address(i));
ath10k_pci_sleep(ar);
return 0;
}
int ath10k_ce_disable_interrupts(struct ath10k *ar)
{
int ce_id, ret;
@@ -1059,7 +1074,6 @@ struct ath10k_ce_pipe *ath10k_ce_init(struct ath10k *ar,
const struct ce_attr *attr)
{
struct ath10k_ce_pipe *ce_state;
u32 ctrl_addr = ath10k_ce_base_address(ce_id);
int ret;
/*
@@ -1105,9 +1119,6 @@ struct ath10k_ce_pipe *ath10k_ce_init(struct ath10k *ar,
}
}
/* Enable CE error interrupts */
ath10k_ce_error_intr_enable(ar, ctrl_addr);
out:
ath10k_pci_sleep(ar);
return ce_state;