# 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/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 5b82a04d57b60f48dc7f73763941a6542ad1cf16 # < make -s -j 48 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 48 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- FIT description: Linux 5.5.0-g5b82a04d57b6 Created: Sun Feb 9 20:19:53 2020 Image 0 (kernel@0) Description: Linux 5.5.0-g5b82a04d57b6 Created: Sun Feb 9 20:19:53 2020 Type: Kernel Image Compression: gzip compressed Data Size: 4889158 Bytes = 4774.57 KiB = 4.66 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x80901210 Hash algo: sha1 Hash value: 79c31f111b8cae5dd08ab2857075bd29bde73383 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Sun Feb 9 20:19:53 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Sun Feb 9 20:19:53 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Sun Feb 9 20:19:53 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 018897896b42c41c943aca35a20e4300dba250c8 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Sun Feb 9 20:19:53 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5198 Bytes = 5.08 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 36c7bd0bd79cfc2f7dd6acda6c7996294f4967e6 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Sun Feb 9 20:19:53 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/powerpc-fixes_mips-defconfig_mipsel # Build took: 0:01:57.534032