Skip to contentSkip to conversation

cns3xxx multiplatform support

PATCH New Arnd Bergmann 6 participants 11 messages Mar 14, 2013 – Mar 29, 2013

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

cover cns3xxx multiplatform support

I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. I'd like to apply this for linux-3.9 unless there are objections or other comments.

Arnd Bergmann (5):
ARM: cns3xxx: make mach header files local
ARM: cns3xxx: enable sparse IRQ support
ARM: cns3xxx: move debug_ll code to include/debug/
ARM: cns3xxx: enable multiplatform support
ARM: cns3xxx: initial DT support

 arch/arm/Kconfig                                   |  11 --
 arch/arm/Kconfig.debug                             |   8 ++
 arch/arm/configs/cns3420vb_defconfig               |   3 +
 .../mach/debug-macro.S => include/debug/cns3xxx.S} |   0
 arch/arm/mach-cns3xxx/Kconfig                      |  12 ++
 arch/arm/mach-cns3xxx/Makefile                     |   8 +-
 arch/arm/mach-cns3xxx/cns3420vb.c                  |   6 +-
 arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h |   7 +-
 arch/arm/mach-cns3xxx/core.c                       | 121 ++++++++++++++++++++-
 arch/arm/mach-cns3xxx/devices.c                    |   5 +-
 arch/arm/mach-cns3xxx/include/mach/irqs.h          |  24 ----
 arch/arm/mach-cns3xxx/include/mach/timex.h         |  12 --
 arch/arm/mach-cns3xxx/include/mach/uncompress.h    |  53 ---------
 arch/arm/mach-cns3xxx/pcie.c                       |   2 +-
 arch/arm/mach-cns3xxx/pm.c                         |   4 +-
 arch/arm/mach-cns3xxx/{include/mach => }/pm.h      |   0
 drivers/mmc/host/sdhci-cns3xxx.c                   |   1 -
 17 files changed, 158 insertions(+), 119 deletions(-)
 rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%)
 rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%)
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h
 rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/5 ARM: cns3xxx: make mach header files local

The mach/cns3xxx.h and mach/pm.h header files are used only in the platform code itself, so there is no need to make them globally visible. This gets us closer to multiplatform configuration for cns3xxx.

---
 arch/arm/mach-cns3xxx/cns3420vb.c                  | 5 ++---
 arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h | 7 ++-----
 arch/arm/mach-cns3xxx/core.c                       | 2 +-
 arch/arm/mach-cns3xxx/devices.c                    | 5 ++---
 arch/arm/mach-cns3xxx/include/mach/uncompress.h    | 2 +-
 arch/arm/mach-cns3xxx/pcie.c                       | 2 +-
 arch/arm/mach-cns3xxx/pm.c                         | 4 ++--
 arch/arm/mach-cns3xxx/{include/mach => }/pm.h      | 0
 drivers/mmc/host/sdhci-cns3xxx.c                   | 1 -
 9 files changed, 11 insertions(+), 17 deletions(-)
 rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%)
 rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%)
arch/arm/mach-cns3xxx/cns3420vb.c +2 -3
index a71867e..d863d87 100644
@@ -31,9 +31,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <mach/cns3xxx.h>
-#include <mach/irqs.h>
-#include <mach/pm.h>
+#include "cns3xxx.h"
+#include "pm.h"
 #include "core.h"
 #include "devices.h"
 
arch/arm/mach-cns3xxx/cns3xxx.h renamed from arch/arm/mach-cns3xxx/include/mach/cns3xxx.h +2 -5
similarity index 99%
rename from arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
rename to arch/arm/mach-cns3xxx/cns3xxx.h
index 191c8e5..d7d3a8d 100644
@@ -553,6 +553,8 @@ int cns3xxx_cpu_clock(void);
 /*
  * ARM11 MPCore interrupt sources (primary GIC)
  */
