]> www.infradead.org Git - nvme.git/commitdiff
Merge patch "Enable SPCR table for console output on RISC-V"
authorPalmer Dabbelt <palmer@rivosinc.com>
Wed, 24 Jul 2024 14:33:41 +0000 (07:33 -0700)
committerPalmer Dabbelt <palmer@rivosinc.com>
Fri, 26 Jul 2024 12:50:48 +0000 (05:50 -0700)
Sia Jee Heng <jeeheng.sia@starfivetech.com> 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 <palmer@rivosinc.com>
1  2 
arch/riscv/Kconfig
arch/riscv/kernel/acpi.c

index 19ca402e6f264390c1c8f4b7fa90c242b26d252d,287c17daa9d514018e468afdc89a20012dcda1ae..b32472fe84c274624a7c9d0a925b63d8ca83dd2d
@@@ -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
Simple merge