From: Olav Haugan <ohaugan@codeaurora.org> To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org Cc: linux-arm-msm@vger.kernel.org, will.deacon@arm.com, thierry.reding@gmail.com, joro@8bytes.org, vgandhi@codeaurora.org, Olav Haugan <ohaugan@codeaurora.org> Subject: [RFC/PATCH 1/7] iommu: msm: Rename iommu driver files Date: Mon, 30 Jun 2014 09:51:50 -0700 [thread overview] Message-ID: <1404147116-4598-2-git-send-email-ohaugan@codeaurora.org> (raw) In-Reply-To: <1404147116-4598-1-git-send-email-ohaugan@codeaurora.org> Rename the MSM IOMMU driver for MSM8960 SoC to "-v0" version to align with hardware version number for next generation MSM IOMMU (v1). Signed-off-by: Olav Haugan <ohaugan@codeaurora.org> --- arch/arm/configs/qcom_defconfig | 2 +- drivers/iommu/Kconfig | 11 +++++++++-- drivers/iommu/Makefile | 2 +- drivers/iommu/{msm_iommu.c => msm_iommu-v0.c} | 2 +- drivers/iommu/{msm_iommu_dev.c => msm_iommu_dev-v0.c} | 2 +- drivers/iommu/{msm_iommu_hw-8xxx.h => msm_iommu_hw-v0.h} | 0 6 files changed, 13 insertions(+), 6 deletions(-) rename drivers/iommu/{msm_iommu.c => msm_iommu-v0.c} (99%) rename drivers/iommu/{msm_iommu_dev.c => msm_iommu_dev-v0.c} (99%) rename drivers/iommu/{msm_iommu_hw-8xxx.h => msm_iommu_hw-v0.h} (100%) diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 42ebd72..0414889 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -136,7 +136,7 @@ CONFIG_COMMON_CLK_QCOM=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y -CONFIG_MSM_IOMMU=y +CONFIG_MSM_IOMMU_V0=y CONFIG_GENERIC_PHY=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index d260605..705a257 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -28,12 +28,19 @@ config FSL_PAMU transaction types. # MSM IOMMU support + +# MSM_IOMMU always gets selected by whoever wants it. config MSM_IOMMU - bool "MSM IOMMU Support" + bool + +# MSM IOMMUv0 support +config MSM_IOMMU_V0 + bool "MSM IOMMUv0 Support" depends on ARCH_MSM8X60 || ARCH_MSM8960 select IOMMU_API + select MSM_IOMMU help - Support for the IOMMUs found on certain Qualcomm SOCs. + Support for the IOMMUs (v0) found on certain Qualcomm SOCs. These IOMMUs allow virtualization of the address space used by most cores within the multimedia subsystem. diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 8893bad..894ced9 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,7 +1,7 @@ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_IOMMU_API) += iommu-traces.o obj-$(CONFIG_OF_IOMMU) += of_iommu.o -obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o +obj-$(CONFIG_MSM_IOMMU_V0) += msm_iommu-v0.o msm_iommu_dev-v0.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o obj-$(CONFIG_ARM_SMMU) += arm-smmu.o diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu-v0.c similarity index 99% rename from drivers/iommu/msm_iommu.c rename to drivers/iommu/msm_iommu-v0.c index f5ff657..17731061 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu-v0.c @@ -31,7 +31,7 @@ #include <asm/cacheflush.h> #include <asm/sizes.h> -#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu_hw-v0.h" #include "msm_iommu.h" #define MRC(reg, processor, op1, crn, crm, op2) \ diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev-v0.c similarity index 99% rename from drivers/iommu/msm_iommu_dev.c rename to drivers/iommu/msm_iommu_dev-v0.c index 61def7cb..2f86e46 100644 --- a/drivers/iommu/msm_iommu_dev.c +++ b/drivers/iommu/msm_iommu_dev-v0.c @@ -27,7 +27,7 @@ #include <linux/err.h> #include <linux/slab.h> -#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu_hw-v0.h" #include "msm_iommu.h" struct iommu_ctx_iter_data { diff --git a/drivers/iommu/msm_iommu_hw-8xxx.h b/drivers/iommu/msm_iommu_hw-v0.h similarity index 100% rename from drivers/iommu/msm_iommu_hw-8xxx.h rename to drivers/iommu/msm_iommu_hw-v0.h -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: ohaugan@codeaurora.org (Olav Haugan) To: linux-arm-kernel@lists.infradead.org Subject: [RFC/PATCH 1/7] iommu: msm: Rename iommu driver files Date: Mon, 30 Jun 2014 09:51:50 -0700 [thread overview] Message-ID: <1404147116-4598-2-git-send-email-ohaugan@codeaurora.org> (raw) In-Reply-To: <1404147116-4598-1-git-send-email-ohaugan@codeaurora.org> Rename the MSM IOMMU driver for MSM8960 SoC to "-v0" version to align with hardware version number for next generation MSM IOMMU (v1). Signed-off-by: Olav Haugan <ohaugan@codeaurora.org> --- arch/arm/configs/qcom_defconfig | 2 +- drivers/iommu/Kconfig | 11 +++++++++-- drivers/iommu/Makefile | 2 +- drivers/iommu/{msm_iommu.c => msm_iommu-v0.c} | 2 +- drivers/iommu/{msm_iommu_dev.c => msm_iommu_dev-v0.c} | 2 +- drivers/iommu/{msm_iommu_hw-8xxx.h => msm_iommu_hw-v0.h} | 0 6 files changed, 13 insertions(+), 6 deletions(-) rename drivers/iommu/{msm_iommu.c => msm_iommu-v0.c} (99%) rename drivers/iommu/{msm_iommu_dev.c => msm_iommu_dev-v0.c} (99%) rename drivers/iommu/{msm_iommu_hw-8xxx.h => msm_iommu_hw-v0.h} (100%) diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 42ebd72..0414889 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -136,7 +136,7 @@ CONFIG_COMMON_CLK_QCOM=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y -CONFIG_MSM_IOMMU=y +CONFIG_MSM_IOMMU_V0=y CONFIG_GENERIC_PHY=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index d260605..705a257 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -28,12 +28,19 @@ config FSL_PAMU transaction types. # MSM IOMMU support + +# MSM_IOMMU always gets selected by whoever wants it. config MSM_IOMMU - bool "MSM IOMMU Support" + bool + +# MSM IOMMUv0 support +config MSM_IOMMU_V0 + bool "MSM IOMMUv0 Support" depends on ARCH_MSM8X60 || ARCH_MSM8960 select IOMMU_API + select MSM_IOMMU help - Support for the IOMMUs found on certain Qualcomm SOCs. + Support for the IOMMUs (v0) found on certain Qualcomm SOCs. These IOMMUs allow virtualization of the address space used by most cores within the multimedia subsystem. diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 8893bad..894ced9 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,7 +1,7 @@ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_IOMMU_API) += iommu-traces.o obj-$(CONFIG_OF_IOMMU) += of_iommu.o -obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o +obj-$(CONFIG_MSM_IOMMU_V0) += msm_iommu-v0.o msm_iommu_dev-v0.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o obj-$(CONFIG_ARM_SMMU) += arm-smmu.o diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu-v0.c similarity index 99% rename from drivers/iommu/msm_iommu.c rename to drivers/iommu/msm_iommu-v0.c index f5ff657..17731061 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu-v0.c @@ -31,7 +31,7 @@ #include <asm/cacheflush.h> #include <asm/sizes.h> -#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu_hw-v0.h" #include "msm_iommu.h" #define MRC(reg, processor, op1, crn, crm, op2) \ diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev-v0.c similarity index 99% rename from drivers/iommu/msm_iommu_dev.c rename to drivers/iommu/msm_iommu_dev-v0.c index 61def7cb..2f86e46 100644 --- a/drivers/iommu/msm_iommu_dev.c +++ b/drivers/iommu/msm_iommu_dev-v0.c @@ -27,7 +27,7 @@ #include <linux/err.h> #include <linux/slab.h> -#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu_hw-v0.h" #include "msm_iommu.h" struct iommu_ctx_iter_data { diff --git a/drivers/iommu/msm_iommu_hw-8xxx.h b/drivers/iommu/msm_iommu_hw-v0.h similarity index 100% rename from drivers/iommu/msm_iommu_hw-8xxx.h rename to drivers/iommu/msm_iommu_hw-v0.h -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2014-06-30 16:52 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-30 16:51 [RFC/PATCH 0/7] Add MSM SMMUv1 support Olav Haugan 2014-06-30 16:51 ` Olav Haugan 2014-06-30 16:51 ` Olav Haugan [this message] 2014-06-30 16:51 ` [RFC/PATCH 1/7] iommu: msm: Rename iommu driver files Olav Haugan 2014-06-30 16:51 ` [RFC/PATCH 2/7] iommu-api: Add map_range/unmap_range functions Olav Haugan 2014-06-30 16:51 ` Olav Haugan 2014-06-30 19:42 ` Thierry Reding 2014-06-30 19:42 ` Thierry Reding 2014-07-01 9:33 ` Will Deacon 2014-07-01 9:33 ` Will Deacon 2014-07-01 9:58 ` Varun Sethi 2014-07-01 9:58 ` Varun Sethi 2014-07-04 4:29 ` Hiroshi Doyu 2014-07-04 4:29 ` Hiroshi Doyu 2014-07-08 21:53 ` Olav Haugan 2014-07-08 21:53 ` Olav Haugan 2014-07-08 23:49 ` Rob Clark 2014-07-08 23:49 ` Rob Clark 2014-07-10 0:03 ` Olav Haugan 2014-07-10 0:03 ` Olav Haugan [not found] ` <53BDD834.5030405-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2014-07-10 0:40 ` Rob Clark 2014-07-10 0:40 ` Rob Clark 2014-07-10 7:10 ` Thierry Reding 2014-07-10 7:10 ` Thierry Reding 2014-07-10 11:15 ` Rob Clark 2014-07-10 11:15 ` Rob Clark [not found] ` <CAF6AEGucNbo7sm9oQWFq9hcfoSeR5DuwRcRUvG+Y2sxLaM7OTQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-07-10 22:43 ` Olav Haugan 2014-07-10 22:43 ` Olav Haugan 2014-07-10 23:42 ` Rob Clark 2014-07-10 23:42 ` Rob Clark 2014-07-11 10:20 ` Joerg Roedel 2014-07-11 10:20 ` Joerg Roedel [not found] ` <20140711102053.GB1958-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> 2014-07-15 1:13 ` Olav Haugan 2014-07-15 1:13 ` Olav Haugan [not found] ` <1404147116-4598-1-git-send-email-ohaugan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2014-06-30 16:51 ` [RFC/PATCH 3/7] iopoll: Introduce memory-mapped IO polling macros Olav Haugan 2014-06-30 16:51 ` Olav Haugan [not found] ` <1404147116-4598-4-git-send-email-ohaugan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2014-06-30 19:46 ` Thierry Reding 2014-06-30 19:46 ` Thierry Reding 2014-07-01 9:40 ` Will Deacon 2014-07-01 9:40 ` Will Deacon 2014-06-30 16:51 ` [RFC/PATCH 4/7] iommu: msm: Add MSM IOMMUv1 driver Olav Haugan [not found] ` <1404147116-4598-5-git-send-email-ohaugan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2014-06-30 17:02 ` Will Deacon 2014-06-30 17:02 ` Will Deacon [not found] ` <20140630170221.GA30740-5wv7dgnIgG8@public.gmane.org> 2014-07-02 22:32 ` Olav Haugan 2014-07-02 22:32 ` Olav Haugan 2014-06-30 16:51 ` [RFC/PATCH 5/7] iommu: msm: Add support for V7L page table format Olav Haugan 2014-06-30 16:51 ` Olav Haugan 2014-06-30 16:51 ` [RFC/PATCH 6/7] defconfig: msm: Enable Qualcomm SMMUv1 driver Olav Haugan 2014-06-30 16:51 ` Olav Haugan 2014-06-30 16:51 ` [RFC/PATCH 7/7] iommu-api: Add domain attribute to enable coherent HTW Olav Haugan 2014-06-30 16:51 ` Olav Haugan [not found] ` <1404147116-4598-8-git-send-email-ohaugan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2014-07-01 8:49 ` Varun Sethi 2014-07-01 8:49 ` Varun Sethi 2014-07-02 22:11 ` Olav Haugan 2014-07-02 22:11 ` Olav Haugan [not found] ` <53B48381.9050707-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2014-07-03 17:43 ` Will Deacon 2014-07-03 17:43 ` Will Deacon [not found] ` <20140703174321.GE17372-5wv7dgnIgG8@public.gmane.org> 2014-07-08 22:24 ` Olav Haugan 2014-07-08 22:24 ` Olav Haugan
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=1404147116-4598-2-git-send-email-ohaugan@codeaurora.org \ --to=ohaugan@codeaurora.org \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=thierry.reding@gmail.com \ --cc=vgandhi@codeaurora.org \ --cc=will.deacon@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: linkBe 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.