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

Commit 7da323bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-3.19-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux 

Pull powerpc fixes from Michael Ellerman:
 "Two powerpc fixes"

* tag 'powerpc-3.19-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/powernv: Restore LPCR with LPCR_PECE1 cleared
  powerpc/xmon: Fix another endiannes issue in RTAS call from xmon
parents 41592e2f 0eb13208

arch/powerpc/platforms/powernv/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ int pnv_save_sprs_for_winkle(void) 
	 * all cpus at boot. Get these reg values of current cpu and use the

	 * same accross all cpus.

	 */

	uint64_t lpcr_val = mfspr(SPRN_LPCR);

	uint64_t lpcr_val = mfspr(SPRN_LPCR) & ~(u64)LPCR_PECE1;

	uint64_t hid0_val = mfspr(SPRN_HID0);

	uint64_t hid1_val = mfspr(SPRN_HID1);

	uint64_t hid4_val = mfspr(SPRN_HID4);

arch/powerpc/xmon/xmon.c

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ static inline void disable_surveillance(void) 
	args.token = rtas_token("set-indicator");

	if (args.token == RTAS_UNKNOWN_SERVICE)

		return;

	args.token = cpu_to_be32(args.token);

	args.nargs = cpu_to_be32(3);

	args.nret = cpu_to_be32(1);

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