All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net] net: ipa: pass correct dma_handle to  dma_free_coherent()
@ 2021-02-02  5:55 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2021-02-02  5:55 UTC (permalink / raw)
  To: Alex Elder; +Cc: David S. Miller, Jakub Kicinski, netdev, kernel-janitors

The "ring->addr = addr;" assignment is done a few lines later so we
can't use "ring->addr" yet.  The correct dma_handle is "addr".

Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Smatch also complians about:

    drivers/net/ipa/gsi.c:1739 gsi_channel_setup()
    warn: missing error code 'ret'

It probably should return -EINVAL, but I'm not positive.

 drivers/net/ipa/gsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index f79cf3c327c1..b559d14271e2 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1373,7 +1373,7 @@ static int gsi_ring_alloc(struct gsi *gsi, struct gsi_ring *ring, u32 count)
 	/* Hardware requires a 2^n ring size, with alignment equal to size */
 	ring->virt = dma_alloc_coherent(dev, size, &addr, GFP_KERNEL);
 	if (ring->virt && addr % size) {
-		dma_free_coherent(dev, size, ring->virt, ring->addr);
+		dma_free_coherent(dev, size, ring->virt, addr);
 		dev_err(dev, "unable to alloc 0x%zx-aligned ring buffer\n",
 			size);
 		return -EINVAL;	/* Not a good error value, but distinct */
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH net] net: ipa: pass correct dma_handle to  dma_free_coherent()
@ 2021-02-02  5:55 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2021-02-02  5:55 UTC (permalink / raw)
  To: Alex Elder; +Cc: David S. Miller, Jakub Kicinski, netdev, kernel-janitors

The "ring->addr = addr;" assignment is done a few lines later so we
can't use "ring->addr" yet.  The correct dma_handle is "addr".

Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Smatch also complians about:

    drivers/net/ipa/gsi.c:1739 gsi_channel_setup()
    warn: missing error code 'ret'

It probably should return -EINVAL, but I'm not positive.

 drivers/net/ipa/gsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index f79cf3c327c1..b559d14271e2 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1373,7 +1373,7 @@ static int gsi_ring_alloc(struct gsi *gsi, struct gsi_ring *ring, u32 count)
 	/* Hardware requires a 2^n ring size, with alignment equal to size */
 	ring->virt = dma_alloc_coherent(dev, size, &addr, GFP_KERNEL);
 	if (ring->virt && addr % size) {
-		dma_free_coherent(dev, size, ring->virt, ring->addr);
+		dma_free_coherent(dev, size, ring->virt, addr);
 		dev_err(dev, "unable to alloc 0x%zx-aligned ring buffer\n",
 			size);
 		return -EINVAL;	/* Not a good error value, but distinct */
-- 
2.29.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH net] net: ipa: pass correct dma_handle to dma_free_coherent()
  2021-02-02  5:55 ` Dan Carpenter
@ 2021-02-02 11:48   ` Alex Elder
  -1 siblings, 0 replies; 6+ messages in thread
From: Alex Elder @ 2021-02-02 11:48 UTC (permalink / raw)
  To: Dan Carpenter, Alex Elder
  Cc: David S. Miller, Jakub Kicinski, netdev, kernel-janitors

On 2/1/21 11:55 PM, Dan Carpenter wrote:
> The "ring->addr = addr;" assignment is done a few lines later so we
> can't use "ring->addr" yet.  The correct dma_handle is "addr".
> 
> Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Yikes.  Thank you for the fix.

Reviewed-by: Alex Elder <elder@linaro.org>

