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

Commit a0a6a39e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Benjamin Herrenschmidt:
 "Here are a handful of powerpc related fixes."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
  cpuidle/powerpc: Fix smt_snooze_delay functionality.
  cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
  powerpc: Build fix for powerpc KVM
  Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
parents bab58350 83dac594

arch/powerpc/include/asm/kvm_book3s_32.h

+1 −0
Original line number Diff line number Diff line
@@ -42,5 +42,6 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu) 
#define SID_SHIFT	28

#define ESID_MASK	0xf0000000

#define VSID_MASK	0x00fffffff0000000ULL

#define VPN_SHIFT	12



#endif /* __ASM_KVM_BOOK3S_32_H__ */

arch/powerpc/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ extern int powersave_nap; /* set if nap mode can be used in idle loop */ 
extern void power7_nap(void);



#ifdef CONFIG_PSERIES_IDLE

extern void update_smt_snooze_delay(int snooze);

extern void update_smt_snooze_delay(int cpu, int residency);

#else

static inline void update_smt_snooze_delay(int snooze) {}

static inline void update_smt_snooze_delay(int cpu, int residency) {}

#endif



extern void flush_instruction_cache(void);

arch/powerpc/kernel/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static ssize_t store_smt_snooze_delay(struct device *dev, 
		return -EINVAL;



	per_cpu(smt_snooze_delay, cpu->dev.id) = snooze;

	update_smt_snooze_delay(snooze);

	update_smt_snooze_delay(cpu->dev.id, snooze);



	return count;

}

arch/powerpc/kvm/book3s_32_mmu_host.c

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 
	BUG_ON(!map);



	vsid = map->host_vsid;

	vpn = (vsid << (SID_SHIFT - VPN_SHIFT)) | ((eaddr & ~ESID_MASK) >> VPN_SHIFT)



	vpn = (vsid << (SID_SHIFT - VPN_SHIFT)) |

		((eaddr & ~ESID_MASK) >> VPN_SHIFT);

next_pteg:

	if (rr == 16) {

		primary = !primary;

arch/powerpc/perf/core-book3s.c

+1 −1
Original line number Diff line number Diff line
@@ -1463,7 +1463,7 @@ static void perf_event_interrupt(struct pt_regs *regs) 
		if (!event->hw.idx || is_limited_pmc(event->hw.idx))

			continue;

		val = read_pmc(event->hw.idx);

		if (pmc_overflow(val)) {

		if ((int)val < 0) {

			/* event has overflowed */

			found = 1;

			record_and_restart(event, val, regs);