# 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_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc885_ads_defconfig # Added to kconfig CONFIG_HUGETLBFS=y # yes \n | make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:36:54 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 1911890 Bytes = 1867.08 KiB = 1.82 MiB Load Address: 00400000 Entry Point: 00400204 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 # Build took: 0:00:47.175091