From: Palmer Dabbelt Date: Wed, 24 Jul 2024 14:33:41 +0000 (-0700) Subject: Merge patch "Enable SPCR table for console output on RISC-V" X-Git-Tag: nvme-6.12-2024-09-06~52^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ec1dc56b54d679cbfaa7ef7abbf23bdeac029af1;p=nvme.git Merge patch "Enable SPCR table for console output on RISC-V" Sia Jee Heng says: The ACPI SPCR code has been used to enable console output for ARM64 and X86. The same code can be reused for RISC-V. Furthermore, SPCR table is mandated for headless system as outlined in the RISC-V BRS Specification, chapter 6. * b4-shazam-merge: RISC-V: ACPI: Enable SPCR table for console output on RISC-V Link: https://lore.kernel.org/r/20240502073751.102093-1-jeeheng.sia@starfivetech.com Signed-off-by: Palmer Dabbelt --- ec1dc56b54d679cbfaa7ef7abbf23bdeac029af1 diff --cc arch/riscv/Kconfig index 19ca402e6f26,287c17daa9d5..b32472fe84c2 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@@ -14,10 -14,9 +14,11 @@@ config RISC def_bool y select ACPI_GENERIC_GSI 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