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

Commit 45f7fdc2 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 Ben Herrenschmidt:
 "Here is some powerpc goodness for -rc2.  Arguably -rc1 material more
  than -rc2 but I was travelling (again !)

  It's mostly bug fixes including regressions, but there are a couple of
  new things that I decided to drop-in.

  One is a straightforward patch from Michael to add a bunch of P8 cache
  events to perf.

  The other one is a patch by myself to add the direct DMA (iommu
  bypass) for PCIe on Power8 for 64-bit capable devices.  This has been
  around for a while, I had lost track of it.  However it's been in our
  internal kernels we use for testing P8 already and it affects only P8
  related code.  Since P8 is still unreleased the risk is pretty much
  nil at this point"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/powernv: Add iommu DMA bypass support for IODA2
  powerpc: Fix endian issues in kexec and crash dump code
  powerpc/ppc32: Fix the bug in the init of non-base exception stack for UP
  powerpc/xmon: Don't signal we've entered until we're finished printing
  powerpc/xmon: Fix timeout loop in get_output_lock()
  powerpc/xmon: Don't loop forever in get_output_lock()
  powerpc/perf: Configure BHRB filter before enabling PMU interrupts
  crypto/nx/nx-842: Fix handling of vmalloc addresses
  powerpc/pseries: Select ARCH_RANDOM on pseries
  powerpc/perf: Add Power8 cache & TLB events
  powerpc/relocate fix relocate processing in LE mode
  powerpc: Fix kdump hang issue on p8 with relocation on exception enabled.
  powerpc/pseries: Disable relocation on exception while going down during crash.
  powerpc/eeh: Drop taken reference to driver on eeh_rmv_device
  powerpc: Fix build failure in sysdev/mpic.c for MPIC_WEIRD=y
parents bbb19555 cd15b048

arch/powerpc/include/asm/dma-mapping.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static inline int dma_supported(struct device *dev, u64 mask) 
}



extern int dma_set_mask(struct device *dev, u64 dma_mask);

extern int __dma_set_mask(struct device *dev, u64 dma_mask);



#define dma_alloc_coherent(d,s,h,f)	dma_alloc_attrs(d,s,h,f,NULL)

arch/powerpc/include/asm/iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct iommu_table { 
#ifdef CONFIG_IOMMU_API

	struct iommu_group *it_group;

#endif

	void (*set_bypass)(struct iommu_table *tbl, bool enable);

};



/* Pure 2^n version of get_order */

arch/powerpc/include/asm/sections.h

+12 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#ifdef __powerpc64__



extern char __start_interrupts[];

extern char __end_interrupts[];



extern char __prom_init_toc_start[];
@@ -21,6 +22,17 @@ static inline int in_kernel_text(unsigned long addr) 
	return 0;

}



static inline int overlaps_interrupt_vector_text(unsigned long start,

							unsigned long end)

{

	unsigned long real_start, real_end;

	real_start = __start_interrupts - _stext;

	real_end = __end_interrupts - _stext;



	return start < (unsigned long)__va(real_end) &&

		(unsigned long)__va(real_start) < end;

}



static inline int overlaps_kernel_text(unsigned long start, unsigned long end)

{

	return start < (unsigned long)__init_end &&

arch/powerpc/kernel/dma.c

+7 −3
Original line number Diff line number Diff line
@@ -191,12 +191,10 @@ EXPORT_SYMBOL(dma_direct_ops); 


#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)



int dma_set_mask(struct device *dev, u64 dma_mask)

int __dma_set_mask(struct device *dev, u64 dma_mask)

{

	struct dma_map_ops *dma_ops = get_dma_ops(dev);



	if (ppc_md.dma_set_mask)

		return ppc_md.dma_set_mask(dev, dma_mask);

	if ((dma_ops != NULL) && (dma_ops->set_dma_mask != NULL))

		return dma_ops->set_dma_mask(dev, dma_mask);

	if (!dev->dma_mask || !dma_supported(dev, dma_mask))
@@ -204,6 +202,12 @@ int dma_set_mask(struct device *dev, u64 dma_mask) 
	*dev->dma_mask = dma_mask;

	return 0;

}

int dma_set_mask(struct device *dev, u64 dma_mask)

{

	if (ppc_md.dma_set_mask)

		return ppc_md.dma_set_mask(dev, dma_mask);

	return __dma_set_mask(dev, dma_mask);

}

EXPORT_SYMBOL(dma_set_mask);



u64 dma_get_required_mask(struct device *dev)

arch/powerpc/kernel/eeh_driver.c

+6 −2
Original line number Diff line number Diff line
@@ -362,9 +362,13 @@ static void *eeh_rmv_device(void *data, void *userdata) 
	 */

	if (!dev || (dev->hdr_type & PCI_HEADER_TYPE_BRIDGE))

		return NULL;



	driver = eeh_pcid_get(dev);

	if (driver && driver->err_handler)

	if (driver) {

		eeh_pcid_put(dev);

		if (driver->err_handler)

			return NULL;

	}



	/* Remove it from PCI subsystem */

	pr_debug("EEH: Removing %s without EEH sensitive driver\n",