From: David Daney <ddaney.cavm@gmail.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org
Cc: David Daney <david.daney@cavium.com>
Subject: [PATCH v2 3/5] MIPS: Octeon: Use board_cache_error_setup for cache error handler setup.
Date: Mon, 14 May 2012 17:04:48 -0700 [thread overview]
Message-ID: <1337040290-16015-4-git-send-email-ddaney.cavm@gmail.com> (raw)
In-Reply-To: <1337040290-16015-1-git-send-email-ddaney.cavm@gmail.com>
From: David Daney <david.daney@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
---
arch/mips/mm/c-octeon.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c
index 47037ec..44e69e7 100644
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
@@ -21,6 +21,7 @@
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/r4kcache.h>
+#include <asm/traps.h>
#include <asm/mmu_context.h>
#include <asm/war.h>
@@ -248,6 +249,11 @@ static void __cpuinit probe_octeon(void)
}
}
+static void __cpuinit octeon_cache_error_setup(void)
+{
+ extern char except_vec2_octeon;
+ set_handler(0x100, &except_vec2_octeon, 0x80);
+}
/**
* Setup the Octeon cache flush routines
@@ -255,12 +261,6 @@ static void __cpuinit probe_octeon(void)
*/
void __cpuinit octeon_cache_init(void)
{
- extern unsigned long ebase;
- extern char except_vec2_octeon;
-
- memcpy((void *)(ebase + 0x100), &except_vec2_octeon, 0x80);
- octeon_flush_cache_sigtramp(ebase + 0x100);
-
probe_octeon();
shm_align_mask = PAGE_SIZE - 1;
@@ -280,6 +280,8 @@ void __cpuinit octeon_cache_init(void)
build_clear_page();
build_copy_page();
+
+ board_cache_error_setup = octeon_cache_error_setup;
}
/**
--
1.7.2.3
next prev parent reply other threads:[~2012-05-15 0:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-15 0:04 [PATCH v2 0/5] MIPS: Move cache setup earlier David Daney
2012-05-15 0:04 ` David Daney
2012-05-15 0:04 ` [PATCH v2 1/5] MIPS: Introduce board_cache_error_setup() hook David Daney
2012-05-15 0:04 ` [PATCH v2 2/5] MIPS: Make set_handler() __cpuinit David Daney
2012-05-15 11:10 ` Sergei Shtylyov
2012-05-15 0:04 ` David Daney [this message]
2012-05-15 0:04 ` [PATCH v2 4/5] MIPS: Use board_cache_error_setup for r4k cache error handler setup David Daney
2012-05-15 0:04 ` [PATCH v2 5/5] MIPS: Move cache setup to setup_arch() David Daney
2012-06-11 4:16 ` Shane McDonald
2012-06-11 16:21 ` David Daney
2012-06-11 16:39 ` David Daney
2012-06-11 18:32 ` Shane McDonald
2012-06-13 15:44 ` Shane McDonald
2012-06-13 16:29 ` David Daney
2012-06-13 17:08 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337040290-16015-4-git-send-email-ddaney.cavm@gmail.com \
--to=ddaney.cavm@gmail.com \
--cc=david.daney@cavium.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox