# git rev-parse -q --verify 6bca515917515b66b7e1dfc1d1d3b7bd8058315c^{commit} 6bca515917515b66b7e1dfc1d1d3b7bd8058315c already have revision, skipping fetch # git checkout -q -f -B kisskb 6bca515917515b66b7e1dfc1d1d3b7bd8058315c # git clean -qxdf # < git log -1 # commit 6bca515917515b66b7e1dfc1d1d3b7bd8058315c # Author: Frederic Barrat # Date: Wed Jan 9 16:13:42 2019 +0100 # # powerpc/powernv/npu: Fix oops in pnv_try_setup_npu_table_group() # # With a recent change around IOMMU group, a system with an opencapi # adapter is no longer booting and we get a kernel oops: # # BUG: Kernel NULL pointer dereference at 0x00000028 # Faulting instruction address: 0xc0000000000aa38c # ... # NIP pnv_try_setup_npu_table_group+0x1c/0x1a0 # LR pnv_pci_ioda_fixup+0x1f8/0x660 # Call Trace: # pnv_try_setup_npu_table_group+0x60/0x # pnv_pci_ioda_fixup+0x20c/0x660 # pcibios_resource_survey+0x2c8/0x31c # pcibios_init+0xb0/0xe4 # do_one_initcall+0x64/0x264 # kernel_init_freeable+0x36c/0x468 # kernel_init+0x2c/0x148 # ret_from_kernel_thread+0x5c/0x68 # # An opencapi device is using a device PE, so the current code breaks # because pe->pbus is not defined. # # More generally, there's no need to define an IOMMU group for opencapi, # as the device sends real addresses directly (admittedly, the # virtualization story is yet to be written). So let's fix it by # skipping the IOMMU group setup for opencapi PHBs. # # Fixes: 0bd971676e68 ("powerpc/powernv/npu: Add compound IOMMU groups") # Signed-off-by: Frederic Barrat # Reviewed-by: Greg Kurz # Reviewed-by: Andrew Donnellan # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 6bca515917515b66b7e1dfc1d1d3b7bd8058315c # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_defconfig # Added to kconfig CONFIG_PPC_POWERNV=n # yes \n | make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- arch/powerpc/platforms/pseries/pci.o: In function `.pSeries_final_fixup': (.init.text+0x1b4): undefined reference to `.pnv_npu2_init' make[1]: *** [/kisskb/src/Makefile:1020: vmlinux] Error 1 make: *** [Makefile:152: sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 # Build took: 0:02:42.408311