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

Commit c818c778 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 updates from Benjamin Herrenschmidt:
 "Here are a few more powerpc bits that I would like in 3.10.

  Mostly remaining bolts & screw tightening of power8 support such as
  actually exposing the new features via the previously added AT_HWCAP2,
  and a few fixes, some of them for problems exposed recently like
  irqdomain warnings or sysfs access permission issues, some exposed by
  power8 hardware.

  The only change outside of arch/powerpc is a small one to irqdomain.c
  to allow silent failure to fix a problem on Cell where we get a dozen
  WARN_ON's tripping at boot for what is basically a normal case."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Make hard_irq_disable() do the right thing vs. irq tracing
  powerpc/topology: Fix spurr attribute permission
  powerpc/pci: Support per-aperture memory offset
  powerpc/cell/iommu: Improve error message for missing node
  powerpc/cell/spufs: Fix status attribute permission
  irqdomain: Allow quiet failure mode
  powerpc/pnv: Fix "compatible" property for P8 PHB
  powerpc/pci: Don't add bogus empty resources to PHBs
  powerpc/powerpnv: Properly handle failure starting CPUs
  powerpc/cputable: Advertise support for ISEL/HTM/DSCR/TAR on POWER8
  powerpc/cputable: Advertise ISEL support on appropriate embedded processors
  powerpc/cputable: Advertise DSCR support on P7/P7+
  powerpc/cputable: Reserve bits in HWCAP2 for new features
  powerpc/pseries: Perform proper max_bus_speed detection
  powerpc/pseries: Force 32 bit MSIs for devices that require it
  powerpc/tm: Fix null pointer deference in flush_hash_page
  powerpc/powernv: Defer OPAL exception handler registration
  powerpc: Emulate non privileged DSCR read and write
parents c8de2fa4 5737789c

arch/powerpc/include/asm/cputable.h

+2 −0
Original line number Diff line number Diff line
@@ -224,8 +224,10 @@ extern const char *powerpc_base_platform; 
/* We only set the TM feature if the kernel was compiled with TM supprt */

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

#define CPU_FTR_TM_COMP		CPU_FTR_TM

#define PPC_FEATURE2_HTM_COMP	PPC_FEATURE2_HTM

#else

#define CPU_FTR_TM_COMP		0

#define PPC_FEATURE2_HTM_COMP	0

#endif



/* We need to mark all pages as being coherent if we're SMP or we have a

arch/powerpc/include/asm/hw_irq.h

+7 −9
Original line number Diff line number Diff line
@@ -95,15 +95,13 @@ static inline bool arch_irqs_disabled(void) 
#define __hard_irq_disable()	__mtmsrd(local_paca->kernel_msr, 1)

#endif



static inline void hard_irq_disable(void)

{

	__hard_irq_disable();

	get_paca()->soft_enabled = 0;

	get_paca()->irq_happened |= PACA_IRQ_HARD_DIS;

}



/* include/linux/interrupt.h needs hard_irq_disable to be a macro */

#define hard_irq_disable	hard_irq_disable

#define hard_irq_disable()	do {			\

	__hard_irq_disable();				\

	if (local_paca->soft_enabled)			\

		trace_hardirqs_off();			\

	get_paca()->soft_enabled = 0;			\

	get_paca()->irq_happened |= PACA_IRQ_HARD_DIS;	\

} while(0)



static inline bool lazy_irq_pending(void)

{

arch/powerpc/include/asm/machdep.h

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ struct rtc_time; 
struct file;

struct pci_controller;

struct kimage;

struct pci_host_bridge;



struct machdep_calls {

	char		*name;
@@ -108,6 +109,8 @@ struct machdep_calls { 
	void		(*pcibios_fixup)(void);

	int		(*pci_probe_mode)(struct pci_bus *);

	void		(*pci_irq_fixup)(struct pci_dev *dev);

	int		(*pcibios_root_bridge_prepare)(struct pci_host_bridge

				*bridge);



	/* To setup PHBs when using automatic OF platform driver for PCI */

	int		(*pci_setup_phb)(struct pci_controller *host);

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

+3 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ struct pci_controller { 
	resource_size_t io_base_phys;

	resource_size_t pci_io_size;



	/* Some machines (PReP) have a non 1:1 mapping of

	 * the PCI memory space in the CPU bus space

	 */

	resource_size_t pci_mem_offset;



	/* Some machines have a special region to forward the ISA

	 * "memory" cycles such as VGA memory regions. Left to 0

	 * if unsupported
@@ -86,6 +81,7 @@ struct pci_controller { 
	 */

	struct resource	io_resource;

	struct resource mem_resources[3];

	resource_size_t mem_offset[3];

	int global_number;		/* PCI domain number */



	resource_size_t dma_window_base_cur;
@@ -163,6 +159,8 @@ struct pci_dn { 


	int	pci_ext_config_space;	/* for pci devices */



	int	force_32bit_msi:1;



	struct	pci_dev *pcidev;	/* back-pointer to the pci device */

#ifdef CONFIG_EEH

	struct eeh_dev *edev;		/* eeh device */

arch/powerpc/include/asm/ppc-opcode.h

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ 
#define PPC_INST_MFSPR_DSCR_MASK	0xfc1fffff

#define PPC_INST_MTSPR_DSCR		0x7c1103a6

#define PPC_INST_MTSPR_DSCR_MASK	0xfc1fffff

#define PPC_INST_MFSPR_DSCR_USER	0x7c0302a6

#define PPC_INST_MFSPR_DSCR_USER_MASK	0xfc1fffff

#define PPC_INST_MTSPR_DSCR_USER	0x7c0303a6

#define PPC_INST_MTSPR_DSCR_USER_MASK	0xfc1fffff

#define PPC_INST_SLBFEE			0x7c0007a7



#define PPC_INST_STRING			0x7c00042a