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 <alist...@popple.id.au> > Reported-by: Alexey Kardashevskiy <a...@ozlabs.ru>
Reviewed-by: Alexey Kardashevskiy <a...@ozlabs.ru> > --- > 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