Commit 88d4d957 authored by Binbin Zhou's avatar Binbin Zhou Committed by Huacai Chen
Browse files

LoongArch: Add FDT booting support from efi system table 



Since commit 40cd01a9("efi/loongarch: libstub: remove dependency on
flattened DT"), we can parse the FDT from efi system table.

And now, LoongArch is coming to support booting with FDT, so we add the
relevant booting support as well as parameter parsing.

Signed-off-by: default avatarBinbin Zhou <zhoubinbin@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent a275a82d

arch/loongarch/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ config LOONGARCH 
	select MODULES_USE_ELF_RELA if MODULES

	select NEED_PER_CPU_EMBED_FIRST_CHUNK

	select NEED_PER_CPU_PAGE_FIRST_CHUNK

	select OF

	select OF_EARLY_FLATTREE

	select PCI

	select PCI_DOMAINS_GENERIC

	select PCI_ECAM if ACPI

arch/loongarch/include/asm/efi.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


void __init efi_init(void);

void __init efi_runtime_init(void);

void __init *efi_fdt_pointer(void);

void efifb_setup_from_dmi(struct screen_info *si, const char *opt);



#define ARCH_EFI_IRQ_FLAGS_MASK  0x00000004  /* Bit 2: CSR.CRMD.IE */

arch/loongarch/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


extern unsigned long eentry;

extern unsigned long tlbrentry;

extern char init_command_line[COMMAND_LINE_SIZE];

extern void tlb_init(int cpu);

extern void cpu_cache_init(void);

extern void cache_error_setup(void);

arch/loongarch/kernel/acpi.c

+9 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/memblock.h>

#include <linux/of_fdt.h>

#include <linux/serial_core.h>

#include <asm/io.h>

#include <asm/numa.h>
@@ -145,14 +146,14 @@ void __init acpi_boot_table_init(void) 
	 * If acpi_disabled, bail out

	 */

	if (acpi_disabled)

		return;

		goto fdt_earlycon;



	/*

	 * Initialize the ACPI boot-time table parser.

	 */

	if (acpi_table_init()) {

		disable_acpi();

		return;

		goto fdt_earlycon;

	}



	loongson_sysconf.boot_cpu_id = read_csr_cpuid();
@@ -164,6 +165,12 @@ void __init acpi_boot_table_init(void) 


	/* Do not enable ACPI SPCR console by default */

	acpi_parse_spcr(earlycon_acpi_spcr_enable, false);



	return;



fdt_earlycon:

	if (earlycon_acpi_spcr_enable)

		early_init_dt_scan_chosen_stdout();

}



#ifdef CONFIG_ACPI_NUMA

arch/loongarch/kernel/efi.c

+14 −1
Original line number Diff line number Diff line
@@ -28,16 +28,29 @@ static unsigned long efi_nr_tables; 
static unsigned long efi_config_table;



static unsigned long __initdata boot_memmap = EFI_INVALID_TABLE_ADDR;

static unsigned long __initdata fdt_pointer = EFI_INVALID_TABLE_ADDR;



static efi_system_table_t *efi_systab;

static efi_config_table_type_t arch_tables[] __initdata = {

	{LINUX_EFI_BOOT_MEMMAP_GUID,	&boot_memmap,	"MEMMAP" },

	{DEVICE_TREE_GUID,		&fdt_pointer,	"FDTPTR" },

	{},

};



void __init *efi_fdt_pointer(void)

{

	if (!efi_systab)

		return NULL;



	if (fdt_pointer == EFI_INVALID_TABLE_ADDR)

		return NULL;



	return early_memremap_ro(fdt_pointer, SZ_64K);

}



void __init efi_runtime_init(void)

{

	if (!efi_enabled(EFI_BOOT))

	if (!efi_enabled(EFI_BOOT) || !efi_systab->runtime)

		return;



	if (efi_runtime_disabled()) {