[cns3xxx]: add nol2x0 cmdline to disable l2x0 cache

L2 cache via L2X0 cache controller available on some ARM boards can
provide a performance boost in some situations but decrease performance
in others.  This adds a kernel cmdline to disable L2X0 for cns3xxx based
boards.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 34874

diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
index 19bc2ededb219af48524365ae3c55ae34a52ecf8..84a440bf182eae31009dfb252787d25e6b367ec9 100644 (file)
--- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
+++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
@@ -710,8 +710,6 @@ static struct gpio laguna_gpio_gw2380[] = {
  */
 static void __init laguna_init(void)
 {
-       cns3xxx_l2x0_init();
-
        platform_device_register(&laguna_watchdog);
 
        platform_device_register(&laguna_i2c_controller);

diff --git a/target/linux/cns3xxx/patches-3.3/097-l2x0_cmdline_disable.patch b/target/linux/cns3xxx/patches-3.3/097-l2x0_cmdline_disable.patch
new file mode 100644 (file)
index 0000000..87b1090
--- /dev/null
+++ b/target/linux/cns3xxx/patches-3.3/097-l2x0_cmdline_disable.patch
@@ -0,0 +1,47 @@
+--- a/arch/arm/mach-cns3xxx/core.c
++++ b/arch/arm/mach-cns3xxx/core.c
+@@ -284,11 +284,24 @@ struct sys_timer cns3xxx_timer = {
+ 
+ #ifdef CONFIG_CACHE_L2X0
+ 
++static int cns3xxx_l2x0_enable = 1;
++
++static int __init cns3xxx_l2x0_disable(char *s)
++{
++      cns3xxx_l2x0_enable = 0;
++      return 1;
++}
++__setup("nol2x0", cns3xxx_l2x0_disable);
++
+ void __init cns3xxx_l2x0_init(void)
+ {
+-      void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
++      void __iomem *base;
+       u32 val;
+ 
++      if (!cns3xxx_l2x0_enable)
++              return;
++
++      base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
+       if (WARN_ON(!base))
+               return;
+ 
+@@ -321,6 +334,7 @@ void __init cns3xxx_l2x0_init(void)
+       /* 32 KiB, 8-way, parity disable */
+       l2x0_init(base, 0x00540000, 0xfe000fff);
+ }
++arch_initcall(cns3xxx_l2x0_init);
+ 
+ #endif /* CONFIG_CACHE_L2X0 */
+ 
+--- a/arch/arm/mach-cns3xxx/cns3420vb.c
++++ b/arch/arm/mach-cns3xxx/cns3420vb.c
+@@ -193,8 +193,6 @@ static struct platform_device *cns3420_p
+ 
+ static void __init cns3420_init(void)
+ {
+-      cns3xxx_l2x0_init();
+-
+       platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs));
+ 
+       cns3xxx_ahci_init();