# git rev-parse -q --verify 9933819099c4600b41a042f27a074470a43cf6b9^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git next-test # git rev-parse -q --verify 9933819099c4600b41a042f27a074470a43cf6b9^{commit} 9933819099c4600b41a042f27a074470a43cf6b9 # 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/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 9933819099c4600b41a042f27a074470a43cf6b9 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- mpc85xx_defconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2591: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:1852:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/codecs/wm8960.c: In function 'wm8960_configure_clocking': /kisskb/src/sound/soc/codecs/wm8960.c:800:70: warning: 'j' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/codecs/wm8960.c:797:68: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:204:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/hugetlb.c: In function 'alloc_pool_huge_page': /kisskb/src/mm/hugetlb.c:1426:5: warning: 'page' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/ext4/extents.c: In function 'ext4_convert_unwritten_io_end_vec': /kisskb/src/fs/ext4/extents.c:5054:23: warning: 'ret' 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:338:21: note: 'pdeo' was declared here /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/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:248:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:228:19: note: 'i' was declared here /kisskb/src/drivers/usb/core/devio.c: In function 'async_completed': /kisskb/src/drivers/usb/core/devio.c:625:23: warning: 'errno' may be used uninitialized in this function [-Wuninitialized] /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 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8e640) 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 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6062017 Bytes = 5919.94 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002e8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6061778 Bytes = 5919.71 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002e8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6061833 Bytes = 5919.76 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6062095 Bytes = 5920.01 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002e8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6062077 Bytes = 5920.00 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6067174 Bytes = 5924.97 KiB = 5.79 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6061834 Bytes = 5919.76 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002e8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6063861 Bytes = 5921.74 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6064087 Bytes = 5921.96 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6064553 Bytes = 5922.42 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6061774 Bytes = 5919.70 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6062052 Bytes = 5919.97 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6062068 Bytes = 5919.99 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:53 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6063032 Bytes = 5920.93 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002a8 INFO: Uncompressed kernel (size 0xc7dea8) 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 00:26:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6061779 Bytes = 5919.71 KiB = 5.78 MiB Load Address: 00d00000 Entry Point: 00d002e8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 00:26:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6035699 Bytes = 5894.24 KiB = 5.76 MiB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/powerpc-next_mpc85xx_defconfig_powerpc-gcc4.6 # Build took: 0:02:09.452389