From: Hiroshi DOYU <hdoyu@nvidia.com> To: hdoyu@nvidia.com Cc: linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.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-kernel@vger.kernel.org Subject: [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB Date: Thu, 3 May 2012 19:05:43 +0300 [thread overview] Message-ID: <1336061147-10245-2-git-send-email-hdoyu@nvidia.com> (raw) In-Reply-To: <1336061147-10245-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/amba/tegra-ahb.c | 32 ++++++++++++++++++++++++++ 2 files changed, 51 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..e0f8c84 --- /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(struct device_node *ahb); + +#endif /* __MACH_TEGRA_AHB_H__ */ diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index 03933f3..ec4e22f 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -76,6 +76,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, @@ -124,6 +128,34 @@ 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_match_by_smmu(struct device *dev, void *data) +{ + struct tegra_ahb *ahb = dev_get_drvdata(dev); + struct device_node *dn = data; + + return (ahb->dev->of_node == dn) ? 1 : 0; +} + +int tegra_ahb_enable_smmu(struct device_node *dn) +{ + struct device *dev; + u32 val; + struct tegra_ahb *ahb; + + dev = driver_find_device(&tegra_ahb_driver.driver, NULL, dn, + tegra_ahb_match_by_smmu); + if (!dev) + return -EPROBE_DEFER; + 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; +} +EXPORT_SYMBOL(tegra_ahb_enable_smmu); +#endif + static int tegra_ahb_suspend(struct device *dev) { int i; -- 1.7.5.4
WARNING: multiple messages have this Message-ID (diff)
From: hdoyu@nvidia.com (Hiroshi DOYU) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB Date: Thu, 3 May 2012 19:05:43 +0300 [thread overview] Message-ID: <1336061147-10245-2-git-send-email-hdoyu@nvidia.com> (raw) In-Reply-To: <1336061147-10245-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/amba/tegra-ahb.c | 32 ++++++++++++++++++++++++++ 2 files changed, 51 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..e0f8c84 --- /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(struct device_node *ahb); + +#endif /* __MACH_TEGRA_AHB_H__ */ diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index 03933f3..ec4e22f 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -76,6 +76,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, @@ -124,6 +128,34 @@ 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_match_by_smmu(struct device *dev, void *data) +{ + struct tegra_ahb *ahb = dev_get_drvdata(dev); + struct device_node *dn = data; + + return (ahb->dev->of_node == dn) ? 1 : 0; +} + +int tegra_ahb_enable_smmu(struct device_node *dn) +{ + struct device *dev; + u32 val; + struct tegra_ahb *ahb; + + dev = driver_find_device(&tegra_ahb_driver.driver, NULL, dn, + tegra_ahb_match_by_smmu); + if (!dev) + return -EPROBE_DEFER; + 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; +} +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-05-03 16:05 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-05-03 16:05 [PATCHv3 1/4] ARM: tegra: Add Tegra AHB driver Hiroshi DOYU 2012-05-03 16:05 ` Hiroshi DOYU 2012-05-03 16:05 ` Hiroshi DOYU 2012-05-03 16:05 ` Hiroshi DOYU [this message] 2012-05-03 16:05 ` [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB Hiroshi DOYU [not found] ` <1336061147-10245-2-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-03 17:43 ` Stephen Warren 2012-05-03 17:43 ` Stephen Warren 2012-05-03 17:43 ` Stephen Warren 2012-05-03 16:05 ` [PATCHv3 3/4] iommu/tegra: smmu: Refrain from accessing to AHB Hiroshi DOYU 2012-05-03 16:05 ` Hiroshi DOYU [not found] ` <1336061147-10245-3-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-03 17:48 ` Stephen Warren 2012-05-03 17:48 ` Stephen Warren 2012-05-03 17:48 ` Stephen Warren 2012-05-03 17:58 ` Stephen Warren 2012-05-03 17:58 ` Stephen Warren [not found] ` <4FA2C746.5080000-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-04 6:36 ` Hiroshi Doyu 2012-05-04 6:36 ` Hiroshi Doyu 2012-05-04 6:36 ` Hiroshi Doyu [not found] ` <4FA2C4E9.2080509-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-03 17:54 ` Hiroshi Doyu 2012-05-03 17:54 ` Hiroshi Doyu 2012-05-03 17:54 ` Hiroshi Doyu 2012-05-04 6:33 ` Hiroshi Doyu 2012-05-04 6:33 ` Hiroshi Doyu 2012-05-04 6:33 ` Hiroshi Doyu [not found] ` <20120504.093358.2098007825524274078.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-04 16:51 ` Stephen Warren 2012-05-04 16:51 ` Stephen Warren 2012-05-04 16:51 ` Stephen Warren [not found] ` <1336061147-10245-1-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-03 16:05 ` [PATCHv3 4/4] ARM: dt: tegra: Add device tree support for AHB Hiroshi DOYU 2012-05-03 16:05 ` Hiroshi DOYU 2012-05-03 16:05 ` Hiroshi DOYU [not found] ` <1336061147-10245-4-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-03 17:50 ` Stephen Warren 2012-05-03 17:50 ` Stephen Warren 2012-05-03 17:50 ` Stephen Warren 2012-05-03 17:41 ` [PATCHv3 1/4] ARM: tegra: Add Tegra AHB driver Stephen Warren 2012-05-03 17:41 ` Stephen Warren 2012-05-03 17:41 ` Stephen Warren [not found] ` <4FA2C34F.5060406-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-04 6:17 ` Hiroshi Doyu 2012-05-04 6:17 ` Hiroshi Doyu 2012-05-04 6:17 ` Hiroshi Doyu [not found] ` <20120504.091736.839941449020176796.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-04 16:48 ` Stephen Warren 2012-05-04 16:48 ` Stephen Warren 2012-05-04 16:48 ` Stephen Warren [not found] ` <4FA40878.7070709-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-07 6:06 ` Hiroshi Doyu 2012-05-07 6:06 ` Hiroshi Doyu 2012-05-07 6:06 ` Hiroshi Doyu 2012-05-03 17:59 ` Stephen Warren 2012-05-03 17:59 ` Stephen Warren 2012-05-03 17:59 ` Stephen Warren [not found] ` <4FA2C785.2080703-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-05-04 6:40 ` Hiroshi Doyu 2012-05-04 6:40 ` Hiroshi Doyu 2012-05-04 6:40 ` Hiroshi Doyu 2012-05-04 6:40 ` Hiroshi Doyu [not found] ` <20120504.094030.1816474762821188264.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-05-04 8:40 ` Arnd Bergmann 2012-05-04 8:40 ` Arnd Bergmann 2012-05-04 8:40 ` Arnd Bergmann 2012-05-04 16:50 ` Stephen Warren 2012-05-04 16:50 ` Stephen Warren 2012-05-04 16:50 ` Stephen Warren -- strict thread matches above, loose matches on Subject: below -- 2012-04-25 11:07 [PATCHv3 1/4] ARM: tegra: Add " Hiroshi DOYU 2012-04-25 11:07 ` [PATCHv3 2/4] ARM: tegra: Add SMMU enabler in AHB Hiroshi DOYU 2012-04-25 11:07 ` Hiroshi DOYU [not found] ` <1335352072-4001-2-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-04-25 11:29 ` Felipe Balbi 2012-04-25 11:29 ` Felipe Balbi 2012-04-25 11:29 ` Felipe Balbi [not found] ` <20120425112950.GC3564-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org> 2012-04-25 15:51 ` Stephen Warren 2012-04-25 15:51 ` Stephen Warren 2012-04-25 15:51 ` Stephen Warren 2012-04-26 5:37 ` Hiroshi Doyu 2012-04-26 5:37 ` Hiroshi Doyu 2012-04-26 5:37 ` Hiroshi Doyu 2012-04-26 19:55 ` Stephen Warren 2012-04-26 19:55 ` Stephen Warren 2012-04-26 19:55 ` Stephen Warren 2012-04-26 20:26 ` Felipe Balbi 2012-04-26 20:26 ` Felipe Balbi [not found] ` <20120426202610.GA30690-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org> 2012-04-26 20:32 ` Stephen Warren 2012-04-26 20:32 ` Stephen Warren 2012-04-26 20:32 ` Stephen Warren 2012-04-26 20:38 ` Felipe Balbi 2012-04-26 20:38 ` Felipe Balbi 2012-04-27 6:48 ` Hiroshi Doyu 2012-04-27 6:48 ` Hiroshi Doyu 2012-04-27 6:48 ` Hiroshi Doyu [not found] ` <20120427.094826.1181797260264746303.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2012-04-27 6:55 ` Hiroshi Doyu 2012-04-27 6:55 ` Hiroshi Doyu 2012-04-27 6:55 ` Hiroshi Doyu 2012-04-27 15:49 ` Stephen Warren 2012-04-27 15:49 ` Stephen Warren 2012-04-27 15:49 ` 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=1336061147-10245-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.