On Tue, May 18, 2021 at 09:19:22PM +0000, John Stultz wrote:
> Allow the qcom_scm driver to be loadable as a permenent module.
> 
> This still uses the "depends on QCOM_SCM || !QCOM_SCM" bit to
> ensure that drivers that call into the qcom_scm driver are
> also built as modules. While not ideal in some cases its the
> only safe way I can find to avoid build errors without having
> those drivers select QCOM_SCM and have to force it on (as
> QCOM_SCM=n can be valid for those drivers).
> 
> Reviving this now that Saravana's fw_devlink defaults to on,
> which should avoid loading troubles seen before.
> 
> Cc: Catalin Marinas <catalin.mari...@arm.com>
> Cc: Will Deacon <w...@kernel.org>
> Cc: Andy Gross <agr...@kernel.org>
> Cc: Bjorn Andersson <bjorn.anders...@linaro.org>
> Cc: Joerg Roedel <j...@8bytes.org>
> Cc: Thomas Gleixner <t...@linutronix.de>
> Cc: Jason Cooper <ja...@lakedaemon.net>
> Cc: Marc Zyngier <m...@kernel.org>
> Cc: Linus Walleij <linus.wall...@linaro.org>
> Cc: Vinod Koul <vk...@kernel.org>
> Cc: Kalle Valo <kv...@codeaurora.org>
> Cc: Maulik Shah <mks...@codeaurora.org>
> Cc: Lina Iyer <il...@codeaurora.org>
> Cc: Saravana Kannan <sarava...@google.com>
> Cc: Todd Kjos <tk...@google.com>
> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> Cc: linux-arm-...@vger.kernel.org
> Cc: iommu@lists.linux-foundation.org
> Cc: linux-g...@vger.kernel.org
> Acked-by: Kalle Valo <kv...@codeaurora.org>
> Acked-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> Reviewed-by: Bjorn Andersson <bjorn.anders...@linaro.org>
> Signed-off-by: John Stultz <john.stu...@linaro.org>
> ---
> v3:
> * Fix __arm_smccc_smc build issue reported by
>   kernel test robot <l...@intel.com>
> v4:
> * Add "depends on QCOM_SCM || !QCOM_SCM" bit to ath10k
>   config that requires it.
> v5:
> * Fix QCOM_QCM typo in Kconfig, it should be QCOM_SCM
> ---
>  drivers/firmware/Kconfig                | 2 +-
>  drivers/firmware/Makefile               | 3 ++-
>  drivers/firmware/qcom_scm.c             | 4 ++++
>  drivers/iommu/Kconfig                   | 2 ++
>  drivers/net/wireless/ath/ath10k/Kconfig | 1 +
>  5 files changed, 10 insertions(+), 2 deletions(-)

[...]

> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index 1f111b399bcab..38f7b7a8e2843 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -253,6 +253,7 @@ config SPAPR_TCE_IOMMU
>  config ARM_SMMU
>       tristate "ARM Ltd. System MMU (SMMU) Support"
>       depends on ARM64 || ARM || (COMPILE_TEST && !GENERIC_ATOMIC64)
> +     depends on QCOM_SCM || !QCOM_SCM #if QCOM_SCM=m this can't be =y
>       select IOMMU_API
>       select IOMMU_IO_PGTABLE_LPAE
>       select ARM_DMA_USE_IOMMU if ARM
> @@ -382,6 +383,7 @@ config QCOM_IOMMU
>       # Note: iommu drivers cannot (yet?) be built as modules
>       bool "Qualcomm IOMMU Support"
>       depends on ARCH_QCOM || (COMPILE_TEST && !GENERIC_ATOMIC64)
> +     depends on QCOM_SCM=y
>       select IOMMU_API
>       select IOMMU_IO_PGTABLE_LPAE
>       select ARM_DMA_USE_IOMMU

For this part:

Acked-by: Will Deacon <w...@kernel.org>

Will
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to