# 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-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-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_85xx_tqm8548_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- 85xx/tqm8548_defconfig # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_tqm8548_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_tqm8548_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_tqm8548_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/sched/sch_frag.c: In function 'sch_fragment': /kisskb/src/net/sched/sch_frag.c:93:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable sch_frag_rt = { 0 }; ^ /kisskb/src/net/sched/sch_frag.c:93:10: warning: (near initialization for 'sch_frag_rt.dst') [-Wmissing-braces] INFO: Uncompressed kernel (size 0x586e2c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5767a0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.13.0-rc2-g59cc84c802eb Created: Sun Jun 6 23:34:30 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2792832 Bytes = 2727.38 KiB = 2.66 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.13.0-rc2-g59cc84c802eb Created: Sun Jun 6 23:34:30 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2823180 Bytes = 2757.01 KiB = 2.69 MiB Load Address: 00600000 Entry Point: 006002a4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_85xx_tqm8548_defconfig_powerpc-gcc4.9 # Build took: 0:00:30.991527