Commit eaa38d63 authored by James Hogan's avatar James Hogan Committed by Paul Burton

MIPS: tlb-r4k: Add CPU PM callback to reconfigure TLB

Add a CPU power management callback for the r4k TLB which reconfigures
it after the CPU leaves a powered down state.
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
parent 61d73044
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.
*/ */
#include <linux/cpu_pm.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/smp.h> #include <linux/smp.h>
...@@ -421,7 +422,10 @@ static int __init set_ntlb(char *str) ...@@ -421,7 +422,10 @@ static int __init set_ntlb(char *str)
__setup("ntlb=", set_ntlb); __setup("ntlb=", set_ntlb);
void tlb_init(void) /*
* Configure TLB (for init or after a CPU has been powered off).
*/
static void r4k_tlb_configure(void)
{ {
/* /*
* You should never change this register: * You should never change this register:
...@@ -453,6 +457,11 @@ void tlb_init(void) ...@@ -453,6 +457,11 @@ void tlb_init(void)
local_flush_tlb_all(); local_flush_tlb_all();
/* Did I tell you that ARC SUCKS? */ /* Did I tell you that ARC SUCKS? */
}
void tlb_init(void)
{
r4k_tlb_configure();
if (ntlb) { if (ntlb) {
if (ntlb > 1 && ntlb <= current_cpu_data.tlbsize) { if (ntlb > 1 && ntlb <= current_cpu_data.tlbsize) {
...@@ -466,3 +475,26 @@ void tlb_init(void) ...@@ -466,3 +475,26 @@ void tlb_init(void)
build_tlb_refill_handler(); build_tlb_refill_handler();
} }
static int r4k_tlb_pm_notifier(struct notifier_block *self, unsigned long cmd,
void *v)
{
switch (cmd) {
case CPU_PM_ENTER_FAILED:
case CPU_PM_EXIT:
r4k_tlb_configure();
break;
}
return NOTIFY_OK;
}
static struct notifier_block r4k_tlb_pm_notifier_block = {
.notifier_call = r4k_tlb_pm_notifier,
};
static int __init r4k_tlb_init_pm(void)
{
return cpu_pm_register_notifier(&r4k_tlb_pm_notifier_block);
}
arch_initcall(r4k_tlb_init_pm);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment