Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5b0e09 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Sibyte: Fix bus watcher build for BCM1x55 and BCM1x80. 



  CC      arch/mips/sibyte/bcm1480/bus_watcher.o
  CHK     kernel/config_data.h
arch/mips/sibyte/bcm1480/bus_watcher.c: In function ‘check_bus_watcher’:
arch/mips/sibyte/bcm1480/bus_watcher.c:86:82: error: ‘A_SCD_BUS_ERR_STATUS_DEBUG’ undeclared (first use in this function)
arch/mips/sibyte/bcm1480/bus_watcher.c:86:82: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [arch/mips/sibyte/bcm1480/bus_watcher.o] Error 1
make[2]: *** [arch/mips/sibyte/bcm1480] Error 2
make[1]: *** [arch/mips/sibyte] Error 2
make: *** [arch/mips] Error 2

The register moved around though it's otherwise the same but because of
the changed address it now also has a different name.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/5514/


Reported-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent 55e9741a

arch/mips/sibyte/common/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-y := cfe.o

obj-$(CONFIG_SIBYTE_BUS_WATCHER)	+= bus_watcher.o

obj-$(CONFIG_SIBYTE_CFE_CONSOLE)	+= cfe_console.o

obj-$(CONFIG_SIBYTE_TBPROF)		+= sb_tbprof.o

arch/mips/sibyte/sb1250/bus_watcher.c→arch/mips/sibyte/common/bus_watcher.c

+10 −1
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
#include <asm/sibyte/sb1250_regs.h>

#include <asm/sibyte/sb1250_int.h>

#include <asm/sibyte/sb1250_scd.h>

#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#include <asm/sibyte/bcm1480_regs.h>

#endif





struct bw_stats_struct {
@@ -81,9 +84,15 @@ void check_bus_watcher(void) 
#ifdef CONFIG_SB1_PASS_1_WORKAROUNDS

	/* Destructive read, clears register and interrupt */

	status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS));

#else

#elif defined(CONFIG_SIBYTE_BCM112X) || defined(CONFIG_SIBYTE_SB1250)

	/* Use non-destructive register */

	status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS_DEBUG));

#elif defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

	/* Use non-destructive register */

	/* Same as 1250 except BUS_ERR_STATUS_DEBUG is in a different place. */

	status = csr_in32(IOADDR(A_BCM1480_BUS_ERR_STATUS_DEBUG));

#else

#error bus watcher being built for unknown Sibyte SOC!

#endif

	if (!(status & 0x7fffffff)) {

		printk("Using last values reaped by bus watcher driver\n");

arch/mips/sibyte/sb1250/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y := setup.o irq.o time.o



obj-$(CONFIG_SMP)			+= smp.o
 
obj-$(CONFIG_SIBYTE_BUS_WATCHER)	+= bus_watcher.o