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

Unverified Commit de56d4c1 authored by Paul Burton's avatar Paul Burton
Browse files

MIPS: Remove duplicate EBase configuration 



Clean up our configuration of the EBase register by making
configure_exception_vector() write to it unconditionally on systems
implementing MIPSr2 or higher, and removing the duplicate code in
per_cpu_trap_init(). The latter would have duplicated work on systems
with vectored interrupts, and didn't set BEV for safety like the
configure_exception_vector() version of the code does.

Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Tested-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Cc: linux-mips@vger.kernel.org
parent 783454e2

arch/mips/kernel/traps.c

+3 −17
Original line number Diff line number Diff line
@@ -2151,7 +2151,7 @@ static void configure_hwrena(void) 


static void configure_exception_vector(void)

{

	if (cpu_has_veic || cpu_has_vint) {

	if (cpu_has_mips_r2_r6) {

		unsigned long sr = set_c0_status(ST0_BEV);

		/* If available, use WG to set top bits of EBASE */

		if (cpu_has_ebase_wg) {
@@ -2163,6 +2163,8 @@ static void configure_exception_vector(void) 
		}

		write_c0_ebase(ebase);

		write_c0_status(sr);

	}

	if (cpu_has_veic || cpu_has_vint) {

		/* Setting vector spacing enables EI/VI mode  */

		change_c0_intctl(0x3e0, VECTORSPACING);

	}
@@ -2193,22 +2195,6 @@ void per_cpu_trap_init(bool is_boot_cpu) 
	 *  o read IntCtl.IPFDC to determine the fast debug channel interrupt

	 */

	if (cpu_has_mips_r2_r6) {

		/*

		 * We shouldn't trust a secondary core has a sane EBASE register

		 * so use the one calculated by the boot CPU.

		 */

		if (!is_boot_cpu) {

			/* If available, use WG to set top bits of EBASE */

			if (cpu_has_ebase_wg) {

#ifdef CONFIG_64BIT

				write_c0_ebase_64(ebase | MIPS_EBASE_WG);

#else

				write_c0_ebase(ebase | MIPS_EBASE_WG);

#endif

			}

			write_c0_ebase(ebase);

		}



		cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;

		cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;

		cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;