From patchwork Sat Oct 31 00:38:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 320047 Delivered-To: patches@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp1877997ilc; Fri, 30 Oct 2020 17:38:49 -0700 (PDT) X-Received: by 2002:a17:90a:d104:: with SMTP id l4mr1108353pju.194.1604104729818; Fri, 30 Oct 2020 17:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604104729; cv=none; d=google.com; s=arc-20160816; b=q6Ruvd4y9vr6Bu3xdd41wwdvCYw6jMVaoN27EZTzACKRfYoQLjQSxCSj8PmioXBE4E 34d0CshSPerZXyY7a0Gi+HX8I2dIRAE/y21AVpPCKrE3YxFVPWm86DGoCjtjb1bt+JEO F2nNhnSDb4say1fD+w+cN/Hktc0pU23KZcFDZU6sJ/hk5wve6P5dVelAJfXlXyd4thyN pGjJjrys7Y6V8XOI8TDtbW+kr0yFgUmtzNi5Wrej2LPs7OKKPK2phLQAzarrpTNx0BwJ h/4/jahSO8S8P1Wcg9VF5Rpbx2Kxpu1FMF9PJG3tGyji++Q+02l10BWmjuxEA6eTsYui 8odw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yA2UcD5w0CT+PM1DULWZKIc164WCwUoZBWYCRPIo66o=; b=IMSEsdCSDWUr6lAebaKcFmVctrv9F7wwSJOx2ns+aJlMsU4yWTGRFSxVDdKD0iFthw 1Pf3Q6xiYoVW0R9jIFOuZpy5wDGfN4CO3rKt4fojwZ5IwtGBcghQRE0BXNU5ai0zJ1lP dssnQoPu4rXrP5lSdRBcAE37MUYm3tok8XviAvWDL5HVnyT5TelQNalA/bQj3Uo8YCOy Sm4NCfZDMopVHTi60YBwW3wHEeIJgMZmHs6rnN3oXnRqcroLbHzCGFe7HsAOODKlE7Yt h174mok5CswbsWAW4/lj+S339iaUWwF50PQ19X4+JGhDfVP5BUljTePbl6L/CndKuSng dK/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cZiDpC6S; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l140sor3784221pfd.79.2020.10.30.17.38.49 for (Google Transport Security); Fri, 30 Oct 2020 17:38:49 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cZiDpC6S; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yA2UcD5w0CT+PM1DULWZKIc164WCwUoZBWYCRPIo66o=; b=cZiDpC6SgpLZbBvy/+Kw5NdQzqs+OZs5fRZm5sL3HtiOGyqOD2VsPGJxx81ZYWF6vo +E03rh9hdaXNdr2nAYL/oQPXKKF+gWs53Bmaf1JDgpxh4WbDxQgNwqC5aYdc8FngwgFA kpytNyjatvLNd3DcPqplt43hviGVXtxTrQZ8HrNE8aGzk2POD4bDqr1qxb4oiv5IeK/Q 9qcU54AYfVS8jIy2JosJIIC0YytfJQEAYMnNwIMHFREr8WqitAn8sictDjAIjTI6mI9Z YulCbqmeK5VpD0pRgS9brNsvw7PafDMUeouKVimkDWdGzi8LmHJnr+1JCPhulrtZbp1R dy4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yA2UcD5w0CT+PM1DULWZKIc164WCwUoZBWYCRPIo66o=; b=Yheruy/9W0C+Yw5DB1z/6Yt7h6AjbQalHGmEjkh7vXlPldYgPqSBUNpk8Yq174jP5J 669/GaqC3BkzDSXH200FLMWz1fB8YFYplA/dVsDH7SevQWLJiQ9RZhsqWE1poiD/Wail Gy2zB11vaZJPQP0WX1pv7JfeL2kILErzj/6nv3mcgd4o/qlZhdeQoBIg55EbLx2enXwl /stflvmC37HsmvOPlriuRfyRKIlJ1dYbTjDf8mGxNwKSdU6hjC+rAPnILo6V0tU400Y3 NNm3Fiy9OizJMXFfq05FtCkQmZMNQE5aH5Ggqg3TIquuft+9+WzHUbtQHKT4OejeSsqR wIWw== X-Gm-Message-State: AOAM530h0ldcPugC3TkZPZEnffi6dUjE1BrFASOjcJ4fpxaS0Jp4qHID bd9x22XeTe1xJ8QJSFhs8PBrglmR X-Google-Smtp-Source: ABdhPJynBoHxximDY2NwM66xUqKr1dDz0rODEMnFQ1WcCY9nNQTo3RXNrIXXcCOoX1PCwOaRSNxdBA== X-Received: by 2002:a62:1686:0:b029:155:3b11:b454 with SMTP id 128-20020a6216860000b02901553b11b454mr11710845pfw.47.1604104729501; Fri, 30 Oct 2020 17:38:49 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id z16sm7074509pfq.33.2020.10.30.17.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 17:38:48 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Catalin Marinas , Will Deacon , Andy Gross , Bjorn Andersson , Joerg Roedel , Thomas Gleixner , Jason Cooper , Marc Zyngier , Linus Walleij , Vinod Koul , Kalle Valo , Maulik Shah , Lina Iyer , Saravana Kannan , Todd Kjos , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, iommu@lists.linux-foundation.org, linux-gpio@vger.kernel.org Subject: [PATCH v5 2/2] firmware: QCOM_SCM: Allow qcom_scm driver to be loadable as a permenent module Date: Sat, 31 Oct 2020 00:38:45 +0000 Message-Id: <20201031003845.41137-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201031003845.41137-1-john.stultz@linaro.org> References: <20201031003845.41137-1-john.stultz@linaro.org> 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). Cc: Catalin Marinas Cc: Will Deacon Cc: Andy Gross Cc: Bjorn Andersson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier Cc: Linus Walleij Cc: Vinod Koul Cc: Kalle Valo Cc: Maulik Shah Cc: Lina Iyer Cc: Saravana Kannan Cc: Todd Kjos Cc: Greg Kroah-Hartman Cc: linux-arm-msm@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-gpio@vger.kernel.org Acked-by: Greg Kroah-Hartman Signed-off-by: John Stultz --- v3: * Fix __arm_smccc_smc build issue reported by kernel test robot 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 | 4 ++-- drivers/firmware/Makefile | 3 ++- drivers/firmware/qcom_scm.c | 4 ++++ drivers/iommu/Kconfig | 2 ++ drivers/net/wireless/ath/ath10k/Kconfig | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 3315e3c215864..5e369928bc567 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -235,8 +235,8 @@ config INTEL_STRATIX10_RSU Say Y here if you want Intel RSU support. config QCOM_SCM - bool - depends on ARM || ARM64 + tristate "Qcom SCM driver" + depends on (ARM && HAVE_ARM_SMCCC) || ARM64 select RESET_CONTROLLER config QCOM_SCM_DOWNLOAD_MODE_DEFAULT diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 5e013b6a3692e..523173cbff335 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -17,7 +17,8 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o -obj-$(CONFIG_QCOM_SCM) += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o +obj-$(CONFIG_QCOM_SCM) += qcom-scm.o +qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o obj-$(CONFIG_TURRIS_MOX_RWTM) += turris-mox-rwtm.o diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 7be48c1bec96d..6f431b73e617d 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1280,6 +1280,7 @@ static const struct of_device_id qcom_scm_dt_match[] = { { .compatible = "qcom,scm" }, {} }; +MODULE_DEVICE_TABLE(of, qcom_scm_dt_match); static struct platform_driver qcom_scm_driver = { .driver = { @@ -1295,3 +1296,6 @@ static int __init qcom_scm_init(void) return platform_driver_register(&qcom_scm_driver); } subsys_initcall(qcom_scm_init); + +MODULE_DESCRIPTION("Qualcomm Technologies, Inc. SCM driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 04878caf6da49..c64d7a2b65134 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -248,6 +248,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 @@ -375,6 +376,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 diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig index 40f91bc8514d8..741289e385d59 100644 --- a/drivers/net/wireless/ath/ath10k/Kconfig +++ b/drivers/net/wireless/ath/ath10k/Kconfig @@ -44,6 +44,7 @@ config ATH10K_SNOC tristate "Qualcomm ath10k SNOC support" depends on ATH10K depends on ARCH_QCOM || COMPILE_TEST + depends on QCOM_SCM || !QCOM_SCM #if QCOM_SCM=m this can't be =y select QCOM_QMI_HELPERS help This module adds support for integrated WCN3990 chip connected