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

Commit 6f68a6ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Michael Ellerman:
 "Fix running SPU programs on Cell, and a few other minor fixes.

  Thanks to Alistair Popple, Jeremy Kerr, Michael Neuling, Nicholas
  Piggin"

* tag 'powerpc-4.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructions
  powerpc/spufs: Fix hash faults for kernel regions
  powerpc: Fix booting P9 hash with CONFIG_PPC_RADIX_MMU=N
  powerpc/powernv/npu-dma.c: Fix opal_npu_destroy_context() call
  selftests/powerpc: Fix TM resched DSCR test with some compilers
parents 38e6bf23 a4700a26

arch/powerpc/include/uapi/asm/cputable.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define PPC_FEATURE2_HTM_NOSC		0x01000000

#define PPC_FEATURE2_ARCH_3_00		0x00800000 /* ISA 3.00 */

#define PPC_FEATURE2_HAS_IEEE128	0x00400000 /* VSX IEEE Binary Float 128-bit */

#define PPC_FEATURE2_DARN		0x00200000 /* darn random number insn */

#define PPC_FEATURE2_SCV		0x00100000 /* scv syscall */



/*

 * IMPORTANT!

arch/powerpc/kernel/cputable.c

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ extern void __restore_cpu_e6500(void); 
#define COMMON_USER_POWER9	COMMON_USER_POWER8

#define COMMON_USER2_POWER9	(COMMON_USER2_POWER8 | \

				 PPC_FEATURE2_ARCH_3_00 | \

				 PPC_FEATURE2_HAS_IEEE128)

				 PPC_FEATURE2_HAS_IEEE128 | \

				 PPC_FEATURE2_DARN )



#ifdef CONFIG_PPC_BOOK3E_64

#define COMMON_USER_BOOKE	(COMMON_USER_PPC64 | PPC_FEATURE_BOOKE)

arch/powerpc/kernel/prom.c

+2 −0
Original line number Diff line number Diff line
@@ -161,7 +161,9 @@ static struct ibm_pa_feature { 
	{ .pabyte = 0,  .pabit = 3, .cpu_features  = CPU_FTR_CTRL },

	{ .pabyte = 0,  .pabit = 6, .cpu_features  = CPU_FTR_NOEXECUTE },

	{ .pabyte = 1,  .pabit = 2, .mmu_features  = MMU_FTR_CI_LARGE_PAGE },

#ifdef CONFIG_PPC_RADIX_MMU

	{ .pabyte = 40, .pabit = 0, .mmu_features  = MMU_FTR_TYPE_RADIX },

#endif

	{ .pabyte = 1,  .pabit = 1, .invert = 1, .cpu_features = CPU_FTR_NODSISRALIGN },

	{ .pabyte = 5,  .pabit = 0, .cpu_features  = CPU_FTR_REAL_LE,

				    .cpu_user_ftrs = PPC_FEATURE_TRUE_LE },

arch/powerpc/platforms/cell/spu_base.c

+3 −1
Original line number Diff line number Diff line
@@ -197,7 +197,9 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) 
	    (REGION_ID(ea) != USER_REGION_ID)) {



		spin_unlock(&spu->register_lock);

		ret = hash_page(ea, _PAGE_PRESENT | _PAGE_READ, 0x300, dsisr);

		ret = hash_page(ea,

				_PAGE_PRESENT | _PAGE_READ | _PAGE_PRIVILEGED,

				0x300, dsisr);

		spin_lock(&spu->register_lock);



		if (!ret) {

arch/powerpc/platforms/powernv/npu-dma.c

+2 −3
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static void pnv_npu2_release_context(struct kref *kref) 
void pnv_npu2_destroy_context(struct npu_context *npu_context,

			struct pci_dev *gpdev)

{

	struct pnv_phb *nphb, *phb;

	struct pnv_phb *nphb;

	struct npu *npu;

	struct pci_dev *npdev = pnv_pci_get_npu_dev(gpdev, 0);

	struct device_node *nvlink_dn;
@@ -728,13 +728,12 @@ void pnv_npu2_destroy_context(struct npu_context *npu_context, 


	nphb = pci_bus_to_host(npdev->bus)->private_data;

	npu = &nphb->npu;

	phb = pci_bus_to_host(gpdev->bus)->private_data;

	nvlink_dn = of_parse_phandle(npdev->dev.of_node, "ibm,nvlink", 0);

	if (WARN_ON(of_property_read_u32(nvlink_dn, "ibm,npu-link-index",

							&nvlink_index)))

		return;

	npu_context->npdev[npu->index][nvlink_index] = NULL;

	opal_npu_destroy_context(phb->opal_id, npu_context->mm->context.id,

	opal_npu_destroy_context(nphb->opal_id, npu_context->mm->context.id,

				PCI_DEVID(gpdev->bus->number, gpdev->devfn));

	kref_put(&npu_context->kref, pnv_npu2_release_context);

}