From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Wed, 24 Jul 2024 14:39:39 +0000 (-0700)
Subject: Merge patch series "RISC-V: Select ACPI PPTT drivers"
X-Git-Tag: v6.11-rc1~27^2~2
X-Git-Url: http://git.infradead.org/users/dwmw2/static/?p=users%2Fhch%2Fmisc.git;a=commitdiff_plain;h=3aa1a7d013dd69d187a7b2daa1a0961b7d4edc71

Merge patch series "RISC-V: Select ACPI PPTT drivers"

This series adds support for ACPI PPTT via cacheinfo.

* b4-shazam-merge:
  RISC-V: Select ACPI PPTT drivers
  riscv: cacheinfo: initialize cacheinfo's level and type from ACPI PPTT
  riscv: cacheinfo: remove the useless input parameter (node) of ci_leaf_init()

Link: https://lore.kernel.org/r/20240617131425.7526-1-cuiyunhui@bytedance.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

3aa1a7d013dd69d187a7b2daa1a0961b7d4edc71
diff --cc arch/riscv/Kconfig
index b32472fe84c2,15f062e1d5ee..f4267bb8d901
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -13,12 -13,10 +13,13 @@@ config 32BI
  config RISCV
  	def_bool y
  	select ACPI_GENERIC_GSI if ACPI
+ 	select ACPI_PPTT if ACPI
  	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
 +	select ACPI_SPCR_TABLE if ACPI
  	select ARCH_DMA_DEFAULT_COHERENT
  	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION
 +	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM_VMEMMAP
 +	select ARCH_ENABLE_MEMORY_HOTREMOVE if MEMORY_HOTPLUG
  	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
  	select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
  	select ARCH_HAS_BINFMT_FLAT