+#define IRQ_TC11MP_GIC_START	32
+
 #define IRQ_CNS3XXX_PMU			(IRQ_TC11MP_GIC_START + 0)
 #define IRQ_CNS3XXX_SDIO		(IRQ_TC11MP_GIC_START + 1)
 #define IRQ_CNS3XXX_L2CC		(IRQ_TC11MP_GIC_START + 2)
@@ -624,9 +626,4 @@ int cns3xxx_cpu_clock(void);
 
 #define NR_IRQS_CNS3XXX			(IRQ_TC11MP_GIC_START + 64)
 
-#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_CNS3XXX)
-#undef NR_IRQS
-#define NR_IRQS				NR_IRQS_CNS3XXX
-#endif
-
 #endif	/* __MACH_BOARD_CNS3XXX_H */
arch/arm/mach-cns3xxx/core.c +1 -1
index e698f26..012ffdb 100644
@@ -17,7 +17,7 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/cns3xxx.h>
+#include "cns3xxx.h"
 #include "core.h"
 
 static struct map_desc cns3xxx_io_desc[] __initdata = {
arch/arm/mach-cns3xxx/devices.c +2 -3
index 1e40c99..7da78a2 100644
@@ -16,9 +16,8 @@
 #include <linux/compiler.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
-#include <mach/cns3xxx.h>
-#include <mach/irqs.h>
-#include <mach/pm.h>
+#include "cns3xxx.h"
+#include "pm.h"
 #include "core.h"
 #include "devices.h"
 
arch/arm/mach-cns3xxx/include/mach/uncompress.h +1 -1
index 7a030b9..e2c642c 100644
@@ -8,7 +8,7 @@
  */
 
 #include <asm/mach-types.h>
-#include <mach/cns3xxx.h>
+#include "cns3xxx.h"
 
 #define AMBA_UART_DR(base)	(*(volatile unsigned char *)((base) + 0x00))
 #define AMBA_UART_LCRH(base)	(*(volatile unsigned char *)((base) + 0x2c))
arch/arm/mach-cns3xxx/pcie.c +1 -1
index 3113283..c7b204b 100644
@@ -20,7 +20,7 @@
 #include <linux/interrupt.h>
 #include <linux/ptrace.h>
 #include <asm/mach/map.h>
-#include <mach/cns3xxx.h>
+#include "cns3xxx.h"
 #include "core.h"
 
 enum cns3xxx_access_type {
arch/arm/mach-cns3xxx/pm.c +2 -2
index 3645808..79e3d47 100644
@@ -11,8 +11,8 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/atomic.h>
-#include <mach/cns3xxx.h>
-#include <mach/pm.h>
+#include "cns3xxx.h"
+#include "pm.h"
 #include "core.h"
 
 void cns3xxx_pwr_clk_en(unsigned int block)
arch/arm/mach-cns3xxx/pm.h renamed from arch/arm/mach-cns3xxx/include/mach/pm.h +0 -0
similarity index 100%
rename from arch/arm/mach-cns3xxx/include/mach/pm.h
rename to arch/arm/mach-cns3xxx/pm.h
drivers/mmc/host/sdhci-cns3xxx.c +0 -1
index 30bfdc4..6ba8502 100644
@@ -16,7 +16,6 @@
 #include <linux/device.h>
 #include <linux/mmc/host.h>
 #include <linux/module.h>
-#include <mach/cns3xxx.h>
 #include "sdhci-pltfm.h"
 
 static unsigned int sdhci_cns3xxx_get_max_clk(struct sdhci_host *host)
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/5 ARM: cns3xxx: enable sparse IRQ support

In reply to Arnd Bergmann

This trivially enables sparse IRQ on cns3xxx by moving the nr_irqs definition from mach/irqs.h into the machine descriptor. These interrupts will still get statically assigned, so nothing changes here.

---
 arch/arm/Kconfig                          |  1 +
 arch/arm/mach-cns3xxx/cns3420vb.c         |  1 +
 arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 ------------------------
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h
arch/arm/Kconfig +1 -0
index 5b71469..8bad33e 100644
@@ -390,6 +390,7 @@ config ARCH_CNS3XXX
 	select MIGHT_HAVE_CACHE_L2X0
 	select MIGHT_HAVE_PCI
 	select PCI_DOMAINS if PCI
+	select SPARSE_IRQ
 	help
 	  Support for Cavium Networks CNS3XXX platform.
 
arch/arm/mach-cns3xxx/cns3420vb.c +1 -0
index d863d87..ce096d6 100644
@@ -246,6 +246,7 @@ static void __init cns3420_map_io(void)
 
 MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
 	.atag_offset	= 0x100,
+	.nr_irqs	= NR_IRQS_CNS3XXX,
 	.map_io		= cns3420_map_io,
 	.init_irq	= cns3xxx_init_irq,
 	.init_time	= cns3xxx_timer_init,
arch/arm/mach-cns3xxx/include/mach/irqs.h deleted +0 -24
deleted file mode 100644
index 2ab96f8..0000000
@@ -1,24 +0,0 @@
-/*
- * Copyright 2000 Deep Blue Solutions Ltd.
- * Copyright 2003 ARM Limited
- * Copyright 2008 Cavium Networks
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, Version 2, as
- * published by the Free Software Foundation.
- */
-
-#ifndef __MACH_IRQS_H
-#define __MACH_IRQS_H
-
-#define IRQ_LOCALTIMER		29
-#define IRQ_LOCALWDOG		30
-#define IRQ_TC11MP_GIC_START	32
-
-#include <mach/cns3xxx.h>
-
-#ifndef NR_IRQS
-#error "NR_IRQS not defined by the board-specific files"
-#endif
-
-#endif
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/5 ARM: cns3xxx: move debug_ll code to include/debug/

In reply to Arnd Bergmann

This is needed in order to keep debug_ll functionality on cns3xxx working when we enable ARCH_MULTIPLATFORM.

---
 arch/arm/Kconfig.debug                                            | 8 ++++++++
 arch/arm/configs/cns3420vb_defconfig                              | 1 +
 .../include/mach/debug-macro.S => include/debug/cns3xxx.S}        | 0
 3 files changed, 9 insertions(+)
 rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%)
