Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ebfe8c authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

arm64: defconfig: Enable QTI_IOMMU_SUPPORT only on target configurations 



Selecting QTI_IOMMU_SUPPORT as part of ARM_SMMU is problematic
as ARM_SMMU will be enabled in the gki_defconfig, which adds the
APIs exposed by QTI_IOMMU_SUPPORT to the ABI surface. This is
not correct, as those symbols are not part of GKI. Thus, do not
select QTI_IOMMU_SUPPORT when ARM_SMMU is enabled, but rather
require for it to be enabled explicitly.

Change-Id: I587c206dd11deac5537d8c0efef42d4a16d42c49
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent 841fe8d5

abi_gki_aarch64_4bbb960644.xml

+21619 −21509

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/configs/vendor/lahaina_GKI.config

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ CONFIG_MSM_HSUSB_PHY=m 
CONFIG_MSM_CAMCC_LAHAINA=m

CONFIG_MSM_BT_POWER=m

CONFIG_ARM_SMMU=m

CONFIG_QTI_IOMMU_SUPPORT=m

CONFIG_MSM_CLK_AOP_QMP=m

CONFIG_MSM_SPSS_UTILS=m

CONFIG_IPA3=m

drivers/iommu/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -414,7 +414,6 @@ config ARM_SMMU 
	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE

	select ARM_DMA_USE_IOMMU if ARM

	select QTI_IOMMU_SUPPORT

	help

	  Support for implementations of the ARM System MMU architecture

	  versions 1 and 2.