# 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 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/fs/cifs/cifssmb.c: In function '__cifs_reconnect_tcon': /kisskb/src/fs/cifs/cifssmb.c:186:1: warning: the frame size of 1328 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/sound/ppc/pmac.h:25:0, from /kisskb/src/sound/ppc/awacs.c:29: /kisskb/src/sound/ppc/awacs.c: In function 'snd_pmac_awacs_init': /kisskb/src/include/sound/control.h:223:9: warning: 'speaker_vol' may be used uninitialized in this function [-Wmaybe-uninitialized] return _snd_ctl_add_slave(master, slave, 0); ^ /kisskb/src/sound/ppc/awacs.c:886:36: note: 'speaker_vol' was declared here struct snd_kcontrol *master_vol, *speaker_vol; ^ /kisskb/src/fs/cifs/smb2pdu.c: In function '__smb2_reconnect': /kisskb/src/fs/cifs/smb2pdu.c:220:1: warning: the frame size of 1328 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaaac90) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xabb3a8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaaac90) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5165701 Bytes = 5044.63 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5165327 Bytes = 5044.26 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5165830 Bytes = 5044.76 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00894 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5165611 Bytes = 5044.54 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5135383 Bytes = 5015.02 KiB = 4.90 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5164638 Bytes = 5043.59 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5165134 Bytes = 5044.08 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00294 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5166011 Bytes = 5044.93 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00894 Image Name: Linux-5.0.0-rc1+ Created: Sat Jan 12 00:34:37 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5165720 Bytes = 5044.65 KiB = 4.93 MiB Load Address: 00b00000 Entry Point: 00b00294 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc5 # Build took: 0:01:54.233031