# git rev-parse -q --verify 9933819099c4600b41a042f27a074470a43cf6b9^{commit} 9933819099c4600b41a042f27a074470a43cf6b9 already have revision, skipping fetch # git checkout -q -f -B kisskb 9933819099c4600b41a042f27a074470a43cf6b9 # git clean -qxdf # < git log -1 # commit 9933819099c4600b41a042f27a074470a43cf6b9 # Author: Christophe Leroy # Date: Mon Jan 27 10:42:04 2020 +0000 # # powerpc/32s: Fix CPU wake-up from sleep mode # # Commit f7354ccac844 ("powerpc/32: Remove CURRENT_THREAD_INFO and # rename TI_CPU") broke the CPU wake-up from sleep mode (i.e. when # _TLF_SLEEPING is set) by delaying the tovirt(r2, r2). # # This is because r2 is not restored by fast_exception_return. It used # to work (by chance ?) because CPU wake-up interrupt never comes from # user, so r2 is expected to point to 'current' on return. # # Commit e2fb9f544431 ("powerpc/32: Prepare for Kernel Userspace Access # Protection") broke it even more by clobbering r0 which is not # restored by fast_exception_return either. # # Use r6 instead of r0. This is possible because r3-r6 are restored by # fast_exception_return and only r3-r5 are used for exception arguments. # # For r2 it could be converted back to virtual address, but stay on the # safe side and restore it from the stack instead. It should be live # in the cache at that moment, so loading from the stack should make # no difference compared to converting it from phys to virt. # # Fixes: f7354ccac844 ("powerpc/32: Remove CURRENT_THREAD_INFO and rename TI_CPU") # Fixes: e2fb9f544431 ("powerpc/32: Prepare for Kernel Userspace Access Protection") # Cc: stable@vger.kernel.org # Signed-off-by: Christophe Leroy # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/6d02c3ae6ad77af34392e98117e44c2bf6d13ba1.1580121710.git.christophe.leroy@c-s.fr # < /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 9933819099c4600b41a042f27a074470a43cf6b9 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, 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:78: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)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:330.3-21: 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 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc905bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc7fdb8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6175718 Bytes = 6030.97 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6176026 Bytes = 6031.28 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6175777 Bytes = 6031.03 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6177156 Bytes = 6032.38 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6176285 Bytes = 6031.53 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6176976 Bytes = 6032.20 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6175808 Bytes = 6031.06 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6175783 Bytes = 6031.04 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6177145 Bytes = 6032.37 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6177214 Bytes = 6032.44 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6177143 Bytes = 6032.37 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6175723 Bytes = 6030.98 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6177113 Bytes = 6032.34 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6179048 Bytes = 6034.23 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6178992 Bytes = 6034.17 KiB = 5.89 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:13:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6145740 Bytes = 6001.70 KiB = 5.86 MiB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/powerpc-next_mpc85xx_defconfig_powerpc-gcc5 # Build took: 0:02:20.637942