# git rev-parse -q --verify 5b82a04d57b60f48dc7f73763941a6542ad1cf16^{commit} 5b82a04d57b60f48dc7f73763941a6542ad1cf16 already have revision, skipping fetch # git checkout -q -f -B kisskb 5b82a04d57b60f48dc7f73763941a6542ad1cf16 # git clean -qxdf # < git log -1 # commit 5b82a04d57b60f48dc7f73763941a6542ad1cf16 # Author: Christophe Leroy # Date: Thu Feb 6 13:50:29 2020 +0000 # # powerpc/hugetlb: Fix 8M hugepages on 8xx # # Commit 55c8fc3f4930 ("powerpc/8xx: reintroduce 16K pages with HW # assistance") redefined pte_t as a struct of 4 pte_basic_t, because # in 16K pages mode there are four identical entries in the page table. # But hugepd entries for 8k pages require only one entrie of size # pte_basic_t. So there is no point in creating a cache for 4 entries # page tables. # # Also, with HW assistance the entries must be 4k aligned, the 8xx # drops the last 12 bits. Redefine HUGEPD_SHIFT_MASK to mask them out. # # Calculate PTE_T_ORDER using the size of pte_basic_t instead of pte_t. # # In 16k mode, define a specific set_huge_pte_at() function which writes # the pte in a single entry instead of using set_pte_at() which writes # 4 identical entries. Define set_pte_filter() inline otherwise GCC # doesn't inline it anymore because it is now used twice, and that gives # a pretty suboptimal code because of pte_t being a struct of 4 entries. # This function is also used for 512k pages which only require one entry # as well allthough replicating it four times is harmless as 512k pages # entries are spread every 128 bytes in the table. # # Fixes: 22569b881d37 ("powerpc/8xx: Enable 8M hugepage support with HW assistance") # Cc: stable@vger.kernel.org # v5.0+ # Signed-off-by: Christophe Leroy # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/e744db1529271d11a3fdcdf641617846907b6ffd.1580997012.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 5b82a04d57b60f48dc7f73763941a6542ad1cf16 # < make -s -j 48 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 48 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:12, 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/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) /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) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc8a6b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc79eb4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160297 Bytes = 6015.92 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160573 Bytes = 6016.18 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160195 Bytes = 6015.82 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160574 Bytes = 6016.19 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160171 Bytes = 6015.79 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6162267 Bytes = 6017.84 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:06 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6129902 Bytes = 5986.23 KiB = 5.85 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160291 Bytes = 6015.91 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160132 Bytes = 6015.75 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160605 Bytes = 6016.22 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160571 Bytes = 6016.18 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6161067 Bytes = 6016.67 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160297 Bytes = 6015.92 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160181 Bytes = 6015.80 KiB = 5.87 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6161615 Bytes = 6017.20 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6160589 Bytes = 6016.20 KiB = 5.88 MiB Load Address: 00d00000 Entry Point: 00d002a4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 # Build took: 0:02:02.365684