Skip to contentSkip to conversation

PCI: brcmstb: Remove irq handler and data in one go

PATCH In review Martin Kaiser 4 participants 7 messages Nov 8, 2020 – Jan 19, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: brcmstb: Remove irq handler and data in one go

Replace the two separate calls for removing the irq handler and data with a single irq_set_chained_handler_and_data() call.

---
 drivers/pci/controller/pcie-brcmstb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +1 -2
index bea86899bd5d..7c666f4deb47 100644
@@ -606,8 +606,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);
 }
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 1/1 PCI: brcmstb: Fix race in removing chained IRQ handler

In reply to Martin Kaiser

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").

---
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(-)
drivers/pci/controller/pcie-brcmstb.c +1 -2
index bea86899bd5d..7c666f4deb47 100644
@@ -606,8 +606,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);
 }
 
Signature · 1 line
2.20.1
Acked-by on v2 1/1
#3 lore raw

Re: [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler

Quoted 9 lines · Martin Kaiser

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").

---

Thanks!

Quoted 20 lines

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(-)
drivers/pci/controller/pcie-brcmstb.c +1 -2
index bea86899bd5d..7c666f4deb47 100644
@@ -606,8 +606,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);
 }
 
#4 lore raw

PATCH v3 1/1 PCI: brcmstb: remove chained IRQ handler and data in one go

In reply to Martin Kaiser

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").

---
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(-)
drivers/pci/controller/pcie-brcmstb.c +1 -2
index bea86899bd5d..7c666f4deb47 100644
@@ -606,8 +606,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);
 }
 
Signature · 1 line
2.20.1
#5 lore raw

PATCH v4 1/1 PCI: brcmstb: Remove chained IRQ handler and data in one go

In reply to Martin Kaiser

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").

---
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(-)
drivers/pci/controller/pcie-brcmstb.c +1 -2
index d41257f43a8f..95f6dd93ceae 100644
@@ -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);
 }
 
Signature · 1 line
2.20.1
#6 lore raw

Re: [PATCH v4] PCI: brcmstb: Remove chained IRQ handler and data in one go

Quoted 5 lines · Martin Kaiser

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