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

Merge tag 'powerpc-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Some more powerpc fixes for 5.9:

   - Opt us out of the DEBUG_VM_PGTABLE support for now as it's causing
     crashes.

   - Fix a long standing bug in our DMA mask handling that was hidden
     until recently, and which caused problems with some drivers.

   - Fix a boot failure on systems with large amounts of RAM, and no
     hugepage support and using Radix MMU, only seen in the lab.

   - A few other minor fixes.

  Thanks to Alexey Kardashevskiy, Aneesh Kumar K.V, Gautham R. Shenoy,
  Hari Bathini, Ira Weiny, Nick Desaulniers, Shirisha Ganta, Vaibhav
  Jain, and Vaidyanathan Srinivasan"

* tag 'powerpc-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/papr_scm: Limit the readability of 'perf_stats' sysfs attribute
  cpuidle: pseries: Fix CEDE latency conversion from tb to us
  powerpc/dma: Fix dma_map_ops::get_required_mask
  Revert "powerpc/build: vdso linker warning for orphan sections"
  powerpc/mm: Remove DEBUG_VM_PGTABLE support on powerpc
  selftests/powerpc: Skip PROT_SAO test in guests/LPARS
  powerpc/book3s64/radix: Fix boot failure with large amount of guest memory
parents 794a9965 0460534b

Documentation/features/debug/debug-vm-pgtable/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |     powerpc: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: | TODO |

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ config PPC 
	#

	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

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

+5 −5
Original line number Diff line number Diff line
@@ -239,14 +239,14 @@ static inline void early_init_mmu_secondary(void) 


extern void hash__setup_initial_memory_limit(phys_addr_t first_memblock_base,

					 phys_addr_t first_memblock_size);

extern void radix__setup_initial_memory_limit(phys_addr_t first_memblock_base,

					 phys_addr_t first_memblock_size);

static inline void setup_initial_memory_limit(phys_addr_t first_memblock_base,

					      phys_addr_t first_memblock_size)

{

	if (early_radix_enabled())

		return radix__setup_initial_memory_limit(first_memblock_base,

						   first_memblock_size);

	/*

	 * Hash has more strict restrictions. At this point we don't

	 * know which translations we will pick. Hence go with hash

	 * restrictions.

	 */

	return hash__setup_initial_memory_limit(first_memblock_base,

					   first_memblock_size);

}

arch/powerpc/kernel/dma-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ u64 dma_iommu_get_required_mask(struct device *dev) 
	if (!tbl)

		return 0;



	mask = 1ULL < (fls_long(tbl->it_offset + tbl->it_size) - 1);

	mask = 1ULL << (fls_long(tbl->it_offset + tbl->it_size) +

			tbl->it_page_shift - 1);

	mask += mask - 1;



	return mask;

arch/powerpc/kernel/vdso32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ $(obj-vdso32): %.o: %.S FORCE 


# actual build commands

quiet_cmd_vdso32ld = VDSO32L $@

      cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ $(call cc-ldoption, -Wl$(comma)--orphan-handling=warn) -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)

      cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)

quiet_cmd_vdso32as = VDSO32A $@

      cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $<

CRA Git | Maintained and supported by SUSTech CRA and CCSE