Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21f122f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents ae979430 152d44a8

arch/powerpc/kernel/eeh_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static ssize_t eeh_pe_state_show(struct device *dev, 
		return -ENODEV;



	state = eeh_ops->get_state(edev->pe, NULL);

	return sprintf(buf, "%0x08x %0x08x\n",

	return sprintf(buf, "0x%08x 0x%08x\n",

		       state, edev->pe->state);

}

arch/powerpc/kernel/vdso32/getcpu.S

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
V_FUNCTION_BEGIN(__kernel_getcpu)

  .cfi_startproc

	mfspr	r5,SPRN_SPRG_VDSO_READ

	cmpdi	cr0,r3,0

	cmpdi	cr1,r4,0

	cmpwi	cr0,r3,0

	cmpwi	cr1,r4,0

	clrlwi  r6,r5,16

	rlwinm  r7,r5,16,31-15,31-0

	beq	cr0,1f

arch/powerpc/platforms/powernv/opal-hmi.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void print_hmi_event_info(struct OpalHMIEvent *hmi_evt) 
	};



	/* Print things out */

	if (hmi_evt->version != OpalHMIEvt_V1) {

	if (hmi_evt->version < OpalHMIEvt_V1) {

		pr_err("HMI Interrupt, Unknown event version %d !\n",

			hmi_evt->version);

		return;

arch/powerpc/platforms/powernv/pci-ioda.c

+1 −1
Original line number Diff line number Diff line
@@ -1996,7 +1996,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, 
	if (is_kdump_kernel()) {

		pr_info("  Issue PHB reset ...\n");

		ioda_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL);

		ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET);

		ioda_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE);

	}



	/* Configure M64 window */

arch/powerpc/xmon/xmon.c

+3 −3
Original line number Diff line number Diff line
@@ -293,10 +293,10 @@ static inline void disable_surveillance(void) 
	args.token = rtas_token("set-indicator");

	if (args.token == RTAS_UNKNOWN_SERVICE)

		return;

	args.nargs = 3;

	args.nret = 1;

	args.nargs = cpu_to_be32(3);

	args.nret = cpu_to_be32(1);

	args.rets = &args.args[3];

	args.args[0] = SURVEILLANCE_TOKEN;

	args.args[0] = cpu_to_be32(SURVEILLANCE_TOKEN);

	args.args[1] = 0;

	args.args[2] = 0;

	enter_rtas(__pa(&args));