# 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 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_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 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_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:9, 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:334.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:334.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 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbc4ce4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5827622 Bytes = 5691.04 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826450 Bytes = 5689.89 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826533 Bytes = 5689.97 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826719 Bytes = 5690.16 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5828236 Bytes = 5691.64 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5829287 Bytes = 5692.66 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5797172 Bytes = 5661.30 KiB = 5.53 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5829425 Bytes = 5692.80 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826790 Bytes = 5690.22 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5828925 Bytes = 5692.31 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5827094 Bytes = 5690.52 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826534 Bytes = 5689.97 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826982 Bytes = 5690.41 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826389 Bytes = 5689.83 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826566 Bytes = 5690.01 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc21f5a9ed85c Created: Sat Jun 8 00:06:41 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826719 Bytes = 5690.16 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 # Build took: 0:01:12.049329