# 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 48 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/arch/powerpc/boot/dts/virtex440-ml510.dts:335.37-439.6: Warning (pci_bridge): /plb@0/plbv46-pci@85e00000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/virtex440-ml510.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' /kisskb/src/arch/powerpc/boot/dts/katmai.dts:322.26-361.5: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:363.26-402.5: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:404.26-443.5: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x585bec) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5962d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2851230 Bytes = 2784.40 KiB = 2.72 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883090 Bytes = 2815.52 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883321 Bytes = 2815.74 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 0060152c Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883254 Bytes = 2815.68 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883311 Bytes = 2815.73 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 00601544 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883317 Bytes = 2815.74 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883340 Bytes = 2815.76 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 00601514 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883261 Bytes = 2815.68 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 006000c4 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883227 Bytes = 2815.65 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 006001b8 Image Name: Linux-5.5.0-rc5-g9933819099c4 Created: Thu Jan 30 01:11:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2883166 Bytes = 2815.59 KiB = 2.75 MiB Load Address: 00600000 Entry Point: 00601524 Completed OK # rm -rf /kisskb/build/powerpc-next_ppc44x_defconfig_powerpc-gcc5 # Build took: 0:00:58.255539