# git rev-parse -q --verify 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git next-test # git rev-parse -q --verify 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d^{commit} 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # git checkout -q -f -B kisskb 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # git clean -qxdf # < git log -1 # commit 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # Author: Mahesh Salgaonkar # Date: Thu Aug 23 10:26:08 2018 +0530 # # powerpc/mce: Fix SLB rebolting during MCE recovery path. # # With the powerpc next commit e7e81847478b ("powerpc/64s: move machine # check SLB flushing to mm/slb.c"), the SLB error recovery is broken. # The new code now does not add the index value to RB[52-63] that # selects the SLB entry when rebolting, instead it assumes that the # shadow save area already has the index embeded correctly in the esid # field. # # While all valid bolted save areas do contain index value set # correctly, there is a case where 3rd (KSTACK_INDEX) entry for kernel # stack does not embed index for NULL esid entry. This patch fixes that. # # Without this patch the SLB rebolt code overwirtes the 1st entry of # kernel linear mapping and causes SLB recovery to fail. # # Fixes: e7e81847478b ("powerpc/64s: move machine check SLB flushing to mm/slb.c") # Signed-off-by: Mahesh Salgaonkar # Signed-off-by: Nicholas Piggin # Reviewed-by: Nicholas Piggin # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # < make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc44x_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ppc44x_defconfig # make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc44x_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:183:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /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/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:251:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:231:19: note: 'i' was declared here /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec': /kisskb/src/net/bridge/br_netlink.c:637: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:1835:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1745:46: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] arch/powerpc/boot/katmai.dtb: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" arch/powerpc/boot/katmai.dtb: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" arch/powerpc/boot/katmai.dtb: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5273ac) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537a58) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2615502 Bytes = 2554.20 kB = 2.49 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2639940 Bytes = 2578.07 kB = 2.52 MB Load Address: 00600000 Entry Point: 006000a4 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2639870 Bytes = 2578.00 kB = 2.52 MB Load Address: 00600000 Entry Point: 00601100 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2640262 Bytes = 2578.38 kB = 2.52 MB Load Address: 00600000 Entry Point: 00600178 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2639846 Bytes = 2577.97 kB = 2.52 MB Load Address: 00600000 Entry Point: 0060110c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2640306 Bytes = 2578.42 kB = 2.52 MB Load Address: 00600000 Entry Point: 00601114 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2640168 Bytes = 2578.29 kB = 2.52 MB Load Address: 00600000 Entry Point: 006010f4 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2640015 Bytes = 2578.14 kB = 2.52 MB Load Address: 00600000 Entry Point: 00601104 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2640111 Bytes = 2578.23 kB = 2.52 MB Load Address: 00600000 Entry Point: 0060110c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:10:20 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2639894 Bytes = 2578.02 kB = 2.52 MB Load Address: 00600000 Entry Point: 00601118 Completed OK # rm -rf /kisskb/build/powerpc-next_ppc44x_defconfig_powerpc # Build took: 0:00:59.196545