# 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/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-ld --version # < git log --format=%s --max-count=1 5b82a04d57b60f48dc7f73763941a6542ad1cf16 # < make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_stx_gp3_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- 85xx/stx_gp3_defconfig # make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_stx_gp3_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:204:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:72:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:338:21: note: 'pdeo' was declared here /kisskb/src/fs/ext4/extents.c: In function 'ext4_convert_unwritten_io_end_vec': /kisskb/src/fs/ext4/extents.c:5009:23: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/drm_dp_mst_topology.c: In function 'drm_dp_mst_dsc_aux_for_port': /kisskb/src/drivers/gpu/drm/drm_dp_mst_topology.c:5399:9: warning: missing braces around initializer [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/drm_dp_mst_topology.c:5399:9: warning: (near initialization for 'desc.ident') [-Wmissing-braces] /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/drm_edid.c: In function 'cea_mode_alternate_timings': /kisskb/src/drivers/gpu/drm/drm_edid.c:3275:2: error: call to '__compiletime_assert_3282' declared with attribute error: BUILD_BUG_ON failed: cea_mode_for_vic(8)->vtotal != 262 || cea_mode_for_vic(9)->vtotal != 262 || cea_mode_for_vic(12)->vtotal != 262 || cea_mode_for_vic(13)->vtotal != 262 || cea_mode_for_vic(23)->vtotal != 312 || cea_mode_for_vic(24)->vtotal != 312 || cea_mode_for_vic(27)->vtotal != 312 || cea_mode_for_vic(28)->vtotal != 312 /kisskb/src/drivers/gpu/drm/drm_edid.c:3997: confused by earlier errors, bailing out make[4]: *** [/kisskb/src/scripts/Makefile.build:266: drivers/gpu/drm/drm_edid.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:503: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:503: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1681: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/fs/io_uring.c: In function '__io_sqe_files_update': /kisskb/src/fs/io_uring.c:5713:13: warning: 'err' may be used uninitialized in this function [-Wuninitialized] make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_stx_gp3_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-fixes_85xx_stx_gp3_defconfig_powerpc-gcc4.6 # Build took: 0:00:48.137475