• Will Deacon's avatar
    iommu/arm-smmu-v3: Fix compilation when CONFIG_CMA=n · 900a85ca
    Will Deacon authored
    When compiling a kernel without support for CMA, CONFIG_CMA_ALIGNMENT
    is not defined which results in the following build failure:
    
    In file included from ./include/linux/list.h:9:0
                     from ./include/linux/kobject.h:19,
                     from ./include/linux/of.h:17
                     from ./include/linux/irqdomain.h:35,
                     from ./include/linux/acpi.h:13,
                     from drivers/iommu/arm-smmu-v3.c:12:
    drivers/iommu/arm-smmu-v3.c: In function ‘arm_smmu_device_hw_probe’:
    drivers/iommu/arm-smmu-v3.c:194:40: error: ‘CONFIG_CMA_ALIGNMENT’ undeclared (first use in this function)
     #define Q_MAX_SZ_SHIFT   (PAGE_SHIFT + CONFIG_CMA_ALIGNMENT)
    
    Fix the breakage by capping the maximum queue size based on MAX_ORDER
    when CMA is not enabled.
    Reported-by: default avatarZhangshaokun <zhangshaokun@hisilicon.com>
    Signed-off-by: default avatarWill Deacon <will@kernel.org>
    Tested-by: default avatarShaokun Zhang <zhangshaokun@hisilicon.com>
    Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
    900a85ca
arm-smmu-v3.c 82 KB