linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] PCI: brcmstb: Remove irq handler and data in one go
@ 2020-11-08 18:42 Martin Kaiser
  2020-11-09  2:00 ` Florian Fainelli
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Martin Kaiser @ 2020-11-08 18:42 UTC (permalink / raw)
  To: Nicolas Saenz Julienne, Lorenzo Pieralisi, Bjorn Helgaas,
	Florian Fainelli
  Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-pci,
	linux-kernel, Martin Kaiser

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

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/pci/controller/pcie-brcmstb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index bea86899bd5d..7c666f4deb47 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -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);
 }
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] PCI: brcmstb: Remove irq handler and data in one go
  2020-11-08 18:42 [PATCH] PCI: brcmstb: Remove irq handler and data in one go Martin Kaiser
@ 2020-11-09  2:00 ` Florian Fainelli
  2020-11-11 21:53 ` [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler Martin Kaiser
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Florian Fainelli @ 2020-11-09  2:00 UTC (permalink / raw)
  To: Martin Kaiser, Nicolas Saenz Julienne, Lorenzo Pieralisi,
	Bjorn Helgaas, Florian Fainelli
  Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-pci, linux-kernel



On 11/8/2020 10:42 AM, Martin Kaiser wrote:
> Replace the two separate calls for removing the irq handler and data with a
> single irq_set_chained_handler_and_data() call.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler
  2020-11-08 18:42 [PATCH] PCI: brcmstb: Remove irq handler and data in one go Martin Kaiser
  2020-11-09  2:00 ` Florian Fainelli
@ 2020-11-11 21:53 ` Martin Kaiser
  2020-11-12  9:07   ` Nicolas Saenz Julienne
  2020-11-12 22:03 ` [PATCH v3] PCI: brcmstb: remove chained IRQ handler and data in one go Martin Kaiser
  2021-01-15 21:15 ` [PATCH v4] PCI: brcmstb: Remove " Martin Kaiser
  3 siblings, 1 reply; 7+ messages in thread
From: Martin Kaiser @ 2020-11-11 21:53 UTC (permalink / raw)
  To: Nicolas Saenz Julienne, Lorenzo Pieralisi, Bjorn Helgaas,
	Florian Fainelli
  Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-pci,
	linux-kernel, 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").

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
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(-)

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index bea86899bd5d..7c666f4deb47 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -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);
 }
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler
  2020-11-11 21:53 ` [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler Martin Kaiser
@ 2020-11-12  9:07   ` Nicolas Saenz Julienne
  0 siblings, 0 replies; 7+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12  9:07 UTC (permalink / raw)
  To: Martin Kaiser, Lorenzo Pieralisi, Bjorn Helgaas, Florian Fainelli
  Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-pci, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

On Wed, 2020-11-11 at 22:53 +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").
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

Thanks!

> 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(-)
> 
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index bea86899bd5d..7c666f4deb47 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -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);
>  }
>  


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v3] PCI: brcmstb: remove chained IRQ handler and data in one go
  2020-11-08 18:42 [PATCH] PCI: brcmstb: Remove irq handler and data in one go Martin Kaiser
  2020-11-09  2:00 ` Florian Fainelli
  2020-11-11 21:53 ` [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler Martin Kaiser
@ 2020-11-12 22:03 ` Martin Kaiser
  2021-01-15 21:15 ` [PATCH v4] PCI: brcmstb: Remove " Martin Kaiser
  3 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2020-11-12 22:03 UTC (permalink / raw)
  To: Nicolas Saenz Julienne, Lorenzo Pieralisi, Bjorn Helgaas,
	Florian Fainelli
  Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-pci,
	linux-kernel, 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").

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
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(-)

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index bea86899bd5d..7c666f4deb47 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -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);
 }
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH v4] PCI: brcmstb: Remove chained IRQ handler and data in one go
  2020-11-08 18:42 [PATCH] PCI: brcmstb: Remove irq handler and data in one go Martin Kaiser
                   ` (2 preceding siblings ...)
  2020-11-12 22:03 ` [PATCH v3] PCI: brcmstb: remove chained IRQ handler and data in one go Martin Kaiser
@ 2021-01-15 21:15 ` Martin Kaiser
  2021-01-19 12:24   ` Lorenzo Pieralisi
  3 siblings, 1 reply; 7+ messages in thread
From: Martin Kaiser @ 2021-01-15 21:15 UTC (permalink / raw)
  To: Nicolas Saenz Julienne, Lorenzo Pieralisi, Bjorn Helgaas,
	Florian Fainelli
  Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-pci,
	linux-kernel, 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").

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(-)

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);
 }
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH v4] PCI: brcmstb: Remove chained IRQ handler and data in one go
  2021-01-15 21:15 ` [PATCH v4] PCI: brcmstb: Remove " Martin Kaiser
@ 2021-01-19 12:24   ` Lorenzo Pieralisi
  0 siblings, 0 replies; 7+ messages in thread
From: Lorenzo Pieralisi @ 2021-01-19 12:24 UTC (permalink / raw)
  To: Florian Fainelli, Martin Kaiser, Nicolas Saenz Julienne, Bjorn Helgaas
  Cc: Lorenzo Pieralisi, linux-kernel, linux-pci,
	bcm-kernel-feedback-list, linux-rpi-kernel

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-19 13:03 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-08 18:42 [PATCH] PCI: brcmstb: Remove irq handler and data in one go Martin Kaiser
2020-11-09  2:00 ` Florian Fainelli
2020-11-11 21:53 ` [PATCH v2] PCI: brcmstb: Fix race in removing chained IRQ handler Martin Kaiser
2020-11-12  9:07   ` Nicolas Saenz Julienne
2020-11-12 22:03 ` [PATCH v3] PCI: brcmstb: remove chained IRQ handler and data in one go Martin Kaiser
2021-01-15 21:15 ` [PATCH v4] PCI: brcmstb: Remove " Martin Kaiser
2021-01-19 12:24   ` Lorenzo Pieralisi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).