Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1544324 > unrolled thread

[PATCH] NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy

Started byChristophe JAILLET <christophe.jaillet@wanadoo.fr>
First post2016-12-19 07:00 +0100
Last post2016-12-21 18:00 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2016-12-19 07:00 +0100
    Re: [PATCH] NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy Dave Jiang <dave.jiang@intel.com> - 2016-12-19 18:10 +0100
      Re: [PATCH] NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy Jon Mason <jdmason@kudzu.us> - 2016-12-21 18:00 +0100

#1544324 — [PATCH] NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy

FromChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Date2016-12-19 07:00 +0100
Subject[PATCH] NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy
Message-ID<sPZ9n-3IP-5@gated-at.bofh.it>
'request_irq()' and 'free_irq()' should have the same 'dev_id'.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/ntb/hw/amd/ntb_hw_amd.c     | 2 +-
 drivers/ntb/hw/intel/ntb_hw_intel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index 6ccba0d862df..a48c3e085eab 100644
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -598,7 +598,7 @@ static int ndev_init_isr(struct amd_ntb_dev *ndev,
 
 err_msix_request:
 	while (i-- > 0)
-		free_irq(ndev->msix[i].vector, ndev);
+		free_irq(ndev->msix[i].vector, &ndev->vec[i]);
 	pci_disable_msix(pdev);
 err_msix_enable:
 	kfree(ndev->msix);
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 7310a261c858..2413600aae30 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -472,7 +472,7 @@ static int ndev_init_isr(struct intel_ntb_dev *ndev,
 
 err_msix_request:
 	while (i-- > 0)
-		free_irq(ndev->msix[i].vector, ndev);
+		free_irq(ndev->msix[i].vector, &ndev->vec[i]);
 	pci_disable_msix(pdev);
 err_msix_enable:
 	kfree(ndev->msix);
-- 
2.9.3

[toc] | [next] | [standalone]


#1544680

FromDave Jiang <dave.jiang@intel.com>
Date2016-12-19 18:10 +0100
Message-ID<sQ9BM-2iR-23@gated-at.bofh.it>
In reply to#1544324

On 12/18/2016 10:52 PM, Christophe JAILLET wrote:
> 'request_irq()' and 'free_irq()' should have the same 'dev_id'.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Acking the Intel driver portion.
Acked-by: Dave Jiang <dave.jiang@intel.com>

> ---
>  drivers/ntb/hw/amd/ntb_hw_amd.c     | 2 +-
>  drivers/ntb/hw/intel/ntb_hw_intel.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
> index 6ccba0d862df..a48c3e085eab 100644
> --- a/drivers/ntb/hw/amd/ntb_hw_amd.c
> +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
> @@ -598,7 +598,7 @@ static int ndev_init_isr(struct amd_ntb_dev *ndev,
>  
>  err_msix_request:
>  	while (i-- > 0)
> -		free_irq(ndev->msix[i].vector, ndev);
> +		free_irq(ndev->msix[i].vector, &ndev->vec[i]);
>  	pci_disable_msix(pdev);
>  err_msix_enable:
>  	kfree(ndev->msix);
> diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
> index 7310a261c858..2413600aae30 100644
> --- a/drivers/ntb/hw/intel/ntb_hw_intel.c
> +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
> @@ -472,7 +472,7 @@ static int ndev_init_isr(struct intel_ntb_dev *ndev,
>  
>  err_msix_request:
>  	while (i-- > 0)
> -		free_irq(ndev->msix[i].vector, ndev);
> +		free_irq(ndev->msix[i].vector, &ndev->vec[i]);
>  	pci_disable_msix(pdev);
>  err_msix_enable:
>  	kfree(ndev->msix);
> 

[toc] | [prev] | [next] | [standalone]


#1545870

FromJon Mason <jdmason@kudzu.us>
Date2016-12-21 18:00 +0100
Message-ID<sQSpb-5Vc-5@gated-at.bofh.it>
In reply to#1544680
On Mon, Dec 19, 2016 at 10:04:24AM -0700, Dave Jiang wrote:
> 
> 
> On 12/18/2016 10:52 PM, Christophe JAILLET wrote:
> > 'request_irq()' and 'free_irq()' should have the same 'dev_id'.
> > 
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> 
> Acking the Intel driver portion.
> Acked-by: Dave Jiang <dave.jiang@intel.com>

Applied to the ntb git branch

Thanks,
Jon

> 
> > ---
> >  drivers/ntb/hw/amd/ntb_hw_amd.c     | 2 +-
> >  drivers/ntb/hw/intel/ntb_hw_intel.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
> > index 6ccba0d862df..a48c3e085eab 100644
> > --- a/drivers/ntb/hw/amd/ntb_hw_amd.c
> > +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
> > @@ -598,7 +598,7 @@ static int ndev_init_isr(struct amd_ntb_dev *ndev,
> >  
> >  err_msix_request:
> >  	while (i-- > 0)
> > -		free_irq(ndev->msix[i].vector, ndev);
> > +		free_irq(ndev->msix[i].vector, &ndev->vec[i]);
> >  	pci_disable_msix(pdev);
> >  err_msix_enable:
> >  	kfree(ndev->msix);
> > diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
> > index 7310a261c858..2413600aae30 100644
> > --- a/drivers/ntb/hw/intel/ntb_hw_intel.c
> > +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
> > @@ -472,7 +472,7 @@ static int ndev_init_isr(struct intel_ntb_dev *ndev,
> >  
> >  err_msix_request:
> >  	while (i-- > 0)
> > -		free_irq(ndev->msix[i].vector, ndev);
> > +		free_irq(ndev->msix[i].vector, &ndev->vec[i]);
> >  	pci_disable_msix(pdev);
> >  err_msix_enable:
> >  	kfree(ndev->msix);
> > 
> 
> -- 
> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/56b16dd5-b83b-e8b0-bf79-2dd2bc56f1e1%40intel.com.
> For more options, visit https://groups.google.com/d/optout.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web