[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210115212435.19940-2-martin@kaiser.cx>
Date: Fri, 15 Jan 2021 22:24:34 +0100
From: Martin Kaiser <martin@...ser.cx>
To: Bjorn Helgaas <helgaas@...nel.org>,
Ley Foon Tan <ley.foon.tan@...el.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Nicolas Saenz Julienne <nsaenzjulienne@...e.de>,
Jingoo Han <jingoohan1@...il.com>,
Gustavo Pimentel <gustavo.pimentel@...opsys.com>,
Toan Le <toan@...amperecomputing.com>,
Florian Fainelli <f.fainelli@...il.com>
Cc: linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org,
Martin Kaiser <martin@...ser.cx>
Subject: [PATCH v4 2/3] PCI: dwc: Remove IRQ handler and data in one go
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@...ser.cx>
---
v4:
- resend after two months
- capitalize the commit message properly
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/dwc/pcie-designware-host.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 8a84c005f32b..3837fff48944 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -258,10 +258,8 @@ int dw_pcie_allocate_domains(struct pcie_port *pp)
static void dw_pcie_free_msi(struct pcie_port *pp)
{
- if (pp->msi_irq) {
- irq_set_chained_handler(pp->msi_irq, NULL);
- irq_set_handler_data(pp->msi_irq, NULL);
- }
+ if (pp->msi_irq)
+ irq_set_chained_handler_and_data(pp->msi_irq, NULL, NULL);
irq_domain_remove(pp->msi_domain);
irq_domain_remove(pp->irq_domain);
--
2.20.1
Powered by blists - more mailing lists