Skip to contentSkip to conversation

add bcm1480 ZBus trace support, fix wait related bugs

PATCH In review Mark Mason 2 participants 2 messages Mar 29, 2007 MIPS

lore
Share & tools
lore

Mark Mason

author
#0 lore raw

PATCH 1/1 add bcm1480 ZBus trace support, fix wait related bugs

Make ZBus tracing generic - moving it to a common direcotry under arch/mips/sibyte, add bcm1480 support and fix some wait related bugs (thanks to Ralf for assistance on that).

Signed-off-by Mark Mason <[email protected]>
---
 arch/mips/Makefile                       |    6 +-
 arch/mips/sibyte/Kconfig                 |    2 +
 arch/mips/sibyte/common/Makefile         |    5 +
 arch/mips/sibyte/common/sb_tbprof.c      |  601 ++++++++++++++++++++++++++++++
 arch/mips/sibyte/sb1250/Makefile         |    1 -
 arch/mips/sibyte/sb1250/bcm1250_tbprof.c |  571 ----------------------------
 6 files changed, 613 insertions(+), 573 deletions(-)
 create mode 100644 arch/mips/sibyte/common/Makefile
 create mode 100644 arch/mips/sibyte/common/sb_tbprof.c
 delete mode 100644 arch/mips/sibyte/sb1250/bcm1250_tbprof.c
arch/mips/Makefile +5 -1
index 92bca6a..f2f742d 100644
@@ -530,25 +530,29 @@ cflags-$(CONFIG_SGI_IP32)	+= -Iinclude/asm-mips/mach-ip32
 load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000
 
 #
-# Sibyte SB1250 SOC
+# Sibyte SB1250/BCM1480 SOC
 #
 # This is a LIB so that it links at the end, and initcalls are later
 # the sequence; but it is built as an object so that modules don't get
 # removed (as happens, even if they have __initcall/module_init)
 #
 core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/sb1250/
+core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/common/
 cflags-$(CONFIG_SIBYTE_BCM112X)	+= -Iinclude/asm-mips/mach-sibyte \
 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
 
 core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/sb1250/
+core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/common/
 cflags-$(CONFIG_SIBYTE_SB1250)	+= -Iinclude/asm-mips/mach-sibyte \
 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
 
 core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/bcm1480/
+core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/common/
 cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -Iinclude/asm-mips/mach-sibyte \
 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
 
 core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/bcm1480/
+core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/common/
 cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -Iinclude/asm-mips/mach-sibyte \
 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
arch/mips/sibyte/Kconfig +2 -0
index bdf24a7..e6b003e 100644
@@ -2,6 +2,7 @@ config SIBYTE_SB1250
 	bool
 	select HW_HAS_PCI
 	select SIBYTE_ENABLE_LDT_IF_PCI
+	select SIBYTE_HAS_ZBUS_PROFILING
 	select SIBYTE_SB1xxx_SOC
 	select SYS_SUPPORTS_SMP
 

@@ -34,6 +35,7 @@ config SIBYTE_BCM112X
 config SIBYTE_BCM1x80
 	bool
 	select HW_HAS_PCI
+	select SIBYTE_HAS_ZBUS_PROFILING
 	select SIBYTE_SB1xxx_SOC
 	select SYS_SUPPORTS_SMP
arch/mips/sibyte/common/Makefile new file +5 -0
new file mode 100644
index 0000000..8a06a4f
@@ -0,0 +1,5 @@
+obj-y :=
+
+obj-$(CONFIG_SIBYTE_TBPROF)		+= sb_tbprof.o
+
+EXTRA_AFLAGS := $(CFLAGS)
arch/mips/sibyte/common/sb_tbprof.c new file +601 -0

601 lines not on this page · raw message

arch/mips/sibyte/sb1250/Makefile +0 -1
index 04c0f1a..df662c6 100644
@@ -1,6 +1,5 @@
 obj-y := setup.o irq.o time.o
 
 obj-$(CONFIG_SMP)			+= smp.o
-obj-$(CONFIG_SIBYTE_TBPROF)		+= bcm1250_tbprof.o
 obj-$(CONFIG_SIBYTE_STANDALONE)		+= prom.o
 obj-$(CONFIG_SIBYTE_BUS_WATCHER)	+= bus_watcher.o
arch/mips/sibyte/sb1250/bcm1250_tbprof.c deleted +0 -571

571 lines not on this page · raw message

Signature · 1 line
1.1.6.g9c88
#1 lore raw
Quoted 5 lines · Mark Mason

Make ZBus tracing generic - moving it to a common direcotry under arch/mips/sibyte, add bcm1480 support and fix some wait related bugs (thanks to Ralf for assistance on that).

Signed-off-by Mark Mason <[email protected]>

Queued for 2.6.22.

Ralf