# 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/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-ld --version # < git log --format=%s --max-count=1 2542f2f17eb335c13f525e523319ba59f2fd82a0 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ppc6xx_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:186:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1263:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/trace/trace_dynevent.c: In function 'create_dyn_event': /kisskb/src/kernel/trace/trace_dynevent.c:89:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /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=] /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2594:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1855:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/ppc/awacs.c: In function 'snd_pmac_awacs_init': /kisskb/src/include/sound/control.h:223:2: warning: 'speaker_vol' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/ppc/awacs.c:886:36: note: 'speaker_vol' was declared here /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:339:21: note: 'pdeo' was declared here /kisskb/src/fs/nfsd/nfs4xdr.c: In function 'nfsd4_encode_components_esc': /kisskb/src/fs/nfsd/nfs4xdr.c:2076:9: warning: 'str' may be used uninitialized in this function [-Wuninitialized] /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=] /kisskb/src/drivers/i2c/i2c-core-base.c: In function 'i2c_generic_scl_recovery': /kisskb/src/drivers/i2c/i2c-core-base.c:235:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:247:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:227:19: note: 'i' was declared here /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec.isra.28': /kisskb/src/net/bridge/br_netlink.c:652:7: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1843:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1753:46: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/mac80211/mlme.c: In function 'ieee80211_rx_mgmt_beacon': /kisskb/src/net/mac80211/mlme.c:1522:3: warning: 'pwr_level_cisco' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/mac80211/mlme.c:1479:6: note: 'pwr_level_cisco' was declared here INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa9514c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa84a68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa84a68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:08 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5063871 Bytes = 4945.19 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00290 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:08 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5065402 Bytes = 4946.68 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00888 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:09 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5065181 Bytes = 4946.47 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00888 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:09 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5064915 Bytes = 4946.21 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00290 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:09 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5064757 Bytes = 4946.05 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00290 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:08 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5064138 Bytes = 4945.45 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00290 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:09 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5064740 Bytes = 4946.04 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00290 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:09 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5064840 Bytes = 4946.13 KiB = 4.83 MiB Load Address: 00b00000 Entry Point: 00b00290 Image Name: Linux-5.0.0-rc1+ Created: Fri Jan 11 04:39:10 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5032796 Bytes = 4914.84 KiB = 4.80 MiB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc4.6 # Build took: 0:02:52.972392