qcacmn: Fix the deadlock situation during deconfiguration of grp_irq

Make sure the free_irq is not called with the group locks held.

Change-Id: I216e0cbae8bb45f1603dfe96e586130773744c50
This commit is contained in:
Pavankumar Nandeshwar
2019-08-14 11:59:14 +05:30
gecommit door nshrivas
bovenliggende 2573cf4667
commit 2d247d0d5e

Bestand weergeven

@@ -350,11 +350,21 @@ void hif_ahb_deconfigure_grp_irq(struct hif_softc *scn)
hif_ext_group->irq_requested = false;
for (j = 0; j < hif_ext_group->numirq; j++) {
irq = hif_ext_group->os_irq[j];
hif_ext_group->irq_enabled = false;
irq_clear_status_flags(irq,
IRQ_DISABLE_UNLAZY);
free_irq(irq, hif_ext_group);
}
qdf_spin_unlock_irqrestore(&hif_ext_group->irq_lock);
/* Avoid holding the irq_lock while freeing the irq
* as the same lock is being held by the irq handler
* while disabling the irq. This causes a deadlock
* between free_irq and irq_handler.
*/
for (j = 0; j < hif_ext_group->numirq; j++) {
irq = hif_ext_group->os_irq[j];
free_irq(irq, hif_ext_group);
}
}
}
}
@@ -771,7 +781,7 @@ void hif_ahb_exec_grp_irq_enable(struct hif_exec_context *hif_ext_group)
int i;
qdf_spin_lock_irqsave(&hif_ext_group->irq_lock);
if (!hif_ext_group->irq_enabled) {
if (hif_ext_group->irq_requested && !hif_ext_group->irq_enabled) {
for (i = 0; i < hif_ext_group->numirq; i++) {
enable_irq(hif_ext_group->os_irq[i]);
}