From patchwork Wed Jun 8 08:34:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 860962 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p588aUn8000363 for ; Wed, 8 Jun 2011 08:36:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755028Ab1FHIgF (ORCPT ); Wed, 8 Jun 2011 04:36:05 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:58874 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754942Ab1FHIgA (ORCPT ); Wed, 8 Jun 2011 04:36:00 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so310820wwa.1 for ; Wed, 08 Jun 2011 01:35:59 -0700 (PDT) Received: by 10.216.61.135 with SMTP id w7mr4778297wec.19.1307522159619; Wed, 08 Jun 2011 01:35:59 -0700 (PDT) Received: from localhost.localdomain (46-116-119-47.bb.netvision.net.il [46.116.119.47]) by mx.google.com with ESMTPS id fl19sm223759wbb.49.2011.06.08.01.35.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Jun 2011 01:35:59 -0700 (PDT) From: Ohad Ben-Cohen To: Joerg Roedel Cc: , , , Arnd Bergmann , David Brown , David Woodhouse , , , Ohad Ben-Cohen Subject: [PATCH 3/4] x86: amd_iommu: move to drivers/iommu/ Date: Wed, 8 Jun 2011 11:34:21 +0300 Message-Id: <1307522062-19273-4-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1307522062-19273-1-git-send-email-ohad@wizery.com> References: <1307522062-19273-1-git-send-email-ohad@wizery.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Jun 2011 08:36:30 +0000 (UTC) This should ease finding similarities with different platforms, with the intention of solving problems once in a generic framework which everyone can use. Compile-tested on x86_64. Signed-off-by: Ohad Ben-Cohen --- arch/x86/Kconfig | 28 ------------------------ arch/x86/kernel/Makefile | 2 +- drivers/iommu/Kconfig | 28 ++++++++++++++++++++++++ drivers/iommu/Makefile | 1 + {arch/x86/kernel => drivers/iommu}/amd_iommu.c | 0 5 files changed, 30 insertions(+), 29 deletions(-) rename {arch/x86/kernel => drivers/iommu}/amd_iommu.c (100%) diff --git a/arch/x86/kernel/amd_iommu.c b/drivers/iommu/amd_iommu.c similarity index 100% rename from arch/x86/kernel/amd_iommu.c rename to drivers/iommu/amd_iommu.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 460d573..1b6a2e2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -680,34 +680,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT Calgary anyway, pass 'iommu=calgary' on the kernel command line. If unsure, say Y. -config AMD_IOMMU - bool "AMD IOMMU support" - select SWIOTLB - select PCI_MSI - select PCI_IOV - select IOMMU_API - depends on X86_64 && PCI && ACPI - ---help--- - With this option you can enable support for AMD IOMMU hardware in - your system. An IOMMU is a hardware component which provides - remapping of DMA memory accesses from devices. With an AMD IOMMU you - can isolate the the DMA memory of different devices and protect the - system from misbehaving device drivers or hardware. - - You can find out if your system has an AMD IOMMU if you look into - your BIOS for an option to enable it or if you have an IVRS ACPI - table. - -config AMD_IOMMU_STATS - bool "Export AMD IOMMU statistics to debugfs" - depends on AMD_IOMMU - select DEBUG_FS - ---help--- - This option enables code in the AMD IOMMU driver to collect various - statistics about whats happening in the driver and exports that - information to userspace via debugfs. - If unsure, say N. - # need this always selected by IOMMU for the VIA workaround config SWIOTLB def_bool y if X86_64 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 90b06d4..aef0298 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -123,7 +123,7 @@ ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_GART_IOMMU) += amd_gart_64.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o - obj-$(CONFIG_AMD_IOMMU) += amd_iommu_init.o amd_iommu.o + obj-$(CONFIG_AMD_IOMMU) += amd_iommu_init.o obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o obj-y += vsmp_64.o diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index c6d667c..555f5a8 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -12,3 +12,31 @@ config MSM_IOMMU cores within the multimedia subsystem. If unsure, say N here. + +config AMD_IOMMU + bool "AMD IOMMU support" + select SWIOTLB + select PCI_MSI + select PCI_IOV + select IOMMU_API + depends on X86_64 && PCI && ACPI + ---help--- + With this option you can enable support for AMD IOMMU hardware in + your system. An IOMMU is a hardware component which provides + remapping of DMA memory accesses from devices. With an AMD IOMMU you + can isolate the the DMA memory of different devices and protect the + system from misbehaving device drivers or hardware. + + You can find out if your system has an AMD IOMMU if you look into + your BIOS for an option to enable it or if you have an IVRS ACPI + table. + +config AMD_IOMMU_STATS + bool "Export AMD IOMMU statistics to debugfs" + depends on AMD_IOMMU + select DEBUG_FS + ---help--- + This option enables code in the AMD IOMMU driver to collect various + statistics about whats happening in the driver and exports that + information to userspace via debugfs. + If unsure, say N. diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index a7e66fa..d099d39 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_MSM_IOMMU) += msm-iommu.o +obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o