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

Commit 5e220483 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Michael Ellerman:

 - a fix for hugetlb with 4K pages, broken by our recent changes for
   split PMD PTL.

 - set the correct assembler machine type on e500mc, needed since
   binutils 2.26 introduced two forms for the "wait" instruction.

 - a fix for potential missed TLB flushes with MADV_[FREE|DONTNEED] etc.
   and THP on Power9 Radix.

 - three fixes to try and make our panic handling more robust by hard
   disabling interrupts, and not marking stopped CPUs as offline because
   they haven't been properly offlined.

 - three other minor fixes.

Thanks to: Aneesh Kumar K.V, Michael Jeanson, Nicholas Piggin.

* tag 'powerpc-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/mm/hash/4k: Free hugetlb page table caches correctly.
  powerpc/64s/radix: Fix radix_kvm_prefetch_workaround paca access of not possible CPU
  powerpc/64s: Fix build failures with CONFIG_NMI_IPI=n
  powerpc/64: hard disable irqs on the panic()ing CPU
  powerpc: smp_send_stop do not offline stopped CPUs
  powerpc/64: hard disable irqs in panic_smp_self_stop
  powerpc/64s: Fix DT CPU features Power9 DD2.1 logic
  powerpc/64s/radix: Fix MADV_[FREE|DONTNEED] TLB flush miss problem with THP
  powerpc/e500mc: Set assembler machine type to e500mc
parents 7ab366e4 fadd03c6

arch/powerpc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ cpu-as-$(CONFIG_4xx) += -Wa,-m405 
cpu-as-$(CONFIG_ALTIVEC)	+= $(call as-option,-Wa$(comma)-maltivec)

cpu-as-$(CONFIG_E200)		+= -Wa,-me200

cpu-as-$(CONFIG_PPC_BOOK3S_64)	+= -Wa,-mpower4

cpu-as-$(CONFIG_PPC_E500MC)	+= $(call as-option,-Wa$(comma)-me500mc)



KBUILD_AFLAGS += $(cpu-as-y)

KBUILD_CFLAGS += $(cpu-as-y)

arch/powerpc/include/asm/book3s/32/pgalloc.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static inline void pgtable_free(void *table, unsigned index_size) 
}



#define check_pgt_cache()	do { } while (0)

#define get_hugepd_cache_index(x)  (x)



#ifdef CONFIG_SMP

static inline void pgtable_free_tlb(struct mmu_gather *tlb,

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

+21 −0
Original line number Diff line number Diff line
@@ -49,6 +49,27 @@ static inline int hugepd_ok(hugepd_t hpd) 
}

#define is_hugepd(hpd)		(hugepd_ok(hpd))



/*

 * 16M and 16G huge page directory tables are allocated from slab cache

 *

 */

#define H_16M_CACHE_INDEX (PAGE_SHIFT + H_PTE_INDEX_SIZE + H_PMD_INDEX_SIZE - 24)

#define H_16G_CACHE_INDEX                                                      \

	(PAGE_SHIFT + H_PTE_INDEX_SIZE + H_PMD_INDEX_SIZE + H_PUD_INDEX_SIZE - 34)



static inline int get_hugepd_cache_index(int index)

{

	switch (index) {

	case H_16M_CACHE_INDEX:

		return HTLB_16M_INDEX;

	case H_16G_CACHE_INDEX:

		return HTLB_16G_INDEX;

	default:

		BUG();

	}

	/* should not reach */

}



#else /* !CONFIG_HUGETLB_PAGE */

static inline int pmd_huge(pmd_t pmd) { return 0; }

static inline int pud_huge(pud_t pud) { return 0; }

arch/powerpc/include/asm/book3s/64/pgtable-64k.h

+9 −0
Original line number Diff line number Diff line
@@ -45,8 +45,17 @@ static inline int hugepd_ok(hugepd_t hpd) 
{

	return 0;

}



#define is_hugepd(pdep)			0



/*

 * This should never get called

 */

static inline int get_hugepd_cache_index(int index)

{

	BUG();

}



#else /* !CONFIG_HUGETLB_PAGE */

static inline int pmd_huge(pmd_t pmd) { return 0; }

static inline int pud_huge(pud_t pud) { return 0; }

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

+5 −0
Original line number Diff line number Diff line
@@ -287,6 +287,11 @@ enum pgtable_index { 
	PMD_INDEX,

	PUD_INDEX,

	PGD_INDEX,

	/*

	 * Below are used with 4k page size and hugetlb

	 */

	HTLB_16M_INDEX,

	HTLB_16G_INDEX,

};



extern unsigned long __vmalloc_start;