diff options
| author | Michal Kazior <michal.kazior@tieto.com> | 2014-08-22 08:23:33 -0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-08-25 04:28:56 -0400 |
| commit | ec5ba4d3b6b60456b067e8c625e87e67cdde2d12 (patch) | |
| tree | 5efdd7d536de18235039627f75f009aff06c2738 | |
| parent | 145cc1214a271c72b81a064f4d65c3cf612e941e (diff) | |
ath10k: make sure to really disable irqs
This fixes two corner cases.
One is a race between disabling copy engine
interrupts and unhandled pending interrupts on the
host. This could end up with a runaway tasklet and
consequently memory leak of a few copy engine
rx buffers.
The other one is an unexpected (and non-maskable
via device CSR) MSI fw indication interrupt during
teardown. This could trigger the same problem as
the first corner case.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index c764dd713f00..6224952ba523 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c | |||
| @@ -1121,6 +1121,40 @@ static int ath10k_pci_post_rx(struct ath10k *ar) | |||
| 1121 | return 0; | 1121 | return 0; |
| 1122 | } | 1122 | } |
| 1123 | 1123 | ||
| 1124 | static void ath10k_pci_irq_disable(struct ath10k *ar) | ||
| 1125 | { | ||
| 1126 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); | ||
| 1127 | int i; | ||
| 1128 | |||
| 1129 | ath10k_ce_disable_interrupts(ar); | ||
| 1130 | |||
| 1131 | /* Regardless how many interrupts were assigned for MSI the first one | ||
| 1132 | * is always used for firmware indications (crashes). There's no way to | ||
| 1133 | * mask the irq in the device so call disable_irq(). Legacy (shared) | ||
| 1134 | * interrupts can be masked on the device though. | ||
| 1135 | */ | ||
| 1136 | if (ar_pci->num_msi_intrs > 0) | ||
| 1137 | disable_irq(ar_pci->pdev->irq); | ||
| 1138 | else | ||
| 1139 | ath10k_pci_disable_and_clear_legacy_irq(ar); | ||
| 1140 | |||
| 1141 | for (i = 0; i < max(1, ar_pci->num_msi_intrs); i++) | ||
| 1142 | synchronize_irq(ar_pci->pdev->irq + i); | ||
| 1143 | } | ||
| 1144 | |||
| 1145 | static void ath10k_pci_irq_enable(struct ath10k *ar) | ||
| 1146 | { | ||
| 1147 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); | ||
| 1148 | |||
| 1149 | ath10k_ce_enable_interrupts(ar); | ||
| 1150 | |||
| 1151 | /* See comment in ath10k_pci_irq_disable() */ | ||
| 1152 | if (ar_pci->num_msi_intrs > 0) | ||
| 1153 | enable_irq(ar_pci->pdev->irq); | ||
| 1154 | else | ||
| 1155 | ath10k_pci_enable_legacy_irq(ar); | ||
| 1156 | } | ||
| 1157 | |||
| 1124 | static int ath10k_pci_hif_start(struct ath10k *ar) | 1158 | static int ath10k_pci_hif_start(struct ath10k *ar) |
| 1125 | { | 1159 | { |
| 1126 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); | 1160 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); |
| @@ -1138,7 +1172,7 @@ static int ath10k_pci_hif_start(struct ath10k *ar) | |||
| 1138 | goto err_early_irq; | 1172 | goto err_early_irq; |
| 1139 | } | 1173 | } |
| 1140 | 1174 | ||
| 1141 | ath10k_ce_enable_interrupts(ar); | 1175 | ath10k_pci_irq_enable(ar); |
| 1142 | 1176 | ||
| 1143 | /* Post buffers once to start things off. */ | 1177 | /* Post buffers once to start things off. */ |
| 1144 | ret = ath10k_pci_post_rx(ar); | 1178 | ret = ath10k_pci_post_rx(ar); |
| @@ -1152,7 +1186,7 @@ static int ath10k_pci_hif_start(struct ath10k *ar) | |||
| 1152 | return 0; | 1186 | return 0; |
| 1153 | 1187 | ||
| 1154 | err_stop: | 1188 | err_stop: |
| 1155 | ath10k_ce_disable_interrupts(ar); | 1189 | ath10k_pci_irq_disable(ar); |
| 1156 | ath10k_pci_free_irq(ar); | 1190 | ath10k_pci_free_irq(ar); |
| 1157 | ath10k_pci_kill_tasklet(ar); | 1191 | ath10k_pci_kill_tasklet(ar); |
| 1158 | err_early_irq: | 1192 | err_early_irq: |
| @@ -1275,10 +1309,7 @@ static void ath10k_pci_hif_stop(struct ath10k *ar) | |||
| 1275 | if (WARN_ON(!ar_pci->started)) | 1309 | if (WARN_ON(!ar_pci->started)) |
| 1276 | return; | 1310 | return; |
| 1277 | 1311 | ||
| 1278 | ret = ath10k_ce_disable_interrupts(ar); | 1312 | ath10k_pci_irq_disable(ar); |
| 1279 | if (ret) | ||
| 1280 | ath10k_warn("failed to disable CE interrupts: %d\n", ret); | ||
| 1281 | |||
| 1282 | ath10k_pci_free_irq(ar); | 1313 | ath10k_pci_free_irq(ar); |
| 1283 | ath10k_pci_kill_tasklet(ar); | 1314 | ath10k_pci_kill_tasklet(ar); |
| 1284 | 1315 | ||