From: Hiroshi DOYU <hdoyu@nvidia.com>
To: swarren@nvidia.com
Cc: linux-tegra@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Hiroshi DOYU <hdoyu@nvidia.com>, 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-kernel@vger.kernel.org
Subject: [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB
Date: Wed, 25 Apr 2012 14:07:37 +0300 [thread overview]
Message-ID: <1335352072-4001-2-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1335352072-4001-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 +++++++++++++++++++
drivers/platform/arm/tegra-ahb.c | 24 ++++++++++++++++++++++++
2 files changed, 43 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..296688c
--- /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 int tegra_ahb_enable_smmu(void);
+
+#endif /* __MACH_TEGRA_AHB_H__ */
diff --git a/drivers/platform/arm/tegra-ahb.c b/drivers/platform/arm/tegra-ahb.c
index dcad2ec..7ad9dfd 100644
--- a/drivers/platform/arm/tegra-ahb.c
+++ b/drivers/platform/arm/tegra-ahb.c
@@ -78,6 +78,10 @@
#define AHB_ARBITRATION_AHB_MEM_WRQUE_MST_ID 0xf8
+#define AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE BIT(17)
+
+static struct platform_driver tegra_ahb_driver;
+
static u32 tegra_ahb_gizmo[] = {
AHB_ARBITRATION_DISABLE,
AHB_ARBITRATION_PRIORITY_CTRL,
@@ -126,6 +130,26 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset)
writel(value, ahb->regs + offset);
}
+#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+static int __tegra_ahb_enable_smmu(struct device *dev, void *data)
+{
+ u32 val;
+ struct tegra_ahb *ahb = dev_get_drvdata(dev);
+
+ val = gizmo_readl(ahb, AHB_ARBITRATION_XBAR_CTRL);
+ val |= AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE;
+ gizmo_writel(ahb, val, AHB_ARBITRATION_XBAR_CTRL);
+ return 0;
+}
+
+int tegra_ahb_enable_smmu(void)
+{
+ return driver_for_each_device(&tegra_ahb_driver.driver, NULL, NULL,
+ __tegra_ahb_enable_smmu);
+}
+EXPORT_SYMBOL(tegra_ahb_enable_smmu);
+#endif
+
static int tegra_ahb_suspend(struct device *dev)
{
int i;
--
1.7.5.4
next prev parent reply other threads:[~2012-04-25 11:08 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-25 11:07 [PATCHv3 1/4] ARM: tegra: Add AHB driver Hiroshi DOYU
2012-04-25 11:07 ` Hiroshi DOYU [this message]
2012-04-25 11:29 ` [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB Felipe Balbi
2012-04-25 15:51 ` Stephen Warren
2012-04-26 5:37 ` Hiroshi Doyu
2012-04-26 19:55 ` Stephen Warren
2012-04-26 20:26 ` Felipe Balbi
2012-04-26 20:32 ` Stephen Warren
2012-04-26 20:38 ` Felipe Balbi
2012-04-27 6:48 ` Hiroshi Doyu
2012-04-27 6:55 ` Hiroshi Doyu
2012-04-27 15:49 ` Stephen Warren
2012-04-25 11:07 ` [PATCHv3 3/4] iommu/tegra: smmu: Refrain from accessing to AHB registers Hiroshi DOYU
2012-04-26 19:58 ` Stephen Warren
2012-04-25 11:07 ` [PATCHv3 4/4] ARM: dt: tegra: Add device tree support for AHB Hiroshi DOYU
2012-04-26 20:01 ` Stephen Warren
2012-04-25 11:25 ` [PATCHv3 1/4] ARM: tegra: Add AHB driver Felipe Balbi
2012-04-25 13:01 ` Hiroshi Doyu
2012-04-26 19:51 ` Stephen Warren
2012-04-26 21:59 ` Russell King - ARM Linux
2012-04-27 5:40 ` Hiroshi Doyu
2012-04-30 14:47 ` Arnd Bergmann
2012-05-03 16:05 [PATCHv3 1/4] ARM: tegra: Add Tegra " Hiroshi DOYU
2012-05-03 16:05 ` [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB Hiroshi DOYU
2012-05-03 17:43 ` Stephen Warren
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=1335352072-4001-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@nvidia.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
Powered by JetHome