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

Commit 2a90309e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Ben Herrenschmidt:
 "This was meant to be sent early last week, but I has a change pending
  on one of the fixes and other things made me forget all about.  Ugh.

  We have some misc fixes for powerpc 4.8.  Some trivial bits and some
  regressions, and a trivial cleanup or two that I saw no point in
  letting rot in patchwork"

* tag 'powerpc-4.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: signals: Discard transaction state from signal frames
  powerpc/powernv : Drop reference added by kset_find_obj()
  powerpc/tm: do not use r13 for tabort_syscall
  powerpc: move hmi.c to arch/powerpc/kvm/
  powerpc: sysdev: cpm: fix gpio save_regs functions
  powerpc/pseries: PACA save area fix for MCE vs MCE
  powerpc/pseries: PACA save area fix for general exception vs MCE
  powerpc/prom: Fix sub-processor option passed to ibm, client-architecture-support
  powerpc, hotplug: Avoid to touch non-existent cpumasks.
  powerpc: migrate exception table users off module.h and onto extable.h
  powerpc/powernv/pci: fix iterator signedness
  powerpc/pseries: use pci_host_bridge.release_fn() to kfree(phb)
  cxl: use pcibios_free_controller_deferred() when removing vPHBs
  powerpc: mpc8349emitx: Delete unnecessary assignment for the field "owner"
  powerpc/512x: Delete unnecessary assignment for the field "owner"
  drivers/macintosh: Delete owner assignment
  powerpc: cputhreads: Add missing include file
parents 3eab887a 78a3e888

Documentation/powerpc/transactional_memory.txt

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ signal will be rolled back anyway. 
For signals taken in non-TM or suspended mode, we use the

normal/non-checkpointed stack pointer.



Any transaction initiated inside a sighandler and suspended on return

from the sighandler to the kernel will get reclaimed and discarded.



Failure cause codes used by kernel

==================================

arch/powerpc/include/asm/cputhreads.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#ifndef __ASSEMBLY__

#include <linux/cpumask.h>

#include <asm/cpu_has_feature.h>



/*

 * Mapping of threads to cores

arch/powerpc/include/asm/hmi.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#ifndef __ASM_PPC64_HMI_H__

#define __ASM_PPC64_HMI_H__



#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE



#define	CORE_TB_RESYNC_REQ_BIT		63

#define MAX_SUBCORE_PER_CORE		4

arch/powerpc/include/asm/paca.h

+7 −5
Original line number Diff line number Diff line
@@ -183,11 +183,6 @@ struct paca_struct { 
	 */

	u16 in_mce;

	u8 hmi_event_available;		 /* HMI event is available */

	/*

	 * Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for

	 * more details

	 */

	struct sibling_subcore_state *sibling_subcore_state;

#endif



	/* Stuff for accurate time accounting */
@@ -202,6 +197,13 @@ struct paca_struct { 
	struct kvmppc_book3s_shadow_vcpu shadow_vcpu;

#endif

	struct kvmppc_host_state kvm_hstate;

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	/*

	 * Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for

	 * more details

	 */

	struct sibling_subcore_state *sibling_subcore_state;

#endif

#endif

};

arch/powerpc/include/asm/pci-bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ extern void pci_process_bridge_OF_ranges(struct pci_controller *hose, 
/* Allocate & free a PCI host bridge structure */

extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);

extern void pcibios_free_controller(struct pci_controller *phb);

extern void pcibios_free_controller_deferred(struct pci_host_bridge *bridge);



#ifdef CONFIG_PCI

extern int pcibios_vaddr_is_ioport(void __iomem *address);