# 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 48 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_smp_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_smp_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. 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)) ^ arch/powerpc/boot/mpc8555cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/mpc8541cds.dtb: 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 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf7714) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe6f20) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5874572 Bytes = 5736.89 kB = 5.60 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:30 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5898546 Bytes = 5760.30 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:30 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899491 Bytes = 5761.22 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:30 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899528 Bytes = 5761.26 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:31 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5900281 Bytes = 5761.99 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:31 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899228 Bytes = 5760.96 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:30 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5898560 Bytes = 5760.31 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:30 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5900689 Bytes = 5762.39 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:31 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899235 Bytes = 5760.97 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:30 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899772 Bytes = 5761.50 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:31 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899302 Bytes = 5761.04 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:31 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5899602 Bytes = 5761.33 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:29 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5900978 Bytes = 5762.67 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:29 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5898651 Bytes = 5760.40 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:28 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5898595 Bytes = 5760.35 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g7312bd0 Created: Thu Aug 23 20:49:29 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5898545 Bytes = 5760.30 kB = 5.63 MB Load Address: 00c00000 Entry Point: 00c00278 Completed OK # rm -rf /kisskb/build/powerpc-next_mpc85xx_smp_defconfig_powerpc-5.3 # Build took: 0:01:50.881074