arch/arm/Kconfig.debug +8 -0
index acdddda..52f410d 100644
@@ -103,6 +103,13 @@ choice
 		  Say Y here if you want the debug print routines to direct
 		  their output to the second serial port on these devices.
 
+	config DEBUG_CNS3XXX
+		bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx"
+		depends on ARCH_CNS3XXX
+		help
+		  Say Y here if you want the debug print routines to direct
+                  their output to the CNS3xxx UART0.
+
 	config DEBUG_DAVINCI_DA8XX_UART1
 		bool "Kernel low-level debugging on DaVinci DA8XX using UART1"
 		depends on ARCH_DAVINCI_DA8XX
@@ -579,6 +586,7 @@ endchoice
 
 config DEBUG_LL_INCLUDE
 	string
+	default "debug/cns3xxx.S" if DEBUG_CNS3XXX
 	default "debug/icedcc.S" if DEBUG_ICEDCC
 	default "debug/imx.S" if DEBUG_IMX1_UART || \
 				 DEBUG_IMX25_UART || \
arch/arm/configs/cns3420vb_defconfig +1 -0
index 313627a..b79e984 100644
@@ -21,6 +21,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_IOSCHED_CFQ=m
 CONFIG_ARCH_CNS3XXX=y
 CONFIG_MACH_CNS3420VB=y
+CONFIG_DEBUG_CNS3XXX=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
arch/arm/include/debug/cns3xxx.S renamed from arch/arm/mach-cns3xxx/include/mach/debug-macro.S +0 -0
similarity index 100%
rename from arch/arm/mach-cns3xxx/include/mach/debug-macro.S
rename to arch/arm/include/debug/cns3xxx.S
Signature · 1 line
1.8.1.2
#4 lore raw

PATCH 4/5 ARM: cns3xxx: enable multiplatform support

In reply to Arnd Bergmann

This moves the cns3xxx configuration option inside of ARCH_MULTIPLATFORM, since there is no reason for not doing it now. We can then also remove the three header files that become obsolete.

