[PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Hiroshi Doyu]

New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
whenever a new Tegra SoC comes.

The following combination caused build error, which this patch fixes.

CONFIG_ARCH_TEGRA_2x_SOC=y
\# CONFIG_ARCH_TEGRA_3x_SOC is not set
CONFIG_ARCH_TEGRA_114_SOC=y

drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
 drivers/amba/tegra-ahb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c
index ab92785..093c435 100644
--- a/drivers/amba/tegra-ahb.c
+++ b/drivers/amba/tegra-ahb.c
@@ -130,7 +130,7 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset)
 	writel(value, ahb->regs + offset);
 }
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_TEGRA_IOMMU_SMMU
 static int tegra_ahb_match_by_smmu(struct device *dev, void *data)
 {
 	struct tegra_ahb *ahb = dev_get_drvdata(dev);
-- 
1.7.9.5

Re: [PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Stephen Warren]

On 02/06/2013 11:34 AM, Hiroshi Doyu wrote:
> New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
> dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
> whenever a new Tegra SoC comes.
> 
> The following combination caused build error, which this patch fixes.
> 
> CONFIG_ARCH_TEGRA_2x_SOC=y
> \# CONFIG_ARCH_TEGRA_3x_SOC is not set
> CONFIG_ARCH_TEGRA_114_SOC=y
> 
> drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'

Tested-by: Stephen Warren <swarren@nvidia.com>

Russell, I assume Hiroshi should upload this to your patch tracker? It's
needed for 3.9.

Hiroshi, for reference, see:
http://www.arm.linux.org.uk/developer/patches/

Re: [PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Hiroshi Doyu]

Hi Russell,

Stephen Warren <swarren@wwwdotorg.org> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:

> On 02/06/2013 11:34 AM, Hiroshi Doyu wrote:
> > New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
> > dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
> > whenever a new Tegra SoC comes.
> > 
> > The following combination caused build error, which this patch fixes.
> > 
> > CONFIG_ARCH_TEGRA_2x_SOC=y
> > \# CONFIG_ARCH_TEGRA_3x_SOC is not set
> > CONFIG_ARCH_TEGRA_114_SOC=y
> > 
> > drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'
> 
> Tested-by: Stephen Warren <swarren@nvidia.com>
> 
> Russell, I assume Hiroshi should upload this to your patch tracker? It's
> needed for 3.9.

FYI: Submitted as:
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7640/1

Re: [PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Hiroshi Doyu]

Hiroshi Doyu <hdoyu@nvidia.com> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):

> Hi Russell,
> 
> Stephen Warren <swarren@wwwdotorg.org> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:
> 
> > On 02/06/2013 11:34 AM, Hiroshi Doyu wrote:
> > > New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
> > > dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
> > > whenever a new Tegra SoC comes.
> > > 
> > > The following combination caused build error, which this patch fixes.
> > > 
> > > CONFIG_ARCH_TEGRA_2x_SOC=y
> > > \# CONFIG_ARCH_TEGRA_3x_SOC is not set
> > > CONFIG_ARCH_TEGRA_114_SOC=y
> > > 
> > > drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'
> > 
> > Tested-by: Stephen Warren <swarren@nvidia.com>
> > 
> > Russell, I assume Hiroshi should upload this to your patch tracker? It's
> > needed for 3.9.
> 
> FYI: Submitted as:
> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7640/1

Russell,

Is the above ok for you?
Please let me know if still I need to do something.

Re: [PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Stephen Warren]

On 02/11/2013 10:30 AM, Hiroshi Doyu wrote:
> Hiroshi Doyu <hdoyu@nvidia.com> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):
> 
>> Hi Russell,
>>
>> Stephen Warren <swarren@wwwdotorg.org> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:
>>
>>> On 02/06/2013 11:34 AM, Hiroshi Doyu wrote:
>>>> New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
>>>> dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
>>>> whenever a new Tegra SoC comes.
>>>>
>>>> The following combination caused build error, which this patch fixes.
>>>>
>>>> CONFIG_ARCH_TEGRA_2x_SOC=y
>>>> \# CONFIG_ARCH_TEGRA_3x_SOC is not set
>>>> CONFIG_ARCH_TEGRA_114_SOC=y
>>>>
>>>> drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'
>>>
>>> Tested-by: Stephen Warren <swarren@nvidia.com>
>>>
>>> Russell, I assume Hiroshi should upload this to your patch tracker? It's
>>> needed for 3.9.
>>
>> FYI: Submitted as:
>> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7640/1
> 
> Russell,
> 
> Is the above ok for you?
> Please let me know if still I need to do something.

