* [PATCH] dma: tegra: move smmu.h into SMMU driver
@ 2012-09-04 22:36 Stephen Warren
2012-09-05 4:39 ` Hiroshi Doyu
2012-09-18 10:41 ` Joerg Roedel
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Warren @ 2012-09-04 22:36 UTC (permalink / raw)
To: Joerg Roedel; +Cc: Hiroshi Doyu, linux-kernel, linux-tegra, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
There's no need to place these defines into arch/arm/mach-tegra/include/.
Move them into the SMMU driver to clean up mach-tegra, as a pre-requisite
for single-zImage.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
---
arch/arm/mach-tegra/include/mach/smmu.h | 63 -------------------------------
drivers/iommu/tegra-smmu.c | 41 +++++++++++++++++++-
2 files changed, 40 insertions(+), 64 deletions(-)
delete mode 100644 arch/arm/mach-tegra/include/mach/smmu.h
diff --git a/arch/arm/mach-tegra/include/mach/smmu.h b/arch/arm/mach-tegra/include/mach/smmu.h
deleted file mode 100644
index dad403a..0000000
--- a/arch/arm/mach-tegra/include/mach/smmu.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * IOMMU API for SMMU in Tegra30
- *
- * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MACH_SMMU_H
-#define MACH_SMMU_H
-
-enum smmu_hwgrp {
- HWGRP_AFI,
- HWGRP_AVPC,
- HWGRP_DC,
- HWGRP_DCB,
- HWGRP_EPP,
- HWGRP_G2,
- HWGRP_HC,
- HWGRP_HDA,
- HWGRP_ISP,
- HWGRP_MPE,
- HWGRP_NV,
- HWGRP_NV2,
- HWGRP_PPCS,
- HWGRP_SATA,
- HWGRP_VDE,
- HWGRP_VI,
-
- HWGRP_COUNT,
-
- HWGRP_END = ~0,
-};
-
-#define HWG_AFI (1 << HWGRP_AFI)
-#define HWG_AVPC (1 << HWGRP_AVPC)
-#define HWG_DC (1 << HWGRP_DC)
-#define HWG_DCB (1 << HWGRP_DCB)
-#define HWG_EPP (1 << HWGRP_EPP)
-#define HWG_G2 (1 << HWGRP_G2)
-#define HWG_HC (1 << HWGRP_HC)
-#define HWG_HDA (1 << HWGRP_HDA)
-#define HWG_ISP (1 << HWGRP_ISP)
-#define HWG_MPE (1 << HWGRP_MPE)
-#define HWG_NV (1 << HWGRP_NV)
-#define HWG_NV2 (1 << HWGRP_NV2)
-#define HWG_PPCS (1 << HWGRP_PPCS)
-#define HWG_SATA (1 << HWGRP_SATA)
-#define HWG_VDE (1 << HWGRP_VDE)
-#define HWG_VI (1 << HWGRP_VI)
-
-#endif /* MACH_SMMU_H */
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index c749f96..0b4d62e 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -39,9 +39,48 @@
#include <asm/cacheflush.h>
#include <mach/iomap.h>
-#include <mach/smmu.h>
#include <mach/tegra-ahb.h>
+enum smmu_hwgrp {
+ HWGRP_AFI,
+ HWGRP_AVPC,
+ HWGRP_DC,
+ HWGRP_DCB,
+ HWGRP_EPP,
+ HWGRP_G2,
+ HWGRP_HC,
+ HWGRP_HDA,
+ HWGRP_ISP,
+ HWGRP_MPE,
+ HWGRP_NV,
+ HWGRP_NV2,
+ HWGRP_PPCS,
+ HWGRP_SATA,
+ HWGRP_VDE,
+ HWGRP_VI,
+
+ HWGRP_COUNT,
+
+ HWGRP_END = ~0,
+};
+
+#define HWG_AFI (1 << HWGRP_AFI)
+#define HWG_AVPC (1 << HWGRP_AVPC)
+#define HWG_DC (1 << HWGRP_DC)
+#define HWG_DCB (1 << HWGRP_DCB)
+#define HWG_EPP (1 << HWGRP_EPP)
+#define HWG_G2 (1 << HWGRP_G2)
+#define HWG_HC (1 << HWGRP_HC)
+#define HWG_HDA (1 << HWGRP_HDA)
+#define HWG_ISP (1 << HWGRP_ISP)
+#define HWG_MPE (1 << HWGRP_MPE)
+#define HWG_NV (1 << HWGRP_NV)
+#define HWG_NV2 (1 << HWGRP_NV2)
+#define HWG_PPCS (1 << HWGRP_PPCS)
+#define HWG_SATA (1 << HWGRP_SATA)
+#define HWG_VDE (1 << HWGRP_VDE)
+#define HWG_VI (1 << HWGRP_VI)
+
/* bitmap of the page sizes currently supported */
#define SMMU_IOMMU_PGSIZES (SZ_4K)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dma: tegra: move smmu.h into SMMU driver
2012-09-04 22:36 [PATCH] dma: tegra: move smmu.h into SMMU driver Stephen Warren
@ 2012-09-05 4:39 ` Hiroshi Doyu
2012-09-18 10:41 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Hiroshi Doyu @ 2012-09-05 4:39 UTC (permalink / raw)
To: Joerg Roedel, Stephen Warren
Cc: linux-kernel, linux-tegra, Stephen Warren, iommu
On Wed, 5 Sep 2012 00:36:15 +0200
Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> There's no need to place these defines into arch/arm/mach-tegra/include/.
> Move them into the SMMU driver to clean up mach-tegra, as a pre-requisite
> for single-zImage.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Ok to me. Acked-by: Hiroshi Doyu <hdoyu@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dma: tegra: move smmu.h into SMMU driver
2012-09-04 22:36 [PATCH] dma: tegra: move smmu.h into SMMU driver Stephen Warren
2012-09-05 4:39 ` Hiroshi Doyu
@ 2012-09-18 10:41 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2012-09-18 10:41 UTC (permalink / raw)
To: Stephen Warren; +Cc: Hiroshi Doyu, linux-kernel, linux-tegra, Stephen Warren
On Tue, Sep 04, 2012 at 04:36:15PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> There's no need to place these defines into arch/arm/mach-tegra/include/.
> Move them into the SMMU driver to clean up mach-tegra, as a pre-requisite
> for single-zImage.
Applied, thanks.
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-18 10:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04 22:36 [PATCH] dma: tegra: move smmu.h into SMMU driver Stephen Warren
2012-09-05 4:39 ` Hiroshi Doyu
2012-09-18 10:41 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).