---
 arch/arm/Kconfig                                | 12 ------
 arch/arm/configs/cns3420vb_defconfig            |  2 +
 arch/arm/mach-cns3xxx/Kconfig                   | 11 +++++
 arch/arm/mach-cns3xxx/include/mach/timex.h      | 12 ------
 arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 -------------------------
 5 files changed, 13 insertions(+), 77 deletions(-)
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h
arch/arm/Kconfig +0 -12
index 8bad33e..78ffcc6 100644
@@ -382,18 +382,6 @@ config ARCH_BCM2835
 	  This enables support for the Broadcom BCM2835 SoC. This SoC is
 	  use in the Raspberry Pi, and Roku 2 devices.
 
-config ARCH_CNS3XXX
-	bool "Cavium Networks CNS3XXX family"
-	select ARM_GIC
-	select CPU_V6K
-	select GENERIC_CLOCKEVENTS
-	select MIGHT_HAVE_CACHE_L2X0
-	select MIGHT_HAVE_PCI
-	select PCI_DOMAINS if PCI
-	select SPARSE_IRQ
-	help
-	  Support for Cavium Networks CNS3XXX platform.
-
 config ARCH_CLPS711X
 	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 	select ARCH_REQUIRE_GPIOLIB
arch/arm/configs/cns3420vb_defconfig +2 -0
index b79e984..b1ff5cd 100644
@@ -19,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_IOSCHED_CFQ=m
+CONFIG_ARCH_MULTI_V6=y
+#CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_CNS3XXX=y
 CONFIG_MACH_CNS3420VB=y
 CONFIG_DEBUG_CNS3XXX=y
arch/arm/mach-cns3xxx/Kconfig +11 -0
index 9ebfcc4..5720f3d 100644
@@ -1,3 +1,14 @@
+config ARCH_CNS3XXX
+	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
+	select ARM_GIC
+	select CPU_V6K
+	select GENERIC_CLOCKEVENTS
+	select MIGHT_HAVE_CACHE_L2X0
+	select MIGHT_HAVE_PCI
+	select PCI_DOMAINS if PCI
+	help
+	  Support for Cavium Networks CNS3XXX platform.
+
 menu "CNS3XXX platform type"
 	depends on ARCH_CNS3XXX
 
arch/arm/mach-cns3xxx/include/mach/timex.h deleted +0 -12
deleted file mode 100644
index 1fd0421..0000000
@@ -1,12 +0,0 @@
-/*
- * Cavium Networks architecture timex specifications
- *
- * Copyright 2003 ARM Limited
- * Copyright 2008 Cavium Networks
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, Version 2, as
- * published by the Free Software Foundation.
- */
-
-#define CLOCK_TICK_RATE		(50000000 / 16)
arch/arm/mach-cns3xxx/include/mach/uncompress.h deleted +0 -53

53 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#5 lore raw

PATCH 5/5 ARM: cns3xxx: initial DT support

In reply to Arnd Bergmann

This adds very minimal support for booting cns3xxx using a device tree. It should support the same devices that cns3420vb provides but gets them from the DT. All devices that don't have their own binding are probed through auxdata. This is completely untested and likely incomplete.

Booting through ATAGS is made optional, so it can be turned off by anybody who has a DTB file.

---
 arch/arm/mach-cns3xxx/Kconfig  |   1 +
 arch/arm/mach-cns3xxx/Makefile |   8 +--
 arch/arm/mach-cns3xxx/core.c   | 119 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 125 insertions(+), 3 deletions(-)
arch/arm/mach-cns3xxx/Kconfig +1 -0
index 5720f3d..dbf0df8 100644
@@ -14,6 +14,7 @@ menu "CNS3XXX platform type"
 
 config MACH_CNS3420VB
 	bool "Support for CNS3420 Validation Board"
+	depends on ATAGS
 	help
 	  Include support for the Cavium Networks CNS3420 MPCore Platform
 	  Baseboard.
