# 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_mpc83xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc83xx_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc83xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x68be8c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x69c574) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3361660 Bytes = 3282.87 KiB = 3.21 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3390108 Bytes = 3310.65 KiB = 3.23 MiB Load Address: 00700000 Entry Point: 00700294 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3389903 Bytes = 3310.45 KiB = 3.23 MiB Load Address: 00700000 Entry Point: 00700294 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3390448 Bytes = 3310.98 KiB = 3.23 MiB Load Address: 00700000 Entry Point: 00700294 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3390739 Bytes = 3311.27 KiB = 3.23 MiB Load Address: 00700000 Entry Point: 00700294 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3389954 Bytes = 3310.50 KiB = 3.23 MiB Load Address: 00700000 Entry Point: 00700294 Image Name: Linux-5.5.0-g5b82a04d57b6 Created: Sun Feb 9 21:03:27 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3390459 Bytes = 3311.00 KiB = 3.23 MiB Load Address: 00700000 Entry Point: 00700294 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc83xx_defconfig_powerpc-gcc5 # Build took: 0:00:56.975730