> ---
> Smatch also complians about:
> 
>     drivers/net/ipa/gsi.c:1739 gsi_channel_setup()
>     warn: missing error code 'ret'
> 
> It probably should return -EINVAL, but I'm not positive.
> 
>  drivers/net/ipa/gsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
> index f79cf3c327c1..b559d14271e2 100644
> --- a/drivers/net/ipa/gsi.c
> +++ b/drivers/net/ipa/gsi.c
> @@ -1373,7 +1373,7 @@ static int gsi_ring_alloc(struct gsi *gsi, struct gsi_ring *ring, u32 count)
>  	/* Hardware requires a 2^n ring size, with alignment equal to size */
>  	ring->virt = dma_alloc_coherent(dev, size, &addr, GFP_KERNEL);
>  	if (ring->virt && addr % size) {
> -		dma_free_coherent(dev, size, ring->virt, ring->addr);
> +		dma_free_coherent(dev, size, ring->virt, addr);
>  		dev_err(dev, "unable to alloc 0x%zx-aligned ring buffer\n",
>  			size);
>  		return -EINVAL;	/* Not a good error value, but distinct */
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH net] net: ipa: pass correct dma_handle to dma_free_coherent()
@ 2021-02-02 11:48   ` Alex Elder
  0 siblings, 0 replies; 6+ messages in thread
From: Alex Elder @ 2021-02-02 11:48 UTC (permalink / raw)
  To: Dan Carpenter, Alex Elder
  Cc: David S. Miller, Jakub Kicinski, netdev, kernel-janitors

On 2/1/21 11:55 PM, Dan Carpenter wrote:
> The "ring->addr = addr;" assignment is done a few lines later so we
> can't use "ring->addr" yet.  The correct dma_handle is "addr".
> 
> Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Yikes.  Thank you for the fix.

Reviewed-by: Alex Elder <elder@linaro.org>

> ---
> Smatch also complians about:
> 
>     drivers/net/ipa/gsi.c:1739 gsi_channel_setup()
>     warn: missing error code 'ret'
> 
> It probably should return -EINVAL, but I'm not positive.
> 
>  drivers/net/ipa/gsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
> index f79cf3c327c1..b559d14271e2 100644
> --- a/drivers/net/ipa/gsi.c
> +++ b/drivers/net/ipa/gsi.c
> @@ -1373,7 +1373,7 @@ static int gsi_ring_alloc(struct gsi *gsi, struct gsi_ring *ring, u32 count)
>  	/* Hardware requires a 2^n ring size, with alignment equal to size */
>  	ring->virt = dma_alloc_coherent(dev, size, &addr, GFP_KERNEL);
>  	if (ring->virt && addr % size) {
> -		dma_free_coherent(dev, size, ring->virt, ring->addr);
> +		dma_free_coherent(dev, size, ring->virt, addr);
>  		dev_err(dev, "unable to alloc 0x%zx-aligned ring buffer\n",
>  			size);
>  		return -EINVAL;	/* Not a good error value, but distinct */
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH net] net: ipa: pass correct dma_handle to dma_free_coherent()
  2021-02-02 11:48   ` Alex Elder
@ 2021-02-02 16:47     ` Jakub Kicinski
  -1 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2021-02-02 16:47 UTC (permalink / raw)
  To: Alex Elder, Dan Carpenter
  Cc: Alex Elder, David S. Miller, netdev, kernel-janitors

On Tue, 2 Feb 2021 05:48:11 -0600 Alex Elder wrote:
> On 2/1/21 11:55 PM, Dan Carpenter wrote:
> > The "ring->addr = addr;" assignment is done a few lines later so we
> > can't use "ring->addr" yet.  The correct dma_handle is "addr".
> > 
> > Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>  
> 
> Yikes.  Thank you for the fix.
> 
> Reviewed-by: Alex Elder <elder@linaro.org>

Applied, thanks!

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH net] net: ipa: pass correct dma_handle to dma_free_coherent()
@ 2021-02-02 16:47     ` Jakub Kicinski
  0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2021-02-02 16:47 UTC (permalink / raw)
  To: Alex Elder, Dan Carpenter
  Cc: Alex Elder, David S. Miller, netdev, kernel-janitors

On Tue, 2 Feb 2021 05:48:11 -0600 Alex Elder wrote:
> On 2/1/21 11:55 PM, Dan Carpenter wrote:
> > The "ring->addr = addr;" assignment is done a few lines later so we
> > can't use "ring->addr" yet.  The correct dma_handle is "addr".
> > 
> > Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>  
> 
> Yikes.  Thank you for the fix.
> 
> Reviewed-by: Alex Elder <elder@linaro.org>

Applied, thanks!

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-02 16:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02  5:55 [PATCH net] net: ipa: pass correct dma_handle to dma_free_coherent() Dan Carpenter
2021-02-02  5:55 ` Dan Carpenter
2021-02-02 11:48 ` Alex Elder
2021-02-02 11:48   ` Alex Elder
2021-02-02 16:47   ` Jakub Kicinski
2021-02-02 16:47     ` Jakub Kicinski

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.