From patchwork Fri Oct 30 06:12:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 319992 Delivered-To: patches@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp1119021ilc; Thu, 29 Oct 2020 23:12:50 -0700 (PDT) X-Received: by 2002:a17:902:b7c4:b029:d6:855a:df2c with SMTP id v4-20020a170902b7c4b02900d6855adf2cmr7627408plz.26.1604038370766; Thu, 29 Oct 2020 23:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604038370; cv=none; d=google.com; s=arc-20160816; b=dW+BQbOZD6iKnKs5W1YdxMRVpHVwkSUSHJ7ue2lRP9UgMnypgGOxSxoTheKGungUMn mym41FW96WLd7qF0Z9iZwkcaQGstDmdcbz+DfbsijQZLyZq0vl7Kcenxg1jcjLSNF5Dv oLqMZ7IlEB4Uljj01DJ2UuCRmEbxrQ5Cglm4HZ/A+X5mL6SssIb3rAQqCKXztV15USrV HkhEXh30X/ZMagwqqvDykvCvdVnLn8Myrqg/w1bczPoFjyk/Fj48mx5eGrcwDxXNBinG tMWufHdowdL7eePPML3KrVur9aWtK8CgomcpeTwAHLQRu39MnE4y99cHiNgHLzmjqlYA C1yQ== 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=XL8dlYsys8f0rEfjnC/wd7q6iLsC0pHXJKRnSKdn6W0=; b=Lnt8nnXBPaZBw8ZmvLW08i3HvecN3MDcaPPpFI8zLiuwTslpbJ3NxmuTDZV/noImOZ /DQWbp3iWWHx4CSLKVVG6xz3aON5l/Zip7kvfr/D/QKxs7YWj6mKaJdF30NJYYXeLnmg rk1FW13fYd2s1vbCSjI6UrqaZkXvCAsR3DiyYqFUQQu1j207pQxuUoloA0Zaq2KHEn7S vy1KlOU+Ii8jScdskN3EQf+rqhM0LLw1uz6iB/V6YfAq1yzMbbKkWKy8CtLQV+SffLIa l49S5gC0fqhx2Xx4Ai77wQ3ggVvAiG5ypOD/ImBt2I6AhwoA/dDwhhQPDz9eMzdDeY0c 7s0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ucSFacNK; 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 f9sor1255609pjh.43.2020.10.29.23.12.50 for (Google Transport Security); Thu, 29 Oct 2020 23:12:50 -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=ucSFacNK; 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=XL8dlYsys8f0rEfjnC/wd7q6iLsC0pHXJKRnSKdn6W0=; b=ucSFacNKSmrbhaPRrbT06cNK4cn7SZCAXWRWXeTSC4eyKPhMAvV4sbRJURDUCvylhE dPNrSm6ZcTRFKgxhL9AOI5bQnJloDfjgSC/MS7Cul+7L99g94eSAHfonJqxcPlTiSz34 9Dp8VD1Q80/06hvO/55VEt8eQwgOOUHaVf3jJnnuBC2f2BFklX1H+VKUj5/OPUvWq9pg 3eTo6+ilJZeIMaRpinteFozW+tRqEQD3WpXsEx0MqVIvKIQ06+3SNLhcKMuwdX2drWSF rX8eMLB86Jaj6vbersTaCrpxcuk2Abxo8Nml5Y3QEuf4NrQorRCFQG3MuKdaerjxZOcG f33Q== 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=XL8dlYsys8f0rEfjnC/wd7q6iLsC0pHXJKRnSKdn6W0=; b=leg0ZuxE4qbl6GDEC4lajpMHe7OkdW9WX1/D9NkkyC5yqqVSs9ZOFOi+JGQ3IBdVsf W5+K/XaYXNrOGPBr1zwUPD+wBZHkQuQIo4bSZ/EWh9f5xnLn56c1Ikcgv9ePLE1Bm0Pu cLd9UQO6eXPMYk5pxL9tyVBhlSydTApUfTSwvUdTrmLIP2TDHTIPFSRk41YLU/+4RanM tG3zpEGNrQe91SzJ8WdQiSK1+cpF2mqxCN1cIW6xfuTdzeP+ywwz2eMaove/pO3CCrhb grgO1GMoA2FgrJOQngtd7ZsDPZ8GHneAerVCHyoJqciGeyME3/iVRum9CaIm165dChwU t86A== X-Gm-Message-State: AOAM533BIyigWa429KMrV8v7JoFb0VGAa4Ha7WZoWb6/Ob1u8K8Jxs90 rhDwQ7TsRxgg6dJcz/PE53FuiHuZNzVDOZyT X-Google-Smtp-Source: ABdhPJyKJNlJnOp6EgkD/F2N0FG3RRqQHjvvRb+m5P60VJ9zj6tXMSeu/PtwAy/EU9rovtjIcG+cGg== X-Received: by 2002:a17:90a:2c46:: with SMTP id p6mr988289pjm.166.1604038370505; Thu, 29 Oct 2020 23:12:50 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-67-170-172-113.hsd1.or.comcast.net. [67.170.172.113]) by smtp.gmail.com with ESMTPSA id e2sm4461569pgd.27.2020.10.29.23.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 23:12:49 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Andy Gross , Bjorn Andersson , Joerg Roedel , Thomas Gleixner , Jason Cooper , Marc Zyngier , Linus Walleij , 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 v4 2/2] firmware: QCOM_SCM: Allow qcom_scm driver to be loadable as a permenent module Date: Fri, 30 Oct 2020 06:12:42 +0000 Message-Id: <20201030061242.92510-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201030061242.92510-1-john.stultz@linaro.org> References: <20201030061242.92510-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: Andy Gross Cc: Bjorn Andersson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier Cc: Linus Walleij 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. --- 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..a490e78890017 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_QCM || !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