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
This commit is contained in:
Imre Kaloz 2012-12-23 18:53:38 +00:00
parent 970adc9eb9
commit 2c05915b24
2 changed files with 47 additions and 2 deletions

View file

@ -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);

View file

@ -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();