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

Commit 83fd57a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Two fixes for fallout from the hugetlb changes we merged this cycle.

  Ten other fixes, four only affect Power9, and the rest are a bit of a
  mixture though nothing terrible.

  Thanks to: Aneesh Kumar K.V, Anton Blanchard, Benjamin Herrenschmidt,
  Dave Martin, Gavin Shan, Madhavan Srinivasan, Nicholas Piggin, Reza
  Arbab"

* tag 'powerpc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Ignore reserved field in DCSR and PVR reads and writes
  powerpc/ptrace: Preserve previous TM fprs/vsrs on short regset write
  powerpc/ptrace: Preserve previous fprs/vsrs on short regset write
  powerpc/perf: Use MSR to report privilege level on P9 DD1
  selftest/powerpc: Wrong PMC initialized in pmc56_overflow test
  powerpc/eeh: Enable IO path on permanent error
  powerpc/perf: Fix PM_BRU_CMPL event code for power9
  powerpc/mm: Fix little-endian 4K hugetlb
  powerpc/mm/hugetlb: Don't panic when we don't find the default huge page size
  powerpc: Fix pgtable pmd cache init
  powerpc/icp-opal: Fix missing KVM case and harden replay
  powerpc/mm: Fix memory hotplug BUG() on radix
parents 4c9eff7a 178f3582

arch/powerpc/include/asm/book3s/64/hash-4k.h

+3 −2
Original line number Diff line number Diff line
@@ -36,12 +36,13 @@ 
#ifdef CONFIG_HUGETLB_PAGE

static inline int hash__hugepd_ok(hugepd_t hpd)

{

	unsigned long hpdval = hpd_val(hpd);

	/*

	 * if it is not a pte and have hugepd shift mask

	 * set, then it is a hugepd directory pointer

	 */

	if (!(hpd.pd & _PAGE_PTE) &&

	    ((hpd.pd & HUGEPD_SHIFT_MASK) != 0))

	if (!(hpdval & _PAGE_PTE) &&

	    ((hpdval & HUGEPD_SHIFT_MASK) != 0))

		return true;

	return false;

}

arch/powerpc/include/asm/book3s/64/hash.h

+4 −0
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ extern int __meminit hash__vmemmap_create_mapping(unsigned long start, 
					      unsigned long phys);

extern void hash__vmemmap_remove_mapping(unsigned long start,

				     unsigned long page_size);



int hash__create_section_mapping(unsigned long start, unsigned long end);

int hash__remove_section_mapping(unsigned long start, unsigned long end);



#endif /* !__ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_BOOK3S_64_HASH_H */

arch/powerpc/include/asm/hugetlb.h

+8 −6
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ static inline pte_t *hugepd_page(hugepd_t hpd) 
	 * We have only four bits to encode, MMU page size

	 */

	BUILD_BUG_ON((MMU_PAGE_COUNT - 1) > 0xf);

	return __va(hpd.pd & HUGEPD_ADDR_MASK);

	return __va(hpd_val(hpd) & HUGEPD_ADDR_MASK);

}



static inline unsigned int hugepd_mmu_psize(hugepd_t hpd)

{

	return (hpd.pd & HUGEPD_SHIFT_MASK) >> 2;

	return (hpd_val(hpd) & HUGEPD_SHIFT_MASK) >> 2;

}



static inline unsigned int hugepd_shift(hugepd_t hpd)
@@ -52,18 +52,20 @@ static inline pte_t *hugepd_page(hugepd_t hpd) 
{

	BUG_ON(!hugepd_ok(hpd));

#ifdef CONFIG_PPC_8xx

	return (pte_t *)__va(hpd.pd & ~(_PMD_PAGE_MASK | _PMD_PRESENT_MASK));

	return (pte_t *)__va(hpd_val(hpd) &

			     ~(_PMD_PAGE_MASK | _PMD_PRESENT_MASK));

#else

	return (pte_t *)((hpd.pd & ~HUGEPD_SHIFT_MASK) | PD_HUGE);

	return (pte_t *)((hpd_val(hpd) &

			  ~HUGEPD_SHIFT_MASK) | PD_HUGE);

#endif

}



static inline unsigned int hugepd_shift(hugepd_t hpd)

{

#ifdef CONFIG_PPC_8xx

	return ((hpd.pd & _PMD_PAGE_MASK) >> 1) + 17;

	return ((hpd_val(hpd) & _PMD_PAGE_MASK) >> 1) + 17;

#else

	return hpd.pd & HUGEPD_SHIFT_MASK;

	return hpd_val(hpd) & HUGEPD_SHIFT_MASK;

#endif

}

arch/powerpc/include/asm/nohash/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -227,9 +227,10 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, 
static inline int hugepd_ok(hugepd_t hpd)

{

#ifdef CONFIG_PPC_8xx

	return ((hpd.pd & 0x4) != 0);

	return ((hpd_val(hpd) & 0x4) != 0);

#else

	return (hpd.pd > 0);

	/* We clear the top bit to indicate hugepd */

	return ((hpd_val(hpd) & PD_HUGE) ==  0);

#endif

}

arch/powerpc/include/asm/page.h

+0 −3
Original line number Diff line number Diff line
@@ -294,15 +294,12 @@ extern long long virt_phys_offset; 
#include <asm/pgtable-types.h>

#endif



typedef struct { signed long pd; } hugepd_t;



#ifndef CONFIG_HUGETLB_PAGE

#define is_hugepd(pdep)		(0)

#define pgd_huge(pgd)		(0)

#endif /* CONFIG_HUGETLB_PAGE */



#define __hugepd(x) ((hugepd_t) { (x) })



struct page;

extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);

extern void copy_user_page(void *to, void *from, unsigned long vaddr,