Enable SPCR table for console output on RISC-V
v2 cover Enable SPCR table for console output on RISC-V
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.
Changes in v2:
- Added code to handle early_init_dt_scan_chosen_stdout().
Sia Jee Heng (1):
RISC-V: ACPI: Enable SPCR table for console output on RISC-V
arch/riscv/Kconfig | 1 + arch/riscv/kernel/acpi.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)
base-commit: 0106679839f7c69632b3b9833c3268c316c0a9fc
Signature · 1 line
2.34.1
PATCH v2 1/1 RISC-V: ACPI: Enable SPCR table for console output on RISC-V
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.
--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/acpi.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)
arch/riscv/Kconfig +1 -0
@@ -14,6 +14,7 @@ config RISCV 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_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
arch/riscv/kernel/acpi.c +11 -1
@@ -17,7 +17,9 @@#include <linux/efi.h> #include <linux/io.h> #include <linux/memblock.h> +#include <linux/of_fdt.h> #include <linux/pci.h> +#include <linux/serial_core.h> int acpi_noirq =1 ;/* skip ACPI IRQ initialization */ int acpi_disabled =1 ;
@@ -131,7 +133,7 @@ void __init acpi_boot_table_init(void)if (param_acpi_off || (!param_acpi_on && !param_acpi_force && efi.acpi20 ==EFI_INVALID_TABLE_ADDR )) -return ; + goto done;/* * ACPI is disabled at this point. Enable it in order to parse
@@ -151,6 +153,14 @@ void __init acpi_boot_table_init(void)if (!param_acpi_force)disable_acpi (); } + +done: +if (acpi_disabled) { +if (earlycon_acpi_spcr_enable) +early_init_dt_scan_chosen_stdout (); + }else { +acpi_parse_spcr (earlycon_acpi_spcr_enable, true); + } }static int acpi_parse_madt_rintc (union acpi_subtable_headers *header,const unsigned long end)
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v2 1/1] RISC-V: ACPI: Enable SPCR table for console output on RISC-V
Quoted 48 lines · Sia Jee Heng
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.
Signed-off-by Sia Jee Heng <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/acpi.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)arch/riscv/Kconfig +1
-0@@ -14,6 +14,7 @@ config RISCV 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_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2arch/riscv/kernel/acpi.c +3
-1@@ -17,7 +17,9 @@#include <linux/efi.h> #include <linux/io.h> #include <linux/memblock.h> +#include <linux/of_fdt.h> #include <linux/pci.h> +#include <linux/serial_core.h> int acpi_noirq =1 ;/* skip ACPI IRQ initialization */ int acpi_disabled =1 ;@@ -131,7 +133,7 @@ void __init acpi_boot_table_init(void)if (param_acpi_off || (!param_acpi_on && !param_acpi_force && efi.acpi20 ==EFI_INVALID_TABLE_ADDR )) -return ; + goto done;/* * ACPI is disabled at this point. Enable it in order to parse @@ -151,6 +153,14 @@ void __init acpi_boot_table_init(void)if (!param_acpi_force)
arch/riscv/kernel/acpi.c void __init acpi_boot_table_init(void) · line 163
Quoted 10 lines
arch/riscv/kernel/acpi.c +8
-0disable_acpi (); } + +done: +if (acpi_disabled) { +if (earlycon_acpi_spcr_enable) +early_init_dt_scan_chosen_stdout (); + }else { +acpi_parse_spcr (earlycon_acpi_spcr_enable, true); + }
LGTM.
Thanks,
Sunil
Quoted 6 lines
arch/riscv/kernel/acpi.c +0
-0}static int acpi_parse_madt_rintc (union acpi_subtable_headers *header,const unsigned long end)Signature · 1 line
2.34.1
This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 9 lines · On Thu, 2 May 2024 00:37:50 -0700 you wrote:
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.
Changes in v2:
- Added code to handleearly_init_dt_scan_chosen_stdout().[...]
Here is the summary with links:
- [v2,1/1] RISC-V: ACPI: Enable SPCR table for console output on RISC-V
https://git.kernel.org/riscv/c/38738947db38
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html