# git rev-parse -q --verify c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0^{commit} c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 already have revision, skipping fetch # git checkout -q -f -B kisskb c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 # git clean -qxdf # < git log -1 # commit c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 # Author: Christophe Leroy # Date: Mon Jun 3 13:00:51 2019 +0000 # # powerpc/32s: fix booting with CONFIG_PPC_EARLY_DEBUG_BOOTX # # When booting through OF, setup_disp_bat() does nothing because # disp_BAT are not set. By change, it used to work because BOOTX # buffer is mapped 1:1 at address 0x81000000 by the bootloader, and # btext_setup_display() sets virt addr same as phys addr. # # But since commit 215b823707ce ("powerpc/32s: set up an early static # hash table for KASAN."), a temporary page table overrides the # bootloader mapping. # # This 0x81000000 is also problematic with the newly implemented # Kernel Userspace Access Protection (KUAP) because it is within user # address space. # # This patch fixes those issues by properly setting disp_BAT through # a call to btext_prepare_BAT(), allowing setup_disp_bat() to # properly setup BAT3 for early bootx screen buffer access. # # Reported-by: Mathieu Malaterre # Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN.") # Signed-off-by: Christophe Leroy # Tested-by: Mathieu Malaterre # Signed-off-by: Michael Ellerman # < /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 c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 # < make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_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/sound/ppc/pmac.h:25:0, from /kisskb/src/sound/ppc/awacs.c:29: /kisskb/src/sound/ppc/awacs.c: In function 'snd_pmac_awacs_init': /kisskb/src/include/sound/control.h:223:9: warning: 'speaker_vol' may be used uninitialized in this function [-Wmaybe-uninitialized] return _snd_ctl_add_slave(master, slave, 0); ^ /kisskb/src/sound/ppc/awacs.c:886:36: note: 'speaker_vol' was declared here struct snd_kcontrol *master_vol, *speaker_vol; ^ /kisskb/src/kernel/futex.c: In function 'do_futex': /kisskb/src/kernel/futex.c:1658:17: warning: 'oldval' may be used uninitialized in this function [-Wmaybe-uninitialized] return oldval == cmparg; ^ /kisskb/src/kernel/futex.c:1633:6: note: 'oldval' was declared here int oldval, ret; ^ INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb018d0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xaf11b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xaf11b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287281 Bytes = 5163.36 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287122 Bytes = 5163.21 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00894 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287558 Bytes = 5163.63 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287715 Bytes = 5163.78 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287576 Bytes = 5163.65 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287153 Bytes = 5163.24 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00894 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5257732 Bytes = 5134.50 KiB = 5.01 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287789 Bytes = 5163.86 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00294 Image Name: Linux-5.2.0-rc2+ Created: Sat Jun 8 00:10:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5287781 Bytes = 5163.85 KiB = 5.04 MiB Load Address: 00c00000 Entry Point: 00c00294 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-gcc5 # Build took: 0:03:20.386127