mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
powerpc: Use MSR_64BIT in places
Use the new MSR_64BIT in a few places. Some of these are already ifdef'ed for BOOKE vs BOOKS, but it's still clearer, MSR_SF does not immediately parse as "MSR bit for 64bit". Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
9d4a2925c2
commit
9f0b079320
@ -655,7 +655,7 @@ _GLOBAL(enable_64b_mode)
|
||||
oris r11,r11,0x8000 /* CM bit set, we'll set ICM later */
|
||||
mtmsr r11
|
||||
#else /* CONFIG_PPC_BOOK3E */
|
||||
li r12,(MSR_SF | MSR_ISF)@highest
|
||||
li r12,(MSR_64BIT | MSR_ISF)@highest
|
||||
sldi r12,r12,48
|
||||
or r11,r11,r12
|
||||
mtmsrd r11
|
||||
|
@ -381,7 +381,7 @@ badframe:
|
||||
regs, uc, &uc->uc_mcontext);
|
||||
#endif
|
||||
if (show_unhandled_signals && printk_ratelimit())
|
||||
printk(regs->msr & MSR_SF ? fmt64 : fmt32,
|
||||
printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
|
||||
current->comm, current->pid, "rt_sigreturn",
|
||||
(long)uc, regs->nip, regs->link);
|
||||
|
||||
@ -469,7 +469,7 @@ badframe:
|
||||
regs, frame, newsp);
|
||||
#endif
|
||||
if (show_unhandled_signals && printk_ratelimit())
|
||||
printk(regs->msr & MSR_SF ? fmt64 : fmt32,
|
||||
printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
|
||||
current->comm, current->pid, "setup_rt_frame",
|
||||
(long)frame, regs->nip, regs->link);
|
||||
|
||||
|
@ -199,7 +199,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
|
||||
} else if (show_unhandled_signals &&
|
||||
unhandled_signal(current, signr) &&
|
||||
printk_ratelimit()) {
|
||||
printk(regs->msr & MSR_SF ? fmt64 : fmt32,
|
||||
printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
|
||||
current->comm, current->pid, signr,
|
||||
addr, regs->nip, regs->link, code);
|
||||
}
|
||||
|
@ -399,7 +399,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
|
||||
cpu_set(cpu, cpus_in_xmon);
|
||||
|
||||
bp = NULL;
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF))
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT))
|
||||
bp = at_breakpoint(regs->nip);
|
||||
if (bp || unrecoverable_excp(regs))
|
||||
fromipi = 0;
|
||||
@ -529,7 +529,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
|
||||
}
|
||||
}
|
||||
#else
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF)) {
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT)) {
|
||||
bp = at_breakpoint(regs->nip);
|
||||
if (bp != NULL) {
|
||||
int stepped = emulate_step(regs, bp->instr[0]);
|
||||
@ -578,7 +578,7 @@ static int xmon_bpt(struct pt_regs *regs)
|
||||
struct bpt *bp;
|
||||
unsigned long offset;
|
||||
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
|
||||
return 0;
|
||||
|
||||
/* Are we at the trap at bp->instr[1] for some bp? */
|
||||
@ -609,7 +609,7 @@ static int xmon_sstep(struct pt_regs *regs)
|
||||
|
||||
static int xmon_dabr_match(struct pt_regs *regs)
|
||||
{
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
|
||||
return 0;
|
||||
if (dabr.enabled == 0)
|
||||
return 0;
|
||||
@ -619,7 +619,7 @@ static int xmon_dabr_match(struct pt_regs *regs)
|
||||
|
||||
static int xmon_iabr_match(struct pt_regs *regs)
|
||||
{
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
|
||||
return 0;
|
||||
if (iabr == NULL)
|
||||
return 0;
|
||||
@ -644,7 +644,7 @@ static int xmon_fault_handler(struct pt_regs *regs)
|
||||
if (in_xmon && catch_memory_errors)
|
||||
handle_fault(regs); /* doesn't return */
|
||||
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF)) {
|
||||
if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT)) {
|
||||
bp = in_breakpoint_table(regs->nip, &offset);
|
||||
if (bp != NULL) {
|
||||
regs->nip = bp->address + offset;
|
||||
@ -929,7 +929,7 @@ static int do_step(struct pt_regs *regs)
|
||||
int stepped;
|
||||
|
||||
/* check we are in 64-bit kernel mode, translation enabled */
|
||||
if ((regs->msr & (MSR_SF|MSR_PR|MSR_IR)) == (MSR_SF|MSR_IR)) {
|
||||
if ((regs->msr & (MSR_64BIT|MSR_PR|MSR_IR)) == (MSR_64BIT|MSR_IR)) {
|
||||
if (mread(regs->nip, &instr, 4) == 4) {
|
||||
stepped = emulate_step(regs, instr);
|
||||
if (stepped < 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user