# git rev-parse -q --verify 59cc84c802eb923805e7bba425976a3df5ce35d8^{commit} 59cc84c802eb923805e7bba425976a3df5ce35d8 already have revision, skipping fetch # git checkout -q -f -B kisskb 59cc84c802eb923805e7bba425976a3df5ce35d8 # git clean -qxdf # < git log -1 # commit 59cc84c802eb923805e7bba425976a3df5ce35d8 # Author: Frederic Barrat # Date: Wed May 26 16:45:40 2021 +0200 # # Revert "powerpc/kernel/iommu: Align size for IOMMU_PAGE_SIZE() to save TCEs" # # This reverts commit 3c0468d4451eb6b4f6604370639f163f9637a479. # # That commit was breaking alignment guarantees for the DMA address when # allocating coherent mappings, as described in # Documentation/core-api/dma-api-howto.rst # # It was also noticed by Mellanox' driver: # [ 1515.763621] mlx5_core c002:01:00.0: mlx5_frag_buf_alloc_node:146:(pid 13402): unexpected map alignment: 0x0800000000c61000, page_shift=16 # [ 1515.763635] mlx5_core c002:01:00.0: mlx5_cqwq_create:181:(pid # 13402): mlx5_frag_buf_alloc_node() failed, -12 # # Fixes: 3c0468d4451e ("powerpc/kernel/iommu: Align size for IOMMU_PAGE_SIZE() to save TCEs") # Signed-off-by: Frederic Barrat # Reviewed-by: Alexey Kardashevskiy # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20210526144540.117795-1-fbarrat@linux.ibm.com # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 59cc84c802eb923805e7bba425976a3df5ce35d8 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_HUGETLB+4K_PAGES_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64_defconfig # Added to kconfig CONFIG_PPC_64K_PAGES=n # Added to kconfig CONFIG_PPC_4K_PAGES=y # Added to kconfig CONFIG_HUGETLBFS=n # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_HUGETLB+4K_PAGES_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_HUGETLB+4K_PAGES_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4415:warning: override: reassigning to symbol PPC_4K_PAGES # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_HUGETLB+4K_PAGES_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc64_defconfig+NO_HUGETLB+4K_PAGES_powerpc-gcc9 # Build took: 0:02:37.772023