ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

PATCH Superseded Barry Song 4 participants 7 messages Sep 13, 2011 – Sep 14, 2011

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Barry Song

author

2011-09-13 09:10 UTC #0 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

Cc Rob Herring <[email protected]>

Signed-off-by Barry Song <[email protected]>

---

This patch depends on:
[1]Rob Herring
ARM: 7009/1: l2x0: Add OF based initialization
http://www.spinics.net/lists/arm-kernel/msg131123.html
it has been in rmk/for-next

[2]Barry Song
ARM: CACHE-L2X0: filter start address can be 0 and is often 0
http://www.spinics.net/lists/arm-kernel/msg140126.html
this patch fixes the filter start address error of Rob Herring'patch

 arch/arm/mach-prima2/l2x0.c |   48 ++----------------------------------------
 1 files changed, 3 insertions(+), 45 deletions(-)

arch/arm/mach-prima2/l2x0.c +3 ~~-45~~

index 9cda205..5587958 100644
@@ -8,52 +8,10 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/errno.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/memory.h>
 
-#define L2X0_ADDR_FILTERING_START       0xC00
-#define L2X0_ADDR_FILTERING_END         0xC04
-
-static struct of_device_id l2x_ids[]  = {
-	{ .compatible = "arm,pl310-cache" },
-};
-
-static int __init sirfsoc_of_l2x_init(void)
+static int __init sirfsoc_l2x0_init(void)
 {
-	struct device_node *np;
-	void __iomem *sirfsoc_l2x_base;
-
-	np = of_find_matching_node(NULL, l2x_ids);
-	if (!np)
-		panic("unable to find compatible l2x node in dtb\n");
-
-	sirfsoc_l2x_base = of_iomap(np, 0);
-	if (!sirfsoc_l2x_base)
-		panic("unable to map l2x cpu registers\n");
-
-	of_node_put(np);
-
-	if (!(readl_relaxed(sirfsoc_l2x_base + L2X0_CTRL) & 1)) {
-		/*
-		 * set the physical memory windows L2 cache will cover
-		 */
-		writel_relaxed(PLAT_PHYS_OFFSET + 1024 * 1024 * 1024,
-			sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
-		writel_relaxed(PLAT_PHYS_OFFSET | 0x1,
-			sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
-
-		writel_relaxed(0,
-			sirfsoc_l2x_base + L2X0_TAG_LATENCY_CTRL);
-		writel_relaxed(0,
-			sirfsoc_l2x_base + L2X0_DATA_LATENCY_CTRL);
-	}
-	l2x0_init((void __iomem *)sirfsoc_l2x_base, 0x00040000,
-		0x00000000);
-
-	return 0;
+	return l2x0_of_init(0x40000, 0);
 }
-early_initcall(sirfsoc_of_l2x_init);
+early_initcall(sirfsoc_l2x0_init);

Signature · 6 lines

1.7.1



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog

Rob Herring

2011-09-13 13:59 UTC #1 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

Quoted 68 lines · Barry Song

Cc Rob Herring <[email protected]>

Signed-off-by Barry Song <[email protected]>

---

This patch depends on:
[1]Rob Herring
ARM: 7009/1: l2x0: Add OF based initialization
http://www.spinics.net/lists/arm-kernel/msg131123.html
it has been in rmk/for-next

[2]Barry Song
ARM: CACHE-L2X0: filter start address can be 0 and is often 0
http://www.spinics.net/lists/arm-kernel/msg140126.html
this patch fixes the filter start address error of Rob Herring'patch

 arch/arm/mach-prima2/l2x0.c |   48 ++----------------------------------------
 1 files changed, 3 insertions(+), 45 deletions(-)

arch/arm/mach-prima2/l2x0.c +1 ~~-38~~

index 9cda205..5587958 100644
@@ -8,52 +8,10 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/errno.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/memory.h>
 
-#define L2X0_ADDR_FILTERING_START       0xC00
-#define L2X0_ADDR_FILTERING_END         0xC04
-
-static struct of_device_id l2x_ids[]  = {
-	{ .compatible = "arm,pl310-cache" },
-};
-
-static int __init sirfsoc_of_l2x_init(void)
+static int __init sirfsoc_l2x0_init(void)
 {
-	struct device_node *np;
-	void __iomem *sirfsoc_l2x_base;
-
-	np = of_find_matching_node(NULL, l2x_ids);
-	if (!np)
-		panic("unable to find compatible l2x node in dtb\n");
-
-	sirfsoc_l2x_base = of_iomap(np, 0);
-	if (!sirfsoc_l2x_base)
-		panic("unable to map l2x cpu registers\n");
-
-	of_node_put(np);
-
-	if (!(readl_relaxed(sirfsoc_l2x_base + L2X0_CTRL) & 1)) {
-		/*
-		 * set the physical memory windows L2 cache will cover
-		 */
-		writel_relaxed(PLAT_PHYS_OFFSET + 1024 * 1024 * 1024,
-			sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
-		writel_relaxed(PLAT_PHYS_OFFSET | 0x1,
-			sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
-
-		writel_relaxed(0,
-			sirfsoc_l2x_base + L2X0_TAG_LATENCY_CTRL);
-		writel_relaxed(0,

arch/arm/mach-prima2/l2x0.c line 17

Quoted 10 lines

arch/arm/mach-prima2/l2x0.c +2 -7

-			sirfsoc_l2x_base + L2X0_DATA_LATENCY_CTRL);
-	}
-	l2x0_init((void __iomem *)sirfsoc_l2x_base, 0x00040000,
-		0x00000000);
-
-	return 0;
+	return l2x0_of_init(0x40000, 0);
 }
-early_initcall(sirfsoc_of_l2x_init);
+early_initcall(sirfsoc_l2x0_init);

This needs to be called from a prima2 function that is only run for this platform rather than an initcall. This will run all platforms in a single kernel build. However, the that's not really a new problem with this patch, so you could fix in a follow-on patch.

Rob

Barry Song

2011-09-13 14:43 UTC #2 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

2011/9/13 Rob Herring <[email protected]>:

Quoted 76 lines · Barry Song

Quoted 75 lines
Cc Rob Herring <[email protected]>
Signed-off-by Barry Song <[email protected]>
---
This patch depends on:
[1]Rob Herring
ARM: 7009/1: l2x0: Add OF based initialization
http://www.spinics.net/lists/arm-kernel/msg131123.html
it has been in rmk/for-next
[2]Barry Song
ARM: CACHE-L2X0: filter start address can be 0 and is often 0
http://www.spinics.net/lists/arm-kernel/msg140126.html
this patch fixes the filter start address error of Rob Herring'patch
?arch/arm/mach-prima2/l2x0.c | ? 48 ++---------------------------------------- ?1 files changed, 3 insertions(+), 45 deletions(-)
arch/arm/mach-prima2/l2x0.c +0 -0
index 9cda205..5587958 100644
@@ -8,52 +8,10 @@
 
?#include <linux/init.h>
?#include <linux/kernel.h>
arch/arm/mach-prima2/l2x0.c +0 -4
-#include <linux/io.h>
-#include <linux/errno.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
?#include <asm/hardware/cache-l2x0.h>
arch/arm/mach-prima2/l2x0.c +1 -9
-#include <mach/memory.h>
 
-#define L2X0_ADDR_FILTERING_START ? ? ? 0xC00
-#define L2X0_ADDR_FILTERING_END ? ? ? ? 0xC04
-
-static struct of_device_id l2x_ids[] ?= {
- ? ? { .compatible = "arm,pl310-cache" },
-};
-
-static int __init sirfsoc_of_l2x_init(void)
+static int __init sirfsoc_l2x0_init(void)
?{
- ? ? struct device_node *np;
- ? ? void __iomem *sirfsoc_l2x_base;
arch/arm/mach-prima2/l2x0.c +1 ~~-29~~
-
- ? ? np = of_find_matching_node(NULL, l2x_ids);
- ? ? if (!np)
- ? ? ? ? ? ? panic("unable to find compatible l2x node in dtb\n");
-
- ? ? sirfsoc_l2x_base = of_iomap(np, 0);
- ? ? if (!sirfsoc_l2x_base)
- ? ? ? ? ? ? panic("unable to map l2x cpu registers\n");
-
- ? ? of_node_put(np);
-
- ? ? if (!(readl_relaxed(sirfsoc_l2x_base + L2X0_CTRL) & 1)) {
- ? ? ? ? ? ? /*
- ? ? ? ? ? ? ?* set the physical memory windows L2 cache will cover
- ? ? ? ? ? ? ?*/
- ? ? ? ? ? ? writel_relaxed(PLAT_PHYS_OFFSET + 1024 * 1024 * 1024,
- ? ? ? ? ? ? ? ? ? ? sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
- ? ? ? ? ? ? writel_relaxed(PLAT_PHYS_OFFSET | 0x1,
- ? ? ? ? ? ? ? ? ? ? sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
-
- ? ? ? ? ? ? writel_relaxed(0,
- ? ? ? ? ? ? ? ? ? ? sirfsoc_l2x_base + L2X0_TAG_LATENCY_CTRL);
- ? ? ? ? ? ? writel_relaxed(0,
- ? ? ? ? ? ? ? ? ? ? sirfsoc_l2x_base + L2X0_DATA_LATENCY_CTRL);
- ? ? }
- ? ? l2x0_init((void __iomem *)sirfsoc_l2x_base, 0x00040000,
- ? ? ? ? ? ? 0x00000000);
-
- ? ? return 0;
+ ? ? return l2x0_of_init(0x40000, 0);

Quoted 8 lines

arch/arm/mach-prima2/l2x0.c line 17
Quoted 3 lines
?}
arch/arm/mach-prima2/l2x0.c +1 -1
-early_initcall(sirfsoc_of_l2x_init);
+early_initcall(sirfsoc_l2x0_init);
This needs to be called from a prima2 function that is only run for this platform rather than an initcall. This will run all platforms in a single kernel build. However, the that's not really a new problem with this patch, so you could fix in a follow-on patch.

then it is difficult to find a place to call it. this function needs to be called after mm_init since l2x0_of_init needs of_iomap, irq init is the thing closely following mm_init, but it is strange to call it in .init_irq. .init_machine looks ok, but it is much later than early_initcall but we want to enable l2 as early as possible.

before sending this patch, i thought much. an early_initcall seems to be better since it is early and not embedded into function like .init_irq.

which function did you intend to call l2x0_of_init while you sent your original patch?

Quoted 2 lines

Rob

-barry

Rob Herring

2011-09-13 15:33 UTC #3 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

Quoted 92 lines · Barry Song

2011/9/13 Rob Herring <[email protected]>:
Quoted 76 lines · Barry Song
Quoted 75 lines
Cc Rob Herring <[email protected]>
Signed-off-by Barry Song <[email protected]>
---
This patch depends on:
[1]Rob Herring
ARM: 7009/1: l2x0: Add OF based initialization
http://www.spinics.net/lists/arm-kernel/msg131123.html
it has been in rmk/for-next
[2]Barry Song
ARM: CACHE-L2X0: filter start address can be 0 and is often 0
http://www.spinics.net/lists/arm-kernel/msg140126.html
this patch fixes the filter start address error of Rob Herring'patch
 arch/arm/mach-prima2/l2x0.c |   48 ++----------------------------------------
 1 files changed, 3 insertions(+), 45 deletions(-)
arch/arm/mach-prima2/l2x0.c +2 ~~-44~~
index 9cda205..5587958 100644
@@ -8,52 +8,10 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/errno.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/memory.h>
 
-#define L2X0_ADDR_FILTERING_START       0xC00
-#define L2X0_ADDR_FILTERING_END         0xC04
-
-static struct of_device_id l2x_ids[]  = {
-     { .compatible = "arm,pl310-cache" },
-};
-
-static int __init sirfsoc_of_l2x_init(void)
+static int __init sirfsoc_l2x0_init(void)
 {
-     struct device_node *np;
-     void __iomem *sirfsoc_l2x_base;
-
-     np = of_find_matching_node(NULL, l2x_ids);
-     if (!np)
-             panic("unable to find compatible l2x node in dtb\n");
-
-     sirfsoc_l2x_base = of_iomap(np, 0);
-     if (!sirfsoc_l2x_base)
-             panic("unable to map l2x cpu registers\n");
-
-     of_node_put(np);
-
-     if (!(readl_relaxed(sirfsoc_l2x_base + L2X0_CTRL) & 1)) {
-             /*
-              * set the physical memory windows L2 cache will cover
-              */
-             writel_relaxed(PLAT_PHYS_OFFSET + 1024 * 1024 * 1024,
-                     sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
-             writel_relaxed(PLAT_PHYS_OFFSET | 0x1,
-                     sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
-
-             writel_relaxed(0,
-                     sirfsoc_l2x_base + L2X0_TAG_LATENCY_CTRL);
-             writel_relaxed(0,
-                     sirfsoc_l2x_base + L2X0_DATA_LATENCY_CTRL);
-     }
-     l2x0_init((void __iomem *)sirfsoc_l2x_base, 0x00040000,
-             0x00000000);
-
-     return 0;
+     return l2x0_of_init(0x40000, 0);
Quoted 8 lines
arch/arm/mach-prima2/l2x0.c line 17
Quoted 3 lines
arch/arm/mach-prima2/l2x0.c +1 -1
 }
-early_initcall(sirfsoc_of_l2x_init);
+early_initcall(sirfsoc_l2x0_init);
This needs to be called from a prima2 function that is only run for this platform rather than an initcall. This will run all platforms in a single kernel build. However, the that's not really a new problem with this patch, so you could fix in a follow-on patch.
then it is difficult to find a place to call it. this function needs to be called after mm_init since l2x0_of_init needs of_iomap, irq init is the thing closely following mm_init, but it is strange to call it in .init_irq. .init_machine looks ok, but it is much later than early_initcall but we want to enable l2 as early as possible.

Quoted 6 lines

before sending this patch, i thought much. an early_initcall seems to be better since it is early and not embedded into function like .init_irq.
which function did you intend to call l2x0_of_init while you sent your original patch?

I have it in init_irq as I need the outer flush to work for SMP init. init_machine may be okay as well, but as early as possible is probably best. It depends if you are turning on the L2 or it is already on when you boot.

You could also just check your machine compatible string in this function, but calling it from a machine specific function is a cleaner solution.

Rob

Arnd Bergmann

2011-09-13 16:35 UTC #4 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

Quoted 8 lines · Rob Herring

I have it in init_irq as I need the outer flush to work for SMP init. init_machine may be okay as well, but as early as possible is probably best. It depends if you are turning on the L2 or it is already on when you boot.
You could also just check your machine compatible string in this function, but calling it from a machine specific function is a cleaner solution.

I would suggest checking the specific "compatible" string of the l2x0 device node, and making sure that you have something specific to prima2 in it.

That would easily let us combine this function with the respective l2x0 init code for other dt based platforms later, by checking multiple compatible values.

Arnd

Rob Herring

2011-09-13 18:01 UTC #5 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

Quoted 10 lines · Arnd Bergmann

Quoted 8 lines · Rob Herring
I have it in init_irq as I need the outer flush to work for SMP init. init_machine may be okay as well, but as early as possible is probably best. It depends if you are turning on the L2 or it is already on when you boot.
You could also just check your machine compatible string in this function, but calling it from a machine specific function is a cleaner solution.

Quoted 8 lines

I would suggest checking the specific "compatible" string of the l2x0 device node, and making sure that you have something specific to prima2 in it.
That would easily let us combine this function with the respective l2x0 init code for other dt based platforms later, by checking multiple compatible values.

The function does that, but you have a problem when multiple platforms have a "arm,pl310-cache" string. Or are you saying we need to have "csr,prima2-pl310-cache" and strings for every platform out there with a pl310?

Rob

Arnd Bergmann

2011-09-14 06:41 UTC #6 lore raw

PATCH 1/1 ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII

Quoted 15 lines · On Tuesday 13 September 2011 13:01:57 Rob Herring wrote:

Quoted 14 lines · Arnd Bergmann
Quoted 8 lines · Rob Herring
I have it in init_irq as I need the outer flush to work for SMP init. init_machine may be okay as well, but as early as possible is probably best. It depends if you are turning on the L2 or it is already on when you boot.
You could also just check your machine compatible string in this function, but calling it from a machine specific function is a cleaner solution.
I would suggest checking the specific "compatible" string of the l2x0 device node, and making sure that you have something specific to prima2 in it.

Quoted 8 lines

Quoted 4 lines
That would easily let us combine this function with the respective l2x0 init code for other dt based platforms later, by checking multiple compatible values.
The function does that, but you have a problem when multiple platforms have a "arm,pl310-cache" string. Or are you saying we need to have "csr,prima2-pl310-cache" and strings for every platform out there with a pl310?

That was my suggestion, yes. At least for every platform that needs any sort of nonstandard setup for l2 cache.

In the end it's a question of how you look at it: Do you set up the pl310 differently on one platform from another because you say it's a different pl310 when it has different requirements, or do you say that all pl310 are identical and there is a system-wide policy that requires you to set it up in a specific way?

Arnd