iommu/arm-smmu-v3: Fix compilation when CONFIG_CMA=n
authorWill Deacon <will@kernel.org>
Tue, 2 Jul 2019 11:53:18 +0000 (12:53 +0100)
committerJoerg Roedel <jroedel@suse.de>
Tue, 2 Jul 2019 15:13:39 +0000 (17:13 +0200)
commit900a85ca43f4ae88c325a468cb8827e4852b9141
treeed931c69418e9c80e748bb8faca0f11cf9962472
parent3430abd6f403ce43375266798a8571646d15b5cd
iommu/arm-smmu-v3: Fix compilation when CONFIG_CMA=n

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: Zhangshaokun <zhangshaokun@hisilicon.com>
Signed-off-by: Will Deacon <will@kernel.org>
Tested-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/arm-smmu-v3.c