tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc fixes from Michael Ellerman:
"Here are five fixes for you to pull please.

They're all CC'ed to stable except the "Fix PE state format" one which
went in this release"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE
powerpc/eeh: Fix PE state format
powerpc/pseries: Fix endiannes issue in RTAS call from xmon
powerpc/powernv: Fix the hmi event version check.

Linus Torvalds 21f122f4 ae979430

+8 -8
+1 -1
arch/powerpc/kernel/eeh_sysfs.c
··· 65 65 return -ENODEV; 66 66 67 67 state = eeh_ops->get_state(edev->pe, NULL); 68 - return sprintf(buf, "%0x08x %0x08x\n", 68 + return sprintf(buf, "0x%08x 0x%08x\n", 69 69 state, edev->pe->state); 70 70 } 71 71
+2 -2
arch/powerpc/kernel/vdso32/getcpu.S
··· 30 30 V_FUNCTION_BEGIN(__kernel_getcpu) 31 31 .cfi_startproc 32 32 mfspr r5,SPRN_SPRG_VDSO_READ 33 - cmpdi cr0,r3,0 34 - cmpdi cr1,r4,0 33 + cmpwi cr0,r3,0 34 + cmpwi cr1,r4,0 35 35 clrlwi r6,r5,16 36 36 rlwinm r7,r5,16,31-15,31-0 37 37 beq cr0,1f
+1 -1
arch/powerpc/platforms/powernv/opal-hmi.c
··· 57 57 }; 58 58 59 59 /* Print things out */ 60 - if (hmi_evt->version != OpalHMIEvt_V1) { 60 + if (hmi_evt->version < OpalHMIEvt_V1) { 61 61 pr_err("HMI Interrupt, Unknown event version %d !\n", 62 62 hmi_evt->version); 63 63 return;
+1 -1
arch/powerpc/platforms/powernv/pci-ioda.c
··· 1996 1996 if (is_kdump_kernel()) { 1997 1997 pr_info(" Issue PHB reset ...\n"); 1998 1998 ioda_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL); 1999 - ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET); 1999 + ioda_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE); 2000 2000 } 2001 2001 2002 2002 /* Configure M64 window */
+3 -3
arch/powerpc/xmon/xmon.c
··· 293 293 args.token = rtas_token("set-indicator"); 294 294 if (args.token == RTAS_UNKNOWN_SERVICE) 295 295 return; 296 - args.nargs = 3; 297 - args.nret = 1; 296 + args.nargs = cpu_to_be32(3); 297 + args.nret = cpu_to_be32(1); 298 298 args.rets = &args.args[3]; 299 - args.args[0] = SURVEILLANCE_TOKEN; 299 + args.args[0] = cpu_to_be32(SURVEILLANCE_TOKEN); 300 300 args.args[1] = 0; 301 301 args.args[2] = 0; 302 302 enter_rtas(__pa(&args));