[POWERPC] Fix CPU hotplug when using the SLB shadow buffer
Before we register the SLB shadow buffer, we need to invalidate the entries in the buffer, otherwise we can end up stale entries from when we previously offlined the CPU. This does this invalidate as well as unregistering the buffer with PHYP before we offline the cpu. Tested and fixes crashes seen on 970MP (thanks to tonyb) and POWER5. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
6f4347c969
commit
473980a993
|
@ -82,6 +82,14 @@ static inline void slb_shadow_clear(unsigned long entry)
|
|||
get_slb_shadow()->save_area[entry].esid = 0;
|
||||
}
|
||||
|
||||
void slb_shadow_clear_all(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < SLB_NUM_BOLTED; i++)
|
||||
slb_shadow_clear(i);
|
||||
}
|
||||
|
||||
static inline void create_shadowed_slbe(unsigned long ea, int ssize,
|
||||
unsigned long flags,
|
||||
unsigned long entry)
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <asm/vdso_datapage.h>
|
||||
#include <asm/pSeries_reconfig.h>
|
||||
#include "xics.h"
|
||||
#include "plpar_wrappers.h"
|
||||
|
||||
/* This version can't take the spinlock, because it never returns */
|
||||
static struct rtas_args rtas_stop_self_args = {
|
||||
|
@ -58,6 +59,7 @@ static void pseries_mach_cpu_die(void)
|
|||
local_irq_disable();
|
||||
idle_task_exit();
|
||||
xics_teardown_cpu(0);
|
||||
unregister_slb_shadow(hard_smp_processor_id(), __pa(get_slb_shadow()));
|
||||
rtas_stop_self();
|
||||
/* Should never get here... */
|
||||
BUG();
|
||||
|
|
|
@ -272,6 +272,7 @@ void vpa_init(int cpu)
|
|||
*/
|
||||
addr = __pa(&slb_shadow[cpu]);
|
||||
if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
|
||||
slb_shadow_clear_all();
|
||||
ret = register_slb_shadow(hwcpu, addr);
|
||||
if (ret)
|
||||
printk(KERN_ERR
|
||||
|
|
|
@ -286,6 +286,7 @@ extern void hpte_init_iSeries(void);
|
|||
extern void hpte_init_beat(void);
|
||||
extern void hpte_init_beat_v3(void);
|
||||
|
||||
extern void slb_shadow_clear_all(void);
|
||||
extern void stabs_alloc(void);
|
||||
extern void slb_initialize(void);
|
||||
extern void slb_flush_and_rebolt(void);
|
||||
|
|
Loading…
Reference in New Issue