All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will@kernel.org>
To: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Robin Murphy <robin.murphy@arm.com>,
	Will Deacon <will@kernel.org>
Subject: [PATCH 5/7] iommu/arm-smmu-v3: Allow building as a module
Date: Wed, 30 Oct 2019 14:51:10 +0000	[thread overview]
Message-ID: <20191030145112.19738-6-will@kernel.org> (raw)
In-Reply-To: <20191030145112.19738-1-will@kernel.org>

By removing the redundant call to 'pci_request_acs()' we can allow the
ARM SMMUv3 driver to be built as a module.

Signed-off-by: Will Deacon <will@kernel.org>
---
 drivers/iommu/Kconfig       | 2 +-
 drivers/iommu/arm-smmu-v3.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e3842eabcfdd..7583d47fc4d5 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -388,7 +388,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
 	  config.
 
 config ARM_SMMU_V3
-	bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support"
+	tristate "ARM Ltd. System MMU Version 3 (SMMUv3) Support"
 	depends on ARM64
 	select IOMMU_API
 	select IOMMU_IO_PGTABLE_LPAE
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 2ad8e2ca0583..56ce4ba2fcbe 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -3657,7 +3657,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_PCI
 	if (pci_bus_type.iommu_ops != &arm_smmu_ops) {
-		pci_request_acs();
 		ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
 		if (ret)
 			return ret;
-- 
2.24.0.rc0.303.g954a862665-goog

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

WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org>
To: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>,
	Joerg Roedel <joro@8bytes.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: [PATCH 5/7] iommu/arm-smmu-v3: Allow building as a module
Date: Wed, 30 Oct 2019 14:51:10 +0000	[thread overview]
Message-ID: <20191030145112.19738-6-will@kernel.org> (raw)
In-Reply-To: <20191030145112.19738-1-will@kernel.org>

By removing the redundant call to 'pci_request_acs()' we can allow the
ARM SMMUv3 driver to be built as a module.

Signed-off-by: Will Deacon <will@kernel.org>
---
 drivers/iommu/Kconfig       | 2 +-
 drivers/iommu/arm-smmu-v3.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e3842eabcfdd..7583d47fc4d5 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -388,7 +388,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
 	  config.
 
 config ARM_SMMU_V3
-	bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support"
+	tristate "ARM Ltd. System MMU Version 3 (SMMUv3) Support"
 	depends on ARM64
 	select IOMMU_API
 	select IOMMU_IO_PGTABLE_LPAE
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 2ad8e2ca0583..56ce4ba2fcbe 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -3657,7 +3657,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_PCI
 	if (pci_bus_type.iommu_ops != &arm_smmu_ops) {
-		pci_request_acs();
 		ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
 		if (ret)
 			return ret;
-- 
2.24.0.rc0.303.g954a862665-goog


  parent reply	other threads:[~2019-10-30 14:52 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-30 14:51 [PATCH 0/7] iommu: Permit modular builds of ARM SMMU[v3] drivers Will Deacon
2019-10-30 14:51 ` Will Deacon
2019-10-30 14:51 ` [PATCH 1/7] drivers/iommu: Export core IOMMU API symbols to permit modular drivers Will Deacon
2019-10-30 14:51   ` Will Deacon
2019-10-30 14:51 ` [PATCH 2/7] iommu/of: Request ACS from the PCI core when configuring IOMMU linkage Will Deacon
2019-10-30 14:51   ` Will Deacon
2019-10-30 14:51 ` [PATCH 3/7] PCI: Export pci_ats_disabled() as a GPL symbol to modules Will Deacon
2019-10-30 14:51   ` Will Deacon
2019-10-30 20:30   ` Bjorn Helgaas
2019-10-30 20:30     ` Bjorn Helgaas
2019-10-30 14:51 ` [PATCH 4/7] Revert "iommu/arm-smmu: Make arm-smmu-v3 explicitly non-modular" Will Deacon
2019-10-30 14:51   ` Will Deacon
2019-10-30 14:51 ` Will Deacon [this message]
2019-10-30 14:51   ` [PATCH 5/7] iommu/arm-smmu-v3: Allow building as a module Will Deacon
2019-10-30 19:31   ` Joerg Roedel
2019-10-30 19:31     ` Joerg Roedel
2019-10-31 15:42     ` Will Deacon
2019-10-31 15:42       ` Will Deacon
2019-11-04 19:15       ` Jean-Philippe Brucker
2019-11-04 19:15         ` Jean-Philippe Brucker
2019-11-08 14:54         ` Will Deacon
2019-11-08 14:54           ` Will Deacon
2019-11-05 12:15       ` Joerg Roedel
2019-11-05 12:15         ` Joerg Roedel
2019-11-08 11:03         ` Will Deacon
2019-11-08 11:03           ` Will Deacon
2019-10-30 14:51 ` [PATCH 6/7] Revert "iommu/arm-smmu: Make arm-smmu explicitly non-modular" Will Deacon
2019-10-30 14:51   ` Will Deacon
2019-10-30 23:09   ` Jordan Crouse
2019-10-30 23:09     ` Jordan Crouse
2019-10-31 12:03     ` Will Deacon
2019-10-31 12:03       ` Will Deacon
2019-10-31 15:32       ` Jordan Crouse
2019-10-31 15:32         ` Jordan Crouse
2019-10-30 14:51 ` [PATCH 7/7] iommu/arm-smmu: Allow building as a module Will Deacon
2019-10-30 14:51   ` Will Deacon
2019-10-30 15:22   ` Rob Herring
2019-10-30 15:22     ` Rob Herring
2019-10-30 15:26     ` Will Deacon
2019-10-30 15:26       ` Will Deacon
2019-10-30 15:33     ` Robin Murphy
2019-10-30 15:33       ` Robin Murphy
2019-11-04 19:34   ` Isaac J. Manjarres
2019-11-04 19:34     ` Isaac J. Manjarres
2019-11-07 12:48     ` Will Deacon
2019-11-07 12:48       ` Will Deacon
2019-10-30 15:35 ` [PATCH 0/7] iommu: Permit modular builds of ARM SMMU[v3] drivers Robin Murphy
2019-10-30 15:35   ` Robin Murphy
2019-10-30 15:54   ` Will Deacon
2019-10-30 15:54     ` Will Deacon
2019-10-31  0:57     ` Saravana Kannan via iommu
2019-10-31  0:57       ` Saravana Kannan
2019-10-31 19:37       ` Jean-Philippe Brucker
2019-10-31 19:37         ` Jean-Philippe Brucker
2019-10-31 23:34         ` Saravana Kannan via iommu
2019-10-31 23:34           ` Saravana Kannan
2019-11-01 10:27           ` John Garry
2019-11-01 10:27             ` John Garry
2019-11-01 21:13             ` Saravana Kannan via iommu
2019-11-01 21:13               ` Saravana Kannan
2019-11-04 12:16               ` John Garry
2019-11-04 12:16                 ` John Garry
2019-11-04 13:29                 ` Robin Murphy
2019-11-04 13:29                   ` Robin Murphy
2019-11-07  6:11                   ` Saravana Kannan via iommu
2019-11-07  6:11                     ` Saravana Kannan
2019-11-07  9:13                     ` Jean-Philippe Brucker
2019-11-07  9:13                       ` Jean-Philippe Brucker
2019-11-07  6:02                 ` Saravana Kannan via iommu
2019-11-07  6:02                   ` Saravana Kannan
2019-11-01 11:41           ` Jean-Philippe Brucker
2019-11-01 11:41             ` Jean-Philippe Brucker
2019-11-01 12:28             ` Lorenzo Pieralisi
2019-11-01 12:28               ` Lorenzo Pieralisi
2019-11-01 21:26               ` Saravana Kannan via iommu
2019-11-01 21:26                 ` Saravana Kannan
2019-11-04 11:43                 ` Lorenzo Pieralisi
2019-11-04 11:43                   ` Lorenzo Pieralisi
2019-11-07  5:55                   ` Saravana Kannan via iommu
2019-11-07  5:55                     ` Saravana Kannan
2019-11-01 17:21         ` Will Deacon
2019-11-01 17:21           ` Will Deacon
2019-11-04  7:54           ` Jean-Philippe Brucker
2019-11-04  7:54             ` Jean-Philippe Brucker
2019-11-07  6:16       ` Saravana Kannan via iommu
2019-11-07  6:16         ` Saravana Kannan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191030145112.19738-6-will@kernel.org \
    --to=will@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robin.murphy@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.