Module Name: src
Committed By: matt
Date: Tue Jun 9 15:01:05 UTC 2015
Modified Files:
src/sys/arch/mips/include: locore.h
src/sys/arch/mips/mips: mips_fixup.c
Log Message:
Fix mips_fixup_zero_relative to have a third argument (ignored).
When reading COP0 EBASE, verify that the fixed bits have the right value.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/mips/mips_fixup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.98 src/sys/arch/mips/include/locore.h:1.99
--- src/sys/arch/mips/include/locore.h:1.98 Mon Jun 1 22:55:13 2015
+++ src/sys/arch/mips/include/locore.h Tue Jun 9 15:01:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.98 2015/06/01 22:55:13 matt Exp $ */
+/* $NetBSD: locore.h,v 1.99 2015/06/09 15:01:05 matt Exp $ */
/*
* This file should not be included by MI code!!!
@@ -110,7 +110,7 @@ struct mips_jump_fixup_info {
void fixup_splcalls(void); /* splstubs.c */
bool mips_fixup_exceptions(mips_fixup_callback_t, void *);
-bool mips_fixup_zero_relative(int32_t, uint32_t [2]);
+bool mips_fixup_zero_relative(int32_t, uint32_t [2], void *);
intptr_t
mips_fixup_addr(const uint32_t *);
void mips_fixup_stubs(uint32_t *, uint32_t *);
Index: src/sys/arch/mips/mips/mips_fixup.c
diff -u src/sys/arch/mips/mips/mips_fixup.c:1.12 src/sys/arch/mips/mips/mips_fixup.c:1.13
--- src/sys/arch/mips/mips/mips_fixup.c:1.12 Tue Jun 2 05:08:21 2015
+++ src/sys/arch/mips/mips/mips_fixup.c Tue Jun 9 15:01:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fixup.c,v 1.12 2015/06/02 05:08:21 matt Exp $ */
+/* $NetBSD: mips_fixup.c,v 1.13 2015/06/09 15:01:05 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.12 2015/06/02 05:08:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.13 2015/06/09 15:01:05 matt Exp $");
#include "opt_mips3_wired.h"
#include "opt_multiprocessor.h"
@@ -48,8 +48,14 @@ bool
mips_fixup_exceptions(mips_fixup_callback_t callback, void *arg)
{
#if (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0
- uint32_t * const start =
- (uint32_t *)(intptr_t)(mipsNN_cp0_ebase_read() & ~MIPS_EBASE_CPUNUM);
+ int32_t ebase = mipsNN_cp0_ebase_read();
+ uint32_t *start;
+ if (ebase == mips_options.mips_cpu_id
+ || (ebase & __BITS(31,30)) != __BIT(31)) {
+ start = (uint32_t *)MIPS_KSEG0_START;
+ } else {
+ start = (uint32_t *)(intptr_t)(ebase & ~MIPS_EBASE_CPUNUM);
+ }
#else
uint32_t * const start = (uint32_t *)MIPS_KSEG0_START;
#endif
@@ -61,6 +67,9 @@ mips_fixup_exceptions(mips_fixup_callbac
int32_t lui_offset = 0;
bool fixed = false;
size_t lui_reg = 0;
+#ifdef DEBUG_VERBOSE
+ printf("%s: fixing %p..%p\n", __func__, start, end);
+#endif
/*
* If this was allocated so that bit 15 of the value/address is 1, then
* %hi will add 1 to the immediate (or 0x10000 to the value loaded)
@@ -148,7 +157,7 @@ mips_fixup_exceptions(mips_fixup_callbac
#ifdef MIPS3_PLUS
bool
-mips_fixup_zero_relative(int32_t load_addr, uint32_t new_insns[2])
+mips_fixup_zero_relative(int32_t load_addr, uint32_t new_insns[2], void *arg)
{
struct cpu_info * const ci = curcpu();
struct pmap_tlb_info * const ti = ci->ci_tlb_info;
