From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CF09C433E3 for ; Fri, 24 Jul 2020 11:52:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 577C2206E3 for ; Fri, 24 Jul 2020 11:52:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2h2vQvxd"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="oxuUqCVF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 577C2206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mKeQnR19JDVxjAaOTbw0ab/BhUmR3PzYoK6F4wzmFc8=; b=2h2vQvxdqI3KgXBQio/DZF4pi XY9mIU80EPb43J4yy3AybFWmmn0aSBxbpt4mtbDx0cia42avpovFoeml2pIYdQOnudppWkzBuswtm Y/f7cXEkBka33m8ZXfunxB0ulD4WGZWOlEqHYU40e2XpM9i+MTm58G06bOLgGbFdjRvJNibflB24o O3hFevJL66fEoq7DopKQr1olc8i3iaHY+tMx0e446OP7jBXEd4/kPmzlYMB5FRQn2XNU0gRfHGumJ ITMG8jIS0eKmNpYi8IF8X2Dyr2Sv+suNyO2IofCpjqklBnyTipWBCw5jEdW6h/FdTvwofJ/pMx2ZE bvPl2bloQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jywEP-0005om-5C; Fri, 24 Jul 2020 11:51:17 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jywEM-0005ng-Lq for linux-arm-kernel@lists.infradead.org; Fri, 24 Jul 2020 11:51:15 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C55D8206E3; Fri, 24 Jul 2020 11:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595591473; bh=Xw3x5vASXphVNgXoqOa3wbQBOjeoPPtwQp6ERGqHuM0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oxuUqCVFGn0j5YrrBYniVsa6ZhQQDLo2WITIa7vuidKb0jFz5Nflf6cz9Ru7lGoa0 jnqHEEP8rMnnCMCz5ZuHmUyStcst5bb+InJqnhvC44JmstVHLoFLPE58Rt4LLo5IFf Cx6WQjMxsHT7hR6c0GuqOykpXe0PGkK25VgYXI8s= Date: Fri, 24 Jul 2020 12:51:09 +0100 From: Will Deacon To: Joerg Roedel Subject: Re: [GIT PULL] iommu/arm-smmu: Updates for 5.9 Message-ID: <20200724115109.GA17451@willie-the-truck> References: <20200721080352.GA13023@willie-the-truck> <20200722133323.GG27672@8bytes.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200722133323.GG27672@8bytes.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200724_075114_968905_9AEDDE0E X-CRM114-Status: GOOD ( 28.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-team@android.com, iommu@lists.linux-foundation.org, robin.murphy@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Joerg, On Wed, Jul 22, 2020 at 03:33:23PM +0200, Joerg Roedel wrote: > On Tue, Jul 21, 2020 at 09:03:53AM +0100, Will Deacon wrote: > > Please pull these Arm SMMU driver updates for 5.9. Summary is in the tag, > > but the main thing is support for two new SoC integrations, one of which > > is considerably more brain-dead than the other (determining which one is > > left as an exercise to the reader although the diffstat is fairly revealing). > > :) > > > The following changes since commit 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68: > > > > Linux 5.8-rc3 (2020-06-28 15:00:24 -0700) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-smmu-updates > > Pulled, thanks. Given the number of arm-smmu* files it probably makes > sense to create a drivers/iommu/arm-smmu/ directory and move it all > there. If you agree feel free to send this as an additional patch on-top > of this pull-request. Sure, that makes sense to me: I've included a diff below in case anybody has comments. I've tackled it slightly differently to how the intel and amd drivers are handled, since we have a header file (arm-smmu.h) which is shared by a couple of different drivers. I've also moved the v3 driver under the arm/ directory as Jean Philippe plans to split out the SVA work for 5.10. I'll send a second pull early next week if there are no objections (or you can pick this patch directly). Cheers, Will --->8 >From 0e4a152062600f7f43ea4ea47925d12ec3a477ab Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 24 Jul 2020 12:43:20 +0100 Subject: [PATCH] iommu/arm-smmu: Move Arm SMMU drivers into their own subdirectory The Arm SMMU drivers are getting fat on vendor value-add, so move them to their own subdirectory out of the way of the other IOMMU drivers. Suggested-by: Joerg Roedel Signed-off-by: Will Deacon --- MAINTAINERS | 2 +- drivers/iommu/Makefile | 5 +---- drivers/iommu/arm/Makefile | 2 ++ drivers/iommu/arm/arm-smmu-v3/Makefile | 2 ++ drivers/iommu/{ => arm/arm-smmu-v3}/arm-smmu-v3.c | 0 drivers/iommu/arm/arm-smmu/Makefile | 4 ++++ drivers/iommu/{ => arm/arm-smmu}/arm-smmu-impl.c | 0 drivers/iommu/{ => arm/arm-smmu}/arm-smmu-nvidia.c | 0 drivers/iommu/{ => arm/arm-smmu}/arm-smmu-qcom.c | 0 drivers/iommu/{ => arm/arm-smmu}/arm-smmu.c | 0 drivers/iommu/{ => arm/arm-smmu}/arm-smmu.h | 0 drivers/iommu/{ => arm/arm-smmu}/qcom_iommu.c | 0 12 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 drivers/iommu/arm/Makefile create mode 100644 drivers/iommu/arm/arm-smmu-v3/Makefile rename drivers/iommu/{ => arm/arm-smmu-v3}/arm-smmu-v3.c (100%) create mode 100644 drivers/iommu/arm/arm-smmu/Makefile rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-impl.c (100%) rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-nvidia.c (100%) rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-qcom.c (100%) rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu.c (100%) rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu.h (100%) rename drivers/iommu/{ => arm/arm-smmu}/qcom_iommu.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ee2c0ba13a0f..6383801828c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1498,7 +1498,7 @@ R: Robin Murphy L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/iommu/arm,smmu* -F: drivers/iommu/arm-smmu* +F: drivers/iommu/arm/ F: drivers/iommu/io-pgtable-arm-v7s.c F: drivers/iommu/io-pgtable-arm.c diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 2b8203db73ec..d971cffc810b 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +obj-y += arm/ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_IOMMU_API) += iommu-traces.o obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o @@ -14,9 +15,6 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o obj-$(CONFIG_AMD_IOMMU) += amd/iommu.o amd/init.o amd/quirks.o obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd/debugfs.o obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o -obj-$(CONFIG_ARM_SMMU) += arm_smmu.o -arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-nvidia.o arm-smmu-qcom.o -obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o @@ -35,6 +33,5 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) += s390-iommu.o -obj-$(CONFIG_QCOM_IOMMU) += qcom_iommu.o obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o diff --git a/drivers/iommu/arm/Makefile b/drivers/iommu/arm/Makefile new file mode 100644 index 000000000000..0f9efeab709f --- /dev/null +++ b/drivers/iommu/arm/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += arm-smmu/ arm-smmu-v3/ diff --git a/drivers/iommu/arm/arm-smmu-v3/Makefile b/drivers/iommu/arm/arm-smmu-v3/Makefile new file mode 100644 index 000000000000..569e24e9f162 --- /dev/null +++ b/drivers/iommu/arm/arm-smmu-v3/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c similarity index 100% rename from drivers/iommu/arm-smmu-v3.c rename to drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c diff --git a/drivers/iommu/arm/arm-smmu/Makefile b/drivers/iommu/arm/arm-smmu/Makefile new file mode 100644 index 000000000000..e240a7bcf310 --- /dev/null +++ b/drivers/iommu/arm/arm-smmu/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_QCOM_IOMMU) += qcom_iommu.o +obj-$(CONFIG_ARM_SMMU) += arm_smmu.o +arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-nvidia.o arm-smmu-qcom.o diff --git a/drivers/iommu/arm-smmu-impl.c b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c similarity index 100% rename from drivers/iommu/arm-smmu-impl.c rename to drivers/iommu/arm/arm-smmu/arm-smmu-impl.c diff --git a/drivers/iommu/arm-smmu-nvidia.c b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c similarity index 100% rename from drivers/iommu/arm-smmu-nvidia.c rename to drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c diff --git a/drivers/iommu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c similarity index 100% rename from drivers/iommu/arm-smmu-qcom.c rename to drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c similarity index 100% rename from drivers/iommu/arm-smmu.c rename to drivers/iommu/arm/arm-smmu/arm-smmu.c diff --git a/drivers/iommu/arm-smmu.h b/drivers/iommu/arm/arm-smmu/arm-smmu.h similarity index 100% rename from drivers/iommu/arm-smmu.h rename to drivers/iommu/arm/arm-smmu/arm-smmu.h diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c similarity index 100% rename from drivers/iommu/qcom_iommu.c rename to drivers/iommu/arm/arm-smmu/qcom_iommu.c -- 2.28.0.rc0.142.g3c755180ce-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel