Re: [PATCH 1/7] MIPS: sibyte: Fix build for SIBYTE_BW_TRACE

[Ralf Baechle <ralf@linux-mips.org>]

On Mon, Jun 17, 2013 at 03:00:35PM +0100, Markos Chandras wrote:

> The M_BCM1480_SCD_TRACE_CFG_FREEZE macro removed in
> 8deab1144b553548fb2f1b51affdd36dcd652aaa
> "[MIPS] Updated Sibyte headers"
> 
> This broke the build for the sibyte platfrom when
> SIBYTE_BW_TRACE is enabled:
> arch/mips/mm/cerr-sb1.c:186:2: error: 'M_BCM1480_SCD_TRACE_CFG_FREEZE'
> undeclared (first use in this function)
> 
> We fix this by replacing it with the M_BCM1480_SYS_RESERVED4 macro
> 
> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
> Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
> Cc: sibyte-users@bitmover.com
> ---
>  arch/mips/mm/cerr-sb1.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c
> index 576add3..1a24534 100644
> --- a/arch/mips/mm/cerr-sb1.c
> +++ b/arch/mips/mm/cerr-sb1.c
> @@ -183,7 +183,7 @@ asmlinkage void sb1_cache_error(void)
>  #ifdef CONFIG_SIBYTE_BW_TRACE
>  	/* Freeze the trace buffer now */
>  #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
> -	csr_out32(M_BCM1480_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG));
> +	csr_out32(M_BCM1480_SYS_RESERVED4, IOADDR(A_SCD_TRACE_CFG));
>  #else
>  	csr_out32(M_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG));
>  #endif

I think this is the correct solution.

Unfortunately nobody at Broadcom seems to care about the Sibyte SOCs
these days though they're still very important for a bunch of Linux
distributions.

  Ralf

  CC      arch/mips/mm/cerr-sb1.o
arch/mips/mm/cerr-sb1.c: In function ‘sb1_cache_error’:
arch/mips/mm/cerr-sb1.c:186:98: error: ‘M_BCM1480_SCD_TRACE_CFG_FREEZE’ undeclared (first use in this function)
arch/mips/mm/cerr-sb1.c:186:98: note: each undeclared identifier is reported only once for each function it appears in
make[1]: *** [arch/mips/mm/cerr-sb1.o] Error 1

This happens because 8deab1144b553548fb2f1b51affdd36dcd652aaa [[MIPS]
Updated Sibyte headers] changed the headers but not all the users.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Reported-by: Markos Chandras <markos.chandras@imgtec.com>
---
 arch/mips/mm/cerr-sb1.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c
index 576add3..ee5c1ff 100644
--- a/arch/mips/mm/cerr-sb1.c
+++ b/arch/mips/mm/cerr-sb1.c
@@ -182,11 +182,7 @@ asmlinkage void sb1_cache_error(void)
 
 #ifdef CONFIG_SIBYTE_BW_TRACE
 	/* Freeze the trace buffer now */
-#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
-	csr_out32(M_BCM1480_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG));
-#else
 	csr_out32(M_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG));
-#endif
 	printk("Trace buffer frozen\n");
 #endif