arch/arm/mach-cns3xxx/Makefile +5 -3
index 11033f1..a1ff108 100644
@@ -1,3 +1,5 @@
-obj-$(CONFIG_ARCH_CNS3XXX)		+= core.o pm.o devices.o
-obj-$(CONFIG_PCI)			+= pcie.o
-obj-$(CONFIG_MACH_CNS3420VB)		+= cns3420vb.o
+obj-$(CONFIG_ARCH_CNS3XXX)		+= cns3xxx.o
+cns3xxx-y				+= core.o pm.o
+cns3xxx-$(CONFIG_ATAGS)			+= devices.o
+cns3xxx-$(CONFIG_PCI)			+= pcie.o
+cns3xxx-$(CONFIG_MACH_CNS3420VB)	+= cns3420vb.o
arch/arm/mach-cns3xxx/core.c +119 -0

134 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#6 lore raw

cover cns3xxx multiplatform support

In reply to Arnd Bergmann

Hello Arnd,

Le 03/14/13 23:14, Arnd Bergmann a ?crit :

Quoted 5 lines

I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. I'd like to apply this for linux-3.9 unless there are objections or other comments.

I do not have any cns3xxx device myself, but I added Felix and Gabor in CC who actually have one.

Quoted 33 lines

Arnd Bergmann (5):
ARM: cns3xxx: make mach header files local
ARM: cns3xxx: enable sparse IRQ support
ARM: cns3xxx: move debug_ll code to include/debug/
ARM: cns3xxx: enable multiplatform support
ARM: cns3xxx: initial DT support

  arch/arm/Kconfig                                   |  11 --
  arch/arm/Kconfig.debug                             |   8 ++
  arch/arm/configs/cns3420vb_defconfig               |   3 +
  .../mach/debug-macro.S => include/debug/cns3xxx.S} |   0
  arch/arm/mach-cns3xxx/Kconfig                      |  12 ++
  arch/arm/mach-cns3xxx/Makefile                     |   8 +-
  arch/arm/mach-cns3xxx/cns3420vb.c                  |   6 +-
  arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h |   7 +-
  arch/arm/mach-cns3xxx/core.c                       | 121 ++++++++++++++++++++-
  arch/arm/mach-cns3xxx/devices.c                    |   5 +-
  arch/arm/mach-cns3xxx/include/mach/irqs.h          |  24 ----
  arch/arm/mach-cns3xxx/include/mach/timex.h         |  12 --
  arch/arm/mach-cns3xxx/include/mach/uncompress.h    |  53 ---------
  arch/arm/mach-cns3xxx/pcie.c                       |   2 +-
  arch/arm/mach-cns3xxx/pm.c                         |   4 +-
  arch/arm/mach-cns3xxx/{include/mach => }/pm.h      |   0
  drivers/mmc/host/sdhci-cns3xxx.c                   |   1 -
  17 files changed, 158 insertions(+), 119 deletions(-)

rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%) rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%)
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h
rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%)

#7 lore raw

cover cns3xxx multiplatform support

Hi Florian,

2013.03.15. 11:58 keltez?ssel, Florian Fainelli ?rta:

Quoted 11 lines

Hello Arnd,

Le 03/14/13 23:14, Arnd Bergmann a ?crit :

Quoted 5 lines

I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. I'd like to apply this for linux-3.9 unless there are objections or other comments.

I do not have any cns3xxx device myself, but I added Felix and Gabor in CC who actually have one.

FYI, I don't have any cns3xxx based board.

-Gabor

#8 lore raw

cover cns3xxx multiplatform support

In reply to Arnd Bergmann

Hi Arnd,

Quoted 5 lines · Arnd Bergmann

I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. I'd like to apply this for linux-3.9 unless there are objections or other comments.

I might have some old self-made QEMU emulator for CNS3xxx boards, but I am not sure if I could revive it quickly. Maybe Cavium folks could test it faster than me though (some Cc'ed, some Bcc'ed).

But the patches themselves look great, so:

Thanks a lot!

Anton

Quoted 31 lines

