Commit e73173db authored by Kieran Bingham's avatar Kieran Bingham Committed by Paul Mundt
Browse files

sh: Fix UBC setup and registers for SH2A 



Signed-off-by: default avatarKieran Bingham <kieranbingham@gmail.com>
Signed-off-by: default avatarPeter Griffin <pgriffin@mpc-data.co.uk>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent be6514c6

arch/sh/include/asm/ubc.h

+11 −0
Original line number Diff line number Diff line
@@ -42,12 +42,23 @@ 


#define BRCR_CMFA		(1 << 15)

#define BRCR_CMFB		(1 << 14)



#if defined CONFIG_CPU_SH2A

#define BRCR_CMFCA		(1 << 15)

#define BRCR_CMFCB		(1 << 14)

#define BRCR_CMFDA		(1 << 13)

#define BRCR_CMFDB		(1 << 12)

#define BRCR_PCBB		(1 << 6)	/* 1: after execution */

#define BRCR_PCBA		(1 << 5)	/* 1: after execution */

#define BRCR_PCTE		0

#else

#define BRCR_PCTE		(1 << 11)

#define BRCR_PCBA		(1 << 10)	/* 1: after execution */

#define BRCR_DBEB		(1 << 7)

#define BRCR_PCBB		(1 << 6)

#define BRCR_SEQ		(1 << 3)

#define BRCR_UBDE		(1 << 0)

#endif



#ifndef __ASSEMBLY__

/* arch/sh/kernel/cpu/ubc.S */

arch/sh/include/cpu-sh2a/cpu/ubc.h

+28 −1
Original line number Diff line number Diff line 
#include <cpu-sh2/cpu/ubc.h>
 
/*

 * SH-2A UBC definitions

 *

 * Copyright (C) 2008 Kieran Bingham

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef __ASM_CPU_SH2A_UBC_H

#define __ASM_CPU_SH2A_UBC_H



#define UBC_BARA                0xfffc0400

#define UBC_BAMRA               0xfffc0404

#define UBC_BBRA                0xfffc04a0	/* 16 bit access */

#define UBC_BDRA                0xfffc0408

#define UBC_BDMRA               0xfffc040c



#define UBC_BARB                0xfffc0410

#define UBC_BAMRB               0xfffc0414

#define UBC_BBRB                0xfffc04b0	/* 16 bit access */

#define UBC_BDRB                0xfffc0418

#define UBC_BDMRB               0xfffc041c



#define UBC_BRCR                0xfffc04c0



#endif /* __ASM_CPU_SH2A_UBC_H */

arch/sh/kernel/process_32.c

+3 −1
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ static void ubc_set_tracing(int asid, unsigned long pc) 


	if (current_cpu_data.type == CPU_SH7729 ||

	    current_cpu_data.type == CPU_SH7710 ||

	    current_cpu_data.type == CPU_SH7712) {

	    current_cpu_data.type == CPU_SH7712 ||

	    current_cpu_data.type == CPU_SH7203){

		ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);

		ctrl_outl(BRCR_PCBA | BRCR_PCTE, UBC_BRCR);

	} else {
@@ -407,6 +408,7 @@ asmlinkage void break_point_trap(void) 
#else

	ctrl_outw(0, UBC_BBRA);

	ctrl_outw(0, UBC_BBRB);

	ctrl_outl(0, UBC_BRCR);

#endif

	current->thread.ubc_pc = 0;

	ubc_usercnt -= 1;