# git rev-parse -q --verify 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d^{commit} 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d already have revision, skipping fetch # 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-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-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-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc44x_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. 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 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x52752c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x537c44) 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:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2648542 Bytes = 2586.47 kB = 2.53 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674401 Bytes = 2611.72 kB = 2.55 MB Load Address: 00600000 Entry Point: 00601104 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674254 Bytes = 2611.58 kB = 2.55 MB Load Address: 00600000 Entry Point: 0060110c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674296 Bytes = 2611.62 kB = 2.55 MB Load Address: 00600000 Entry Point: 0060018c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674483 Bytes = 2611.80 kB = 2.55 MB Load Address: 00600000 Entry Point: 006000a8 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674196 Bytes = 2611.52 kB = 2.55 MB Load Address: 00600000 Entry Point: 006010f8 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674222 Bytes = 2611.54 kB = 2.55 MB Load Address: 00600000 Entry Point: 00601110 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674431 Bytes = 2611.75 kB = 2.55 MB Load Address: 00600000 Entry Point: 00601104 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674502 Bytes = 2611.82 kB = 2.55 MB Load Address: 00600000 Entry Point: 006010ec Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:40:27 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2674511 Bytes = 2611.83 kB = 2.55 MB Load Address: 00600000 Entry Point: 006010fc Completed OK # rm -rf /kisskb/build/powerpc-next_ppc44x_defconfig_powerpc-5.3 # Build took: 0:00:48.883180