* [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform
@ 2011-10-23 13:38 Jayachandran C
2011-10-23 13:38 ` Jayachandran C
0 siblings, 1 reply; 5+ messages in thread
From: Jayachandran C @ 2011-10-23 13:38 UTC (permalink / raw)
To: ralf, linux-mips
- Use platform- variable for xlr
- Load address common for all netlogic chips
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
---
arch/mips/netlogic/Platform | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform
index 502d912..4fb6b83 100644
--- a/arch/mips/netlogic/Platform
+++ b/arch/mips/netlogic/Platform
@@ -1,8 +1,8 @@
#
# NETLOGIC includes
#
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
#
# use mips64 if xlr is not available
@@ -10,7 +10,7 @@ cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
cflags-$(CONFIG_NLM_XLR) += $(call cc-option,-march=xlr,-march=mips64)
#
-# NETLOGIC XLR/XLS SoC, Simulator and boards
+# NETLOGIC processor support
#
-core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/
-load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff80100000
+platform-$(CONFIG_NLM_XLR) += netlogic/xlr
+load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000
--
1.7.4.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform
2011-10-23 13:38 [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform Jayachandran C
@ 2011-10-23 13:38 ` Jayachandran C
0 siblings, 0 replies; 5+ messages in thread
From: Jayachandran C @ 2011-10-23 13:38 UTC (permalink / raw)
To: ralf, linux-mips
- Use platform- variable for xlr
- Load address common for all netlogic chips
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
---
arch/mips/netlogic/Platform | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform
index 502d912..4fb6b83 100644
--- a/arch/mips/netlogic/Platform
+++ b/arch/mips/netlogic/Platform
@@ -1,8 +1,8 @@
#
# NETLOGIC includes
#
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
#
# use mips64 if xlr is not available
@@ -10,7 +10,7 @@ cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
cflags-$(CONFIG_NLM_XLR) += $(call cc-option,-march=xlr,-march=mips64)
#
-# NETLOGIC XLR/XLS SoC, Simulator and boards
+# NETLOGIC processor support
#
-core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/
-load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff80100000
+platform-$(CONFIG_NLM_XLR) += netlogic/xlr
+load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000
--
1.7.4.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 00/12] MIPS: Support for Netlogic XLP processors
@ 2011-11-11 11:37 Jayachandran C
2011-11-11 11:37 ` [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform Jayachandran C
0 siblings, 1 reply; 5+ messages in thread
From: Jayachandran C @ 2011-11-11 11:37 UTC (permalink / raw)
To: linux-mips, ralf
[Here's is the patchset again, it has been re-based on top of the
ralf/upstream-sfr.git and few conflicts there have been resolved.]
This patchset adds support for Netlogic's XLP processor family.
The first few patches are to update XLR and move common files to a new
netlogic/common directory.
As always, comments and suggestions welcome. More details on the chip at
http://www.netlogicmicro.com/Products/ProductBriefs/MultiCore/XLP832.htm
Changes from version:
- merge smp wakeup code of XLR and XLP
- common support for booting with 1/2/4 threads per core
- Add supprt for XLP 3xx processors
- mark netlogic chips SMT capable
Hillf Danton (1):
MIPS: Netlogic: Mark Netlogic chips as SMT capable
Jayachandran C (11):
MIPS: Netlogic: Style fixes for Platform
MIPS: Netlogic: Use CPU_XLR instead of NLM_XLR
MIPS: Netlogic: No need to set -Werror in mips/xlr
MIPS: Netlogic: Move code common with XLP to common/
MIPS: Netlogic: Update default config
MIPS: Netlogic: XLP CPU support.
MIPS: Netlogic: Add XLP platform files for XLP SoC
MIPS: Netlogic: Add XLP makefiles and config
MIPS: Netlogic: Add default XLP config.
MIPS: Netlogic: Merge some of XLR/XLP wakup code
MIPS: Netlogic: Add support for XLP 3XX cores
arch/mips/Kconfig | 44 ++-
arch/mips/configs/nlm_xlp_defconfig | 570 ++++++++++++++++++++
arch/mips/configs/nlm_xlr_defconfig | 16 +-
arch/mips/include/asm/cpu.h | 5 +-
.../asm/mach-netlogic/cpu-feature-overrides.h | 18 +-
arch/mips/include/asm/module.h | 2 +
arch/mips/include/asm/netlogic/common.h | 76 +++
arch/mips/include/asm/netlogic/haldefs.h | 163 ++++++
arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 187 +++++++
.../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 83 +++
arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 153 ++++++
arch/mips/include/asm/netlogic/xlp-hal/pic.h | 411 ++++++++++++++
arch/mips/include/asm/netlogic/xlp-hal/sys.h | 129 +++++
arch/mips/include/asm/netlogic/xlp-hal/uart.h | 191 +++++++
arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 51 ++
arch/mips/include/asm/netlogic/xlr/iomap.h | 22 -
arch/mips/include/asm/netlogic/xlr/pic.h | 69 ++-
arch/mips/include/asm/netlogic/xlr/xlr.h | 13 +-
arch/mips/kernel/Makefile | 1 +
arch/mips/kernel/cpu-probe.c | 20 +-
arch/mips/lib/Makefile | 1 +
arch/mips/mm/Makefile | 1 +
arch/mips/mm/c-r4k.c | 3 +
arch/mips/netlogic/Kconfig | 3 -
arch/mips/netlogic/Makefile | 3 +
arch/mips/netlogic/Platform | 13 +-
arch/mips/netlogic/common/Makefile | 3 +
arch/mips/netlogic/common/earlycons.c | 60 ++
arch/mips/netlogic/common/irq.c | 238 ++++++++
arch/mips/netlogic/common/smp.c | 270 +++++++++
arch/mips/netlogic/common/smpboot.S | 272 ++++++++++
arch/mips/netlogic/common/time.c | 51 ++
arch/mips/netlogic/xlp/Makefile | 2 +
arch/mips/netlogic/xlp/nlm_hal.c | 111 ++++
arch/mips/netlogic/xlp/platform.c | 108 ++++
arch/mips/netlogic/xlp/setup.c | 105 ++++
arch/mips/netlogic/xlp/wakeup.c | 102 ++++
arch/mips/netlogic/xlr/Makefile | 7 +-
arch/mips/netlogic/xlr/irq.c | 305 -----------
arch/mips/netlogic/xlr/platform.c | 31 +-
arch/mips/netlogic/xlr/setup.c | 31 +-
arch/mips/netlogic/xlr/smp.c | 220 --------
arch/mips/netlogic/xlr/smpboot.S | 100 ----
arch/mips/netlogic/xlr/time.c | 51 --
arch/mips/netlogic/xlr/wakeup.c | 68 +++
arch/mips/netlogic/xlr/xlr_console.c | 46 --
arch/mips/pci/Makefile | 2 +-
arch/mips/pci/pci-xlr.c | 77 +++
48 files changed, 3679 insertions(+), 829 deletions(-)
create mode 100644 arch/mips/configs/nlm_xlp_defconfig
create mode 100644 arch/mips/include/asm/netlogic/common.h
create mode 100644 arch/mips/include/asm/netlogic/haldefs.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/xlp.h
create mode 100644 arch/mips/netlogic/Makefile
create mode 100644 arch/mips/netlogic/common/Makefile
create mode 100644 arch/mips/netlogic/common/earlycons.c
create mode 100644 arch/mips/netlogic/common/irq.c
create mode 100644 arch/mips/netlogic/common/smp.c
create mode 100644 arch/mips/netlogic/common/smpboot.S
create mode 100644 arch/mips/netlogic/common/time.c
create mode 100644 arch/mips/netlogic/xlp/Makefile
create mode 100644 arch/mips/netlogic/xlp/nlm_hal.c
create mode 100644 arch/mips/netlogic/xlp/platform.c
create mode 100644 arch/mips/netlogic/xlp/setup.c
create mode 100644 arch/mips/netlogic/xlp/wakeup.c
delete mode 100644 arch/mips/netlogic/xlr/irq.c
delete mode 100644 arch/mips/netlogic/xlr/smp.c
delete mode 100644 arch/mips/netlogic/xlr/smpboot.S
delete mode 100644 arch/mips/netlogic/xlr/time.c
create mode 100644 arch/mips/netlogic/xlr/wakeup.c
delete mode 100644 arch/mips/netlogic/xlr/xlr_console.c
--
1.7.5.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform
2011-11-11 11:37 [PATCH 00/12] MIPS: Support for Netlogic XLP processors Jayachandran C
@ 2011-11-11 11:37 ` Jayachandran C
2011-11-11 11:37 ` Jayachandran C
2011-11-16 0:46 ` Ralf Baechle
0 siblings, 2 replies; 5+ messages in thread
From: Jayachandran C @ 2011-11-11 11:37 UTC (permalink / raw)
To: linux-mips, ralf
- Use platform- variable for xlr
- Load address common for all netlogic chips
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
---
arch/mips/netlogic/Platform | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform
index 502d912..4fb6b83 100644
--- a/arch/mips/netlogic/Platform
+++ b/arch/mips/netlogic/Platform
@@ -1,8 +1,8 @@
#
# NETLOGIC includes
#
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
#
# use mips64 if xlr is not available
@@ -10,7 +10,7 @@ cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
cflags-$(CONFIG_NLM_XLR) += $(call cc-option,-march=xlr,-march=mips64)
#
-# NETLOGIC XLR/XLS SoC, Simulator and boards
+# NETLOGIC processor support
#
-core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/
-load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff80100000
+platform-$(CONFIG_NLM_XLR) += netlogic/xlr
+load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform
2011-11-11 11:37 ` [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform Jayachandran C
@ 2011-11-11 11:37 ` Jayachandran C
2011-11-16 0:46 ` Ralf Baechle
1 sibling, 0 replies; 5+ messages in thread
From: Jayachandran C @ 2011-11-11 11:37 UTC (permalink / raw)
To: linux-mips, ralf
- Use platform- variable for xlr
- Load address common for all netlogic chips
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
---
arch/mips/netlogic/Platform | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform
index 502d912..4fb6b83 100644
--- a/arch/mips/netlogic/Platform
+++ b/arch/mips/netlogic/Platform
@@ -1,8 +1,8 @@
#
# NETLOGIC includes
#
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
-cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic
+cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
#
# use mips64 if xlr is not available
@@ -10,7 +10,7 @@ cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
cflags-$(CONFIG_NLM_XLR) += $(call cc-option,-march=xlr,-march=mips64)
#
-# NETLOGIC XLR/XLS SoC, Simulator and boards
+# NETLOGIC processor support
#
-core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/
-load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff80100000
+platform-$(CONFIG_NLM_XLR) += netlogic/xlr
+load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform
2011-11-11 11:37 ` [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform Jayachandran C
2011-11-11 11:37 ` Jayachandran C
@ 2011-11-16 0:46 ` Ralf Baechle
1 sibling, 0 replies; 5+ messages in thread
From: Ralf Baechle @ 2011-11-16 0:46 UTC (permalink / raw)
To: Jayachandran C; +Cc: linux-mips
Queued for 3.3. Thanks,
Ralf
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-16 0:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-23 13:38 [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform Jayachandran C
2011-10-23 13:38 ` Jayachandran C
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 11:37 [PATCH 00/12] MIPS: Support for Netlogic XLP processors Jayachandran C
2011-11-11 11:37 ` [PATCH 01/12] MIPS: Netlogic: Style fixes for Platform Jayachandran C
2011-11-11 11:37 ` Jayachandran C
2011-11-16 0:46 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox