Skip to contentSkip to conversation

memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU

PATCH In review Hiroshi Doyu 3 participants 7 messages Feb 6, 2013 – Feb 21, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

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'

---
 drivers/amba/tegra-ahb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/amba/tegra-ahb.c +1 -1
index ab92785..093c435 100644
@@ -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);
Signature · 1 line
1.7.9.5
Tested-by on v1 1/1
#1 lore raw
Quoted 11 lines · 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'

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/

#2 lore raw

Hi Russell,

Stephen Warren <[email protected]> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:

Quoted 11 lines · Hiroshi Doyu
Quoted 10 lines

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

Quoted 6 lines
Quoted 1 line

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

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

#3 lore raw

Hiroshi Doyu <[email protected]> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):

Quoted 17 lines

Hi Russell,

Stephen Warren <[email protected]> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:

Quoted 13 lines · Hiroshi Doyu
Quoted 11 lines

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'

Quoted 7 lines
Quoted 4 lines

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.

#4 lore raw
Quoted 24 lines · Hiroshi Doyu

Hiroshi Doyu <[email protected]> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):

Quoted 22 lines

Hi Russell,

Stephen Warren <[email protected]> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:

Quoted 17 lines · Hiroshi Doyu
Quoted 11 lines

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'

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

Quoted 7 lines
Quoted 2 lines

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.

#5 lore raw
Quoted 28 lines · Stephen Warren
Quoted 27 lines · Hiroshi Doyu

Hiroshi Doyu <[email protected]> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):

Quoted 24 lines

Hi Russell,

Stephen Warren <[email protected]> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:

Quoted 11 lines · Hiroshi Doyu
Quoted 10 lines

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

Quoted 6 lines
Quoted 1 line

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

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

Quoted 7 lines
Quoted 4 lines

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?

#6 lore raw
Quoted 31 lines · Russell King - ARM Linux
Quoted 30 lines · Stephen Warren
Quoted 29 lines · Hiroshi Doyu

Hiroshi Doyu <[email protected]> wrote @ Wed, 06 Feb 2013 21:16:35 +0200 (EET):

Quoted 17 lines

Hi Russell,

Stephen Warren <[email protected]> wrote @ Wed, 6 Feb 2013 19:51:46 +0100:

Quoted 13 lines · Hiroshi Doyu
Quoted 11 lines

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'

Quoted 7 lines
Quoted 4 lines

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,

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

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.