Messages in this thread | | | Subject | Re: [PATCH] powerpc: PCI does not require PowerNV | From | Alexey Kardashevskiy <> | Date | Tue, 15 Jan 2019 15:43:52 +1100 |
| |
On 15/01/2019 11:47, Jason A. Donenfeld wrote: > Commit 0e759bd75285 moved around the declaration of pnv_npu2_init, but > did not conditionalize it inside of the PCI pSeries driver. This meant > that CONFIG_PCI && CONFIG_PPC_PSERIES && !CONFIG_PPC_POWERNV resulted > in: > > powerpc64le-pc-linux-gnu-ld: arch/powerpc/platforms/pseries/pci.o: in function `pSeries_final_fixup': > pci.c:(.init.text+0x1b0): undefined reference to `pnv_npu2_init' > > This commit therefore wraps that line in an ifdef, so that PCI works > without PowerNV. > > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > Fixes: 0e759bd75285 ("powerpc/powernv/npu: Move OPAL calls away from context manipulation") > Cc: Alexey Kardashevskiy <aik@ozlabs.ru> > Cc: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> --- > arch/powerpc/platforms/pseries/pci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c > index 7725825d887d..37a77e57893e 100644 > --- a/arch/powerpc/platforms/pseries/pci.c > +++ b/arch/powerpc/platforms/pseries/pci.c > @@ -264,7 +264,9 @@ void __init pSeries_final_fixup(void) > if (!of_device_is_compatible(nvdn->parent, > "ibm,power9-npu")) > continue; > +#ifdef CONFIG_PPC_POWERNV > WARN_ON_ONCE(pnv_npu2_init(hose)); > +#endif > break; > } > } >
-- Alexey
| |