| Message ID | 20210115211532.19837-1-martin@kaiser.cx |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] PCI: brcmstb: Remove chained IRQ handler and data in one go | expand |
On Fri, 15 Jan 2021 22:15:32 +0100, Martin Kaiser wrote: > Call irq_set_chained_handler_and_data() to clear the chained handler > and the handler's data under irq_desc->lock. > > See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained > IRQ handler"). Applied to pci/misc, thanks! [1/1] PCI: brcmstb: Remove chained IRQ handler and data in one go https://git.kernel.org/lpieralisi/pci/c/5ce6697a44 Thanks, Lorenzo
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index d41257f43a8f..95f6dd93ceae 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -603,8 +603,7 @@ static void brcm_msi_remove(struct brcm_pcie *pcie) if (!msi) return; - irq_set_chained_handler(msi->irq, NULL); - irq_set_handler_data(msi->irq, NULL); + irq_set_chained_handler_and_data(msi->irq, NULL, NULL); brcm_free_domains(msi); }
Call irq_set_chained_handler_and_data() to clear the chained handler and the handler's data under irq_desc->lock. See also 2cf5a03cb29d ("PCI/keystone: Fix race in installing chained IRQ handler"). Signed-off-by: Martin Kaiser <martin@kaiser.cx> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- Hi Lorenzo, I sent this simple patch back in November, it seems that it got lost somehow. Is there any chance that you can apply it? Thanks, Martin v4: - resend after two months - clean up the commit message while at it v3: - rewrite the commit message again. this is no race condition if we remove the interrupt handler. sorry for the noise. v2: - rewrite the commit message to clarify that this is a bugfix drivers/pci/controller/pcie-brcmstb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)