# git rev-parse -q --verify 2542f2f17eb335c13f525e523319ba59f2fd82a0^{commit} 2542f2f17eb335c13f525e523319ba59f2fd82a0 already have revision, skipping fetch # git checkout -q -f -B kisskb 2542f2f17eb335c13f525e523319ba59f2fd82a0 # git clean -qxdf # < git log -1 # commit 2542f2f17eb335c13f525e523319ba59f2fd82a0 # 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/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 2542f2f17eb335c13f525e523319ba59f2fd82a0 # < make -s -j 120 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 120 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/arch/mips/boot/dts/xilfpga/nexys4ddr.dts:109.16-112.8: Warning (i2c_bus_reg): /i2c@10A00000/ad7420@4B: I2C bus unit address format error, expected "4b" FIT description: Linux 5.0.0-rc1-g2542f2f17eb3 Created: Fri Jan 11 04:30:20 2019 Image 0 (kernel@0) Description: Linux 5.0.0-rc1-g2542f2f17eb3 Created: Fri Jan 11 04:30:20 2019 Type: Kernel Image Compression: gzip compressed Data Size: 4500914 Bytes = 4395.42 KiB = 4.29 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x808543b0 Hash algo: sha1 Hash value: 7a913261354237e41d2e7a7c636208bdaa2dc148 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Fri Jan 11 04:30:20 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Fri Jan 11 04:30:20 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Fri Jan 11 04:30:20 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 509ce58e44c561d54539e64e9d4b47054e696fc6 Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/powerpc-fixes_mips-defconfig_mipsel # Build took: 0:01:00.671736