Russell, will this patch make it into your tree for 3.9? Do you think it
should go through some other tree? Thanks.

Re: [PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Russell King - ARM Linux]

On Wed, Feb 20, 2013 at 10:54:38AM -0700, Stephen Warren wrote:
> On 02/11/2013 10:30 AM, Hiroshi Doyu wrote:
> > Hiroshi Doyu <hdoyu@nvidia.com> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):
> > 
> >> Hi Russell,
> >>
> >> Stephen Warren <swarren@wwwdotorg.org> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:
> >>
> >>> On 02/06/2013 11:34 AM, Hiroshi Doyu wrote:
> >>>> New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
> >>>> dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
> >>>> whenever a new Tegra SoC comes.
> >>>>
> >>>> The following combination caused build error, which this patch fixes.
> >>>>
> >>>> CONFIG_ARCH_TEGRA_2x_SOC=y
> >>>> \# CONFIG_ARCH_TEGRA_3x_SOC is not set
> >>>> CONFIG_ARCH_TEGRA_114_SOC=y
> >>>>
> >>>> drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'
> >>>
> >>> Tested-by: Stephen Warren <swarren@nvidia.com>
> >>>
> >>> Russell, I assume Hiroshi should upload this to your patch tracker? It's
> >>> needed for 3.9.
> >>
> >> FYI: Submitted as:
> >> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7640/1
> > 
> > Russell,
> > 
> > Is the above ok for you?
> > Please let me know if still I need to do something.
> 
> Russell, will this patch make it into your tree for 3.9? Do you think it
> should go through some other tree? Thanks.

I'll merge it, and I think it's a minor fix.  Should it be copied to
stable?  If so, which ones are affected?

Re: [PATCH 1/1] memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

[Stephen Warren]

On 02/21/2013 06:28 AM, Russell King - ARM Linux wrote:
> On Wed, Feb 20, 2013 at 10:54:38AM -0700, Stephen Warren wrote:
>> On 02/11/2013 10:30 AM, Hiroshi Doyu wrote:
>>> Hiroshi Doyu <hdoyu@nvidia.com> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):
>>>
>>>> Hi Russell,
>>>>
>>>> Stephen Warren <swarren@wwwdotorg.org> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:
>>>>
>>>>> On 02/06/2013 11:34 AM, Hiroshi Doyu wrote:
>>>>>> New SoC, Tegra114 also uses SMMU. Change tegra_ahb_enable_smmu()'s
>>>>>> dependency from ARCH_TEGRA_3x_SOC to TEGRA_IOMMU_SMMU. No need to edit
>>>>>> whenever a new Tegra SoC comes.
>>>>>>
>>>>>> The following combination caused build error, which this patch fixes.
>>>>>>
>>>>>> CONFIG_ARCH_TEGRA_2x_SOC=y
>>>>>> \# CONFIG_ARCH_TEGRA_3x_SOC is not set
>>>>>> CONFIG_ARCH_TEGRA_114_SOC=y
>>>>>>
>>>>>> drivers/iommu/tegra-smmu.c:485: undefined reference to 'tegra_ahb_enable_smmu'
>>>>>
>>>>> Tested-by: Stephen Warren <swarren@nvidia.com>
>>>>>
>>>>> Russell, I assume Hiroshi should upload this to your patch tracker? It's
>>>>> needed for 3.9.
>>>>
>>>> FYI: Submitted as:
>>>> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7640/1
>>>
>>> Russell,
>>>
>>> Is the above ok for you?
>>> Please let me know if still I need to do something.
>>
>> Russell, will this patch make it into your tree for 3.9? Do you think it
>> should go through some other tree? Thanks.
> 
> I'll merge it, and I think it's a minor fix.  Should it be copied to
> stable?  If so, which ones are affected?

It's only relevant for 3.9. It will apply without issue to some older
kernels, but there's no need for it there.

Thanks.