[PATCH] powernv/npu-dma.c: Remove spurious WARN_ON when a PCI device has no of_node

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH] powernv/npu-dma.c: Remove spurious WARN_ON when a PCI device has no of_node

Alistair Popple
"4c3b89e powerpc/powernv: Add sanity checks to pnv_pci_get_{gpu|npu}_dev"
introduced explicit warnings in pnv_pci_get_npu_dev() when a PCIe device
has no associated device-tree node. However not all PCIe devices have an
of_node and pnv_pci_get_npu_dev() gets indirectly called at least once for
every PCIe device in the system. This results in spurious WARN_ON()'s so
remove it.

The same situation should not exist for pnv_pci_get_gpu_dev() as any NPU
based PCIe device requires a device-tree node.

Signed-off-by: Alistair Popple <[hidden email]>
Reported-by: Alexey Kardashevskiy <[hidden email]>
---
 arch/powerpc/platforms/powernv/npu-dma.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c
index 78fa939..e6f444b 100644
--- a/arch/powerpc/platforms/powernv/npu-dma.c
+++ b/arch/powerpc/platforms/powernv/npu-dma.c
@@ -75,7 +75,8 @@ struct pci_dev *pnv_pci_get_npu_dev(struct pci_dev *gpdev, int index)
  if (WARN_ON(!gpdev))
  return NULL;
 
- if (WARN_ON(!gpdev->dev.of_node))
+ /* Not all PCI devices have device-tree nodes */
+ if (!gpdev->dev.of_node)
  return NULL;
 
  /* Get assoicated PCI device */
--
2.1.4

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] powernv/npu-dma.c: Remove spurious WARN_ON when a PCI device has no of_node

Alexey Kardashevskiy
On 14/06/17 14:47, Alistair Popple wrote:

> "4c3b89e powerpc/powernv: Add sanity checks to pnv_pci_get_{gpu|npu}_dev"
> introduced explicit warnings in pnv_pci_get_npu_dev() when a PCIe device
> has no associated device-tree node. However not all PCIe devices have an
> of_node and pnv_pci_get_npu_dev() gets indirectly called at least once for
> every PCIe device in the system. This results in spurious WARN_ON()'s so
> remove it.
>
> The same situation should not exist for pnv_pci_get_gpu_dev() as any NPU
> based PCIe device requires a device-tree node.
>
> Signed-off-by: Alistair Popple <[hidden email]>
> Reported-by: Alexey Kardashevskiy <[hidden email]>

Reviewed-by: Alexey Kardashevskiy <[hidden email]>

> ---
>  arch/powerpc/platforms/powernv/npu-dma.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c
> index 78fa939..e6f444b 100644
> --- a/arch/powerpc/platforms/powernv/npu-dma.c
> +++ b/arch/powerpc/platforms/powernv/npu-dma.c
> @@ -75,7 +75,8 @@ struct pci_dev *pnv_pci_get_npu_dev(struct pci_dev *gpdev, int index)
>   if (WARN_ON(!gpdev))
>   return NULL;
>  
> - if (WARN_ON(!gpdev->dev.of_node))
> + /* Not all PCI devices have device-tree nodes */
> + if (!gpdev->dev.of_node)
>   return NULL;
>  
>   /* Get assoicated PCI device */
>


--
Alexey
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: powernv/npu-dma.c: Remove spurious WARN_ON when a PCI device has no of_node

Michael Ellerman-3
In reply to this post by Alistair Popple
On Wed, 2017-06-14 at 04:47:50 UTC, Alistair Popple wrote:

> "4c3b89e powerpc/powernv: Add sanity checks to pnv_pci_get_{gpu|npu}_dev"
> introduced explicit warnings in pnv_pci_get_npu_dev() when a PCIe device
> has no associated device-tree node. However not all PCIe devices have an
> of_node and pnv_pci_get_npu_dev() gets indirectly called at least once for
> every PCIe device in the system. This results in spurious WARN_ON()'s so
> remove it.
>
> The same situation should not exist for pnv_pci_get_gpu_dev() as any NPU
> based PCIe device requires a device-tree node.
>
> Signed-off-by: Alistair Popple <[hidden email]>
> Reported-by: Alexey Kardashevskiy <[hidden email]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/377aa6b0efbaa29cfeecd8b9244641

cheers
Loading...