# 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_mpc85xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:77:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:334.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:334.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb99638) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb88e04) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:24 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5722976 Bytes = 5588.84 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723236 Bytes = 5589.10 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5724484 Bytes = 5590.32 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723194 Bytes = 5589.06 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5693005 Bytes = 5559.58 KiB = 5.43 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723176 Bytes = 5589.04 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723165 Bytes = 5589.03 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723175 Bytes = 5589.04 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5722977 Bytes = 5588.84 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723395 Bytes = 5589.25 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723746 Bytes = 5589.60 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723203 Bytes = 5589.07 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5725107 Bytes = 5590.92 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723063 Bytes = 5588.93 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5724559 Bytes = 5590.39 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.0.0-rc1-g6bca51591751 Created: Sat Jan 12 00:33:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5723194 Bytes = 5589.06 KiB = 5.46 MiB Load Address: 00c00000 Entry Point: 00c00314 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 # Build took: 0:01:59.537936