Arnd Bergmann (5):
ARM: cns3xxx: make mach header files local
ARM: cns3xxx: enable sparse IRQ support
ARM: cns3xxx: move debug_ll code to include/debug/
ARM: cns3xxx: enable multiplatform support
ARM: cns3xxx: initial DT support

 arch/arm/Kconfig                                   |  11 --
 arch/arm/Kconfig.debug                             |   8 ++
 arch/arm/configs/cns3420vb_defconfig               |   3 +
 .../mach/debug-macro.S => include/debug/cns3xxx.S} |   0
 arch/arm/mach-cns3xxx/Kconfig                      |  12 ++
 arch/arm/mach-cns3xxx/Makefile                     |   8 +-
 arch/arm/mach-cns3xxx/cns3420vb.c                  |   6 +-
 arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h |   7 +-
 arch/arm/mach-cns3xxx/core.c                       | 121 ++++++++++++++++++++-
 arch/arm/mach-cns3xxx/devices.c                    |   5 +-
 arch/arm/mach-cns3xxx/include/mach/irqs.h          |  24 ----
 arch/arm/mach-cns3xxx/include/mach/timex.h         |  12 --
 arch/arm/mach-cns3xxx/include/mach/uncompress.h    |  53 ---------
 arch/arm/mach-cns3xxx/pcie.c                       |   2 +-
 arch/arm/mach-cns3xxx/pm.c                         |   4 +-
 arch/arm/mach-cns3xxx/{include/mach => }/pm.h      |   0
 drivers/mmc/host/sdhci-cns3xxx.c                   |   1 -
 17 files changed, 158 insertions(+), 119 deletions(-)
 rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%)
 rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%)
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h
 delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h
 rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%)
#9 lore raw

cover cns3xxx multiplatform support

Hi Arnd, Anton,
2013/3/17 Anton Vorontsov <[email protected]>:

Quoted 9 lines

Hi Arnd,

Quoted 5 lines · Arnd Bergmann

I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. I'd like to apply this for linux-3.9 unless there are objections or other comments.

Quoted 7 lines

I might have some old self-made QEMU emulator for CNS3xxx boards, but I am not sure if I could revive it quickly. Maybe Cavium folks could test it faster than me though (some Cc'ed, some Bcc'ed).

But the patches themselves look great, so:

Sorry for the late response. I have not tested since 3.2, and it fail booting almost right after 3.2....
It take me some time to be able to boot 3.9-rc1. I'll send the patch in another mail.

The image of 3.9-rc1+the patches boots fine but with one warning which is not seen without the patches:
NR_IRQS:16 nr_irqs:96 96

------------[ cut here ]------------
WARNING: at drivers/irqchip/irq-gic.c:782 gic_init_bases+0x284/0x2e8()
Cannot allocate irq_descs @ IRQ16, assuming pre-allocated
Modules linked in:
Backtrace:
[<c000c6f0>] (dump_backtrace+0x0/0x10c) from [<c01cf158>] (dump_stack+0x18/0x1c)
 r7:c028df40 r6:c027d39c r5:c023d888 r4:0000030e
[<c01cf140>] (dump_stack+0x0/0x1c) from [<c0016be0>] (warn_slowpath_common+0x54)
[<c0016b8c>] (warn_slowpath_common+0x0/0x70) from [<c0016ca0>] (warn_slowpath_f)
 r9:410fb024 r8:c02943b4 r7:00000050 r6:00000010 r5:00000010

r4:00000000
[<c0016c68>] (warn_slowpath_fmt+0x0/0x40) from [<c027d39c>] (gic_init_bases+0x2)
r3:00000010 r2:c023d8d8
[<c027d118>] (gic_init_bases+0x0/0x2e8) from [<c0271aa8>] (cns3xxx_init_irq+0x3)
r8:c0294000 r7:c02a4300 r6:ffffffff r5:c02849e8 r4:3fffffff
[<c0271a78>] (cns3xxx_init_irq+0x0/0x40) from [<c026d1bc>] (init_IRQ+0x1c/0x24) [<c026d1a0>] (init_IRQ+0x0/0x24) from [<c026a800>] (start_kernel+0x164/0x2e4) [<c026a69c>] (start_kernel+0x0/0x2e4) from [<00008070>] (0x8070)
r8:00004008 r7:c02955ec r6:c02849e4 r5:c029408c r4:00c5387d

---[ end trace 1b75b31a2719ed1c ]---

I have my code pushed to https://github.com/mkl0301/linux.git, branch cns3v20vb-3.9-multiplatform-test, in case you need them.

Best Regards,
Mac Lin

#10 lore raw

cover cns3xxx multiplatform support

Hi Mac Lin,

Quoted 45 lines · Mac Lin

Hi Arnd, Anton,
2013/3/17 Anton Vorontsov <[email protected]>:

Quoted 9 lines

Hi Arnd,

Quoted 5 lines · Arnd Bergmann

I've looked at all the platforms recently to see what their state is. cns3xxx seems quite clean but not very actively maintained. Since it is really easy to convert to multiplatform, that's what I did here. I'd like to apply this for linux-3.9 unless there are objections or other comments.

Quoted 7 lines

I might have some old self-made QEMU emulator for CNS3xxx boards, but I am not sure if I could revive it quickly. Maybe Cavium folks could test it faster than me though (some Cc'ed, some Bcc'ed).

But the patches themselves look great, so:

Sorry for the late response. I have not tested since 3.2, and it fail booting almost right after 3.2....
It take me some time to be able to boot 3.9-rc1. I'll send the patch in another mail.

The image of 3.9-rc1+the patches boots fine but with one warning which is not seen without the patches:
NR_IRQS:16 nr_irqs:96 96

------------[ cut here ]------------
WARNING: at drivers/irqchip/irq-gic.c:782 gic_init_bases+0x284/0x2e8()
Cannot allocate irq_descs @ IRQ16, assuming pre-allocated
Modules linked in:
Backtrace:
[<c000c6f0>] (dump_backtrace+0x0/0x10c) from [<c01cf158>] (dump_stack+0x18/0x1c)
 r7:c028df40 r6:c027d39c r5:c023d888 r4:0000030e
[<c01cf140>] (dump_stack+0x0/0x1c) from [<c0016be0>] (warn_slowpath_common+0x54)
[<c0016b8c>] (warn_slowpath_common+0x0/0x70) from [<c0016ca0>] (warn_slowpath_f)
 r9:410fb024 r8:c02943b4 r7:00000050 r6:00000010 r5:00000010

r4:00000000
[<c0016c68>] (warn_slowpath_fmt+0x0/0x40) from [<c027d39c>] (gic_init_bases+0x2)
r3:00000010 r2:c023d8d8
[<c027d118>] (gic_init_bases+0x0/0x2e8) from [<c0271aa8>] (cns3xxx_init_irq+0x3)
r8:c0294000 r7:c02a4300 r6:ffffffff r5:c02849e8 r4:3fffffff
[<c0271a78>] (cns3xxx_init_irq+0x0/0x40) from [<c026d1bc>] (init_IRQ+0x1c/0x24) [<c026d1a0>] (init_IRQ+0x0/0x24) from [<c026a800>] (start_kernel+0x164/0x2e4) [<c026a69c>] (start_kernel+0x0/0x2e4) from [<00008070>] (0x8070)
r8:00004008 r7:c02955ec r6:c02849e4 r5:c029408c r4:00c5387d

Quoted 4 lines
---[ end trace 1b75b31a2719ed1c ]---

I have my code pushed to https://github.com/mkl0301/linux.git, branch cns3v20vb-3.9-multiplatform-test, in case you need them.

Please try applying the patches we have in OpenWrt [1], especially the first few. Most of them should apply fine, but I'll try to update them for 3.9 this weekend. When that's done, we should migrate the additional hw support to DT and merge whatever we can into mainline.

Imre

[1] https://dev.openwrt.org/browser/trunk/target/linux/cns3xxx/patches-3.8