From: Hiroshi DOYU <hdoyu@nvidia.com>
To: hdoyu@nvidia.com
Cc: linux-tegra@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Stephen Warren <swarren@wwwdotorg.org>,
Russell King <linux@arm.linux.org.uk>,
Tony Lindgren <tony@atomide.com>,
H Hartley Sweeten <hsweeten@visionengravers.com>,
Jamie Iles <jamie@jamieiles.com>,
Rob Herring <rob.herring@calxeda.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] ARM: tegra: Add SMMU enabler in AHB
Date: Tue, 24 Apr 2012 15:05:15 +0300 [thread overview]
Message-ID: <1335269116-9578-2-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1335269116-9578-1-git-send-email-hdoyu@nvidia.com>
Add extern func, "tegra_ahb_enable_smmu()" to inform AHB that SMMU is
ready.
Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
Cc: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-tegra/include/mach/tegra-ahb.h | 19 +++++++++++++++++++
arch/arm/mach-tegra/tegra-ahb.c | 18 ++++++++++++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/tegra-ahb.h b/arch/arm/mach-tegra/include/mach/tegra-ahb.h
new file mode 100644
index 0000000..51a5800
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/tegra-ahb.h
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+#ifndef __MACH_TEGRA_AHB_H__
+#define __MACH_TEGRA_AHB_H__
+
+extern void tegra_ahb_enable_smmu(void);
+
+#endif /* __MACH_TEGRA_AHB_H__ */
diff --git a/arch/arm/mach-tegra/tegra-ahb.c b/arch/arm/mach-tegra/tegra-ahb.c
index 71b5950..32794ef 100644
--- a/arch/arm/mach-tegra/tegra-ahb.c
+++ b/arch/arm/mach-tegra/tegra-ahb.c
@@ -78,6 +78,9 @@
#define AHB_ARBITRATION_AHB_MEM_WRQUE_MST_ID 0xf8
+#define AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE_DONE 1
+#define AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE_SHIFT 17
+
struct __tegra_ahb {
void __iomem *regs;
struct device *dev;
@@ -95,6 +98,21 @@ static inline void gizmo_writel(unsigned long value, unsigned long offset)
writel(value, tegra_ahb->regs + offset);
}
+#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+
+void tegra_ahb_enable_smmu(void)
+{
+ unsigned long val;
+
+ val = gizmo_readl(AHB_ARBITRATION_XBAR_CTRL);
+ val |= AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE_DONE <<
+ AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE_SHIFT;
+ gizmo_writel(val, AHB_ARBITRATION_XBAR_CTRL);
+}
+EXPORT_SYMBOL(tegra_ahb_enable_smmu);
+
+#endif
+
struct __ahb_gizmo {
unsigned long offset;
unsigned long data;
--
1.7.5.4
next prev parent reply other threads:[~2012-04-24 12:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 12:05 [PATCH v2 1/3] ARM: tegra: Add AHB driver Hiroshi DOYU
2012-04-24 12:05 ` Hiroshi DOYU [this message]
2012-04-24 12:32 ` [PATCH v2 2/3] ARM: tegra: Add SMMU enabler in AHB Felipe Balbi
[not found] ` <20120424123248.GG8444-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-04-24 12:39 ` Hiroshi Doyu
[not found] ` <20120424.153930.1438573079107186567.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2012-04-24 12:41 ` Felipe Balbi
[not found] ` <20120424124115.GL8444-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-04-24 13:03 ` Hiroshi Doyu
2012-04-24 13:25 ` Felipe Balbi
[not found] ` <1335269116-9578-2-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2012-04-24 19:59 ` Russell King - ARM Linux
[not found] ` <1335269116-9578-1-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2012-04-24 12:05 ` [PATCH v2 3/3] iommu/tegra: smmu: Refrain from accessing to AHB registers Hiroshi DOYU
2012-04-24 12:16 ` [PATCH v2 1/3] ARM: tegra: Add AHB driver Felipe Balbi
[not found] ` <20120424121619.GF8444-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-04-24 19:49 ` Stephen Warren
[not found] ` <4F9703C2.50002-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2012-04-24 20:31 ` Felipe Balbi
2012-04-24 19:56 ` Russell King - ARM Linux
[not found] ` <20120424195645.GB3628-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2012-04-25 5:37 ` Hiroshi Doyu
[not found] ` <20120425083747.466f5c98330af8964d980b8c-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2012-04-25 7:46 ` Felipe Balbi
2012-04-25 12:15 ` Arnd Bergmann
[not found] ` <201204251215.22889.arnd-r2nGTMty4D4@public.gmane.org>
2012-04-25 15:59 ` Stephen Warren
[not found] ` <4F981F6C.2050807-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2012-04-26 5:49 ` Hiroshi Doyu
2012-04-26 8:14 ` Peter De Schrijver
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=1335269116-9578-2-git-send-email-hdoyu@nvidia.com \
--to=hdoyu@nvidia.com \
--cc=balbi@ti.com \
--cc=ccross@android.com \
--cc=hsweeten@visionengravers.com \
--cc=jamie@jamieiles.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=rob.herring@calxeda.com \
--cc=swarren@wwwdotorg.org \
--cc=tony@atomide.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox