MIPS: Netlogic: XLR/XLS updates

I had posted 3 of these changes as a single patch earlier, but here I have split them up to different patches.

There is also a new patch to add very basic PCI MSI support on XLR and XLS.

Ganesan Ramalingam (1):
MIPS: Netlogic: Add basic MSI support for XLR/XLS

Jayachandran C (3):
MIPS: Netlogic: Change load address
MIPS: Netlogic: add r4k_wait as the cpu_wait
MIPS: Netlogic: Avoid unnecessary cache flushes

 arch/mips/Kconfig                                  |    1 +
 .../asm/mach-netlogic/cpu-feature-overrides.h      |    5 +-
 arch/mips/include/asm/netlogic/xlr/msidef.h        |   84 ++++++++++++++++++++
 arch/mips/kernel/cpu-probe.c                       |    1 +
 arch/mips/netlogic/Platform                        |    2 +-
 arch/mips/netlogic/xlr/irq.c                       |    5 +
 arch/mips/pci/pci-xlr.c                            |   51 ++++++++++++-
 7 files changed, 144 insertions(+), 5 deletions(-)
 create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h

1.7.4.1

Move load address from 0x84000000 to 0x80100000 to avoid wasting memory.

---
 arch/mips/netlogic/Platform |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index b648b48..502d912 100644
@@ -13,4 +13,4 @@ cflags-$(CONFIG_NLM_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)
 # NETLOGIC XLR/XLS SoC, Simulator and boards
 #
 core-$(CONFIG_NLM_XLR)	      += arch/mips/netlogic/xlr/
-load-$(CONFIG_NLM_XLR_BOARD)  += 0xffffffff84000000
+load-$(CONFIG_NLM_XLR_BOARD)  += 0xffffffff80100000

1.7.4.1

Queued for 3.2. Thanks,

Ralf

Use r4k_wait as the CPU wait function for XLR/XLS processors.

---
 arch/mips/kernel/cpu-probe.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

index ebc0cd2..664bc13 100644
@@ -190,6 +190,7 @@ void __init check_wait(void)
 	case CPU_CAVIUM_OCTEON_PLUS:
 	case CPU_CAVIUM_OCTEON2:
 	case CPU_JZRISC:
+	case CPU_XLR:
 		cpu_wait = r4k_wait;
 		break;
 

1.7.4.1

Queued for 3.2. Thanks,

Ralf

XLR dcache is fully coherent across CPUs, so avoid unnecessary dcache flushes.

---
 .../asm/mach-netlogic/cpu-feature-overrides.h      |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

index 3b72827..3780743 100644
@@ -25,13 +25,12 @@
 #define cpu_has_llsc		1
 #define cpu_has_vtag_icache	0
 #define cpu_has_dc_aliases	0
-#define cpu_has_ic_fills_f_dc	0
+#define cpu_has_ic_fills_f_dc	1
 #define cpu_has_dsp		0
 #define cpu_has_mipsmt		0
 #define cpu_has_userlocal	0
-#define cpu_icache_snoops_remote_store	0
+#define cpu_icache_snoops_remote_store	1
 
-#define cpu_has_nofpuex		0
 #define cpu_has_64bits		1
 
 #define cpu_has_mips32r1	1

1.7.4.1

Queued for 3.2. Thanks,

Ralf

Add basic support for MSI.

---
 arch/mips/Kconfig                           |    1 +
 arch/mips/include/asm/netlogic/xlr/msidef.h |   84 +++++++++++++++++++++++++++
 arch/mips/netlogic/xlr/irq.c                |    5 ++
 arch/mips/pci/pci-xlr.c                     |   51 ++++++++++++++++-
 4 files changed, 140 insertions(+), 1 deletions(-)
 create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h

index b122adc..2bb1c85 100644
@@ -780,6 +780,7 @@ config NLM_XLR_BOARD
 	select CEVT_R4K
 	select CSRC_R4K
 	select IRQ_CPU
+	select ARCH_SUPPORTS_MSI
 	select ZONE_DMA if 64BIT
 	select SYNC_R4K
 	select SYS_HAS_EARLY_PRINTK

index 521bb73..fc822c8 100644
@@ -38,9 +38,14 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
+#include <linux/msi.h>
+#include <linux/irq.h>
+#include <linux/irqdesc.h>
+#include <linux/pci.h>
 
 #include <asm/mipsregs.h>
 
+#include <asm/netlogic/xlr/msidef.h>
 #include <asm/netlogic/xlr/iomap.h>
 #include <asm/netlogic/xlr/pic.h>
 #include <asm/netlogic/xlr/xlr.h>

1.7.4.1


-- 
Jayachandran C.
[email protected]                  (Netlogic Microsystems)
[email protected]                               (The FreeBSD Project)

Queued for 3.2. Thanks,

Ralf