From patchwork Mon Jun 30 16:51:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olav Haugan X-Patchwork-Id: 4453181 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AE97F9F390 for ; Mon, 30 Jun 2014 16:52:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B756820364 for ; Mon, 30 Jun 2014 16:52:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7441E2034B for ; Mon, 30 Jun 2014 16:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754279AbaF3QwY (ORCPT ); Mon, 30 Jun 2014 12:52:24 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:57495 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752643AbaF3QwY (ORCPT ); Mon, 30 Jun 2014 12:52:24 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 7F60513FEAA; Mon, 30 Jun 2014 16:52:23 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 669AF13FEB2; Mon, 30 Jun 2014 16:52:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from ohaugan-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: ohaugan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C64A813FEAA; Mon, 30 Jun 2014 16:52:21 +0000 (UTC) From: Olav Haugan 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 Subject: [RFC/PATCH 1/7] iommu: msm: Rename iommu driver files Date: Mon, 30 Jun 2014 09:51:50 -0700 Message-Id: <1404147116-4598-2-git-send-email-ohaugan@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1404147116-4598-1-git-send-email-ohaugan@codeaurora.org> References: <1404147116-4598-1-git-send-email-ohaugan@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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/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 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 #include -#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 #include -#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu_hw-v0.h" #include "msm_iommu.h" struct iommu_ctx_iter_data {