LoongArch: Old BPI compatibility

Signed-off-by: liuyun <[email protected]>
Signed-off-by: Yanteng Si <[email protected]>

arch/loongarch/include/asm/addrspace.h

@@ -124,6 +124,7 @@ extern unsigned long vm_map_base;
 #define PCI_IOSIZE	SZ_32M
 #define ISA_IOSIZE	SZ_16K
 #define IO_SPACE_LIMIT	(PCI_IOSIZE - 1)
+#define ISA_PHY_IOBASE  LOONGSON_LIO_BASE
 
 #define PHYS_LINK_KADDR	PHYSADDR(VMLINUX_LOAD_ADDRESS)
 

arch/loongarch/include/asm/efi.h

@@ -6,6 +6,7 @@
 #define _ASM_LOONGARCH_EFI_H
 
 #include <linux/efi.h>
+#include <asm/early_ioremap.h>
 
 void __init efi_init(void);
 void __init efi_runtime_init(void);

arch/loongarch/kernel/Makefile

@@ -9,6 +9,7 @@ obj-y		+= head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \
 		   traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o switch.o \
 		   elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o \
 		   alternative.o unwind.o
+obj-y		+= legacy_boot.o
 
 obj-$(CONFIG_ACPI)		+= acpi.o
 obj-$(CONFIG_EFI) 		+= efi.o

arch/loongarch/kernel/acpi.c

@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/numa.h>
 #include <asm/loongson.h>
+#include "legacy_boot.h"
 
 int acpi_disabled;
 EXPORT_SYMBOL(acpi_disabled);
@@ -58,7 +59,7 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
 }
 
 #ifdef CONFIG_SMP
-static int set_processor_mask(u32 id, u32 flags)
+int set_processor_mask(u32 id, u32 flags)
 {
 
 	int cpu, cpuid = id;
@@ -132,6 +133,10 @@ static void __init acpi_process_madt(void)
 		__cpu_logical_map[i] = -1;
 	}
 #endif
+
+	if (efi_bp && bpi_version <= BPI_VERSION_V1)
+		legacy_madt_table_init();
+
 	acpi_table_parse_madt(ACPI_MADT_TYPE_CORE_PIC,
 			acpi_parse_processor, MAX_CORE_PIC);
 

arch/loongarch/kernel/efi.c

@@ -26,6 +26,7 @@
 #include <asm/tlb.h>
 #include <asm/loongson.h>
 #include <asm/pgalloc.h>
+#include "legacy_boot.h"
 
 static unsigned long efi_nr_tables;
 static unsigned long efi_config_table;
@@ -172,6 +173,9 @@ static int __init set_virtual_map(void)
 	efi_set_virtual_address_map_t *svam;
 	efi_memory_desc_t *in, runtime_map[32];
 
+	if (efi_bp)
+		return EFI_SUCCESS;
+
 	size = sizeof(efi_memory_desc_t);
 
 	for_each_efi_memory_desc(in) {
@@ -254,10 +258,12 @@ void __init efi_init(void)
 	void *config_tables;
 	struct efi_boot_memmap *tbl;
 
-	if (!efi_system_table)
-		return;
+	if (efi_system_table)
+		efi_systab = (efi_system_table_t *)early_memremap_ro(efi_system_table,
+						sizeof(*efi_systab));
+	else
+		efi_systab = (efi_system_table_t *)efi_bp->systemtable;
 
-	efi_systab = (efi_system_table_t *)early_memremap_ro(efi_system_table, sizeof(*efi_systab));
 	if (!efi_systab) {
 		pr_err("Can't find EFI system table.\n");
 		return;

arch/loongarch/kernel/env.c

@@ -12,6 +12,7 @@
 #include <asm/bootinfo.h>
 #include <asm/loongson.h>
 #include <asm/setup.h>
+#include "legacy_boot.h"
 
 u64 efi_system_table;
 struct loongson_system_configuration loongson_sysconf;
@@ -20,13 +21,19 @@ EXPORT_SYMBOL(loongson_sysconf);
 void __init init_environ(void)
 {
 	int efi_boot = fw_arg0;
-	char *cmdline = early_memremap_ro(fw_arg1, COMMAND_LINE_SIZE);
+	char *cmdline;
+
+	legacy_boot_init(fw_arg0, fw_arg1, fw_arg2);
+
+	if (efi_bp)
+		return;
 
 	if (efi_boot)
 		set_bit(EFI_BOOT, &efi.flags);
 	else
 		clear_bit(EFI_BOOT, &efi.flags);
 
+	cmdline = early_memremap_ro(fw_arg1, COMMAND_LINE_SIZE);
 	strscpy(boot_command_line, cmdline, COMMAND_LINE_SIZE);
 	strscpy(init_command_line, cmdline, COMMAND_LINE_SIZE);
 	early_memunmap(cmdline, COMMAND_LINE_SIZE);

arch/loongarch/kernel/irq.c

@@ -20,6 +20,7 @@
 #include <asm/irq.h>
 #include <asm/loongson.h>
 #include <asm/setup.h>
+#include "legacy_boot.h"
 
 DEFINE_PER_CPU(unsigned long, irq_stack);
 DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
@@ -61,6 +62,12 @@ static int __init early_pci_mcfg_parse(struct acpi_table_header *header)
 	if (header->length < sizeof(struct acpi_table_mcfg))
 		return -EINVAL;
 
+	for (i = 0; i < MAX_IO_PICS; i++) {
+		msi_group[i].pci_segment = -1;
+		msi_group[i].node = -1;
+		pch_group[i].node = -1;
+	}
+
 	n = (header->length - sizeof(struct acpi_table_mcfg)) /
 					sizeof(struct acpi_mcfg_allocation);
 	mcfg = (struct acpi_table_mcfg *)header;
@@ -76,14 +83,6 @@ static int __init early_pci_mcfg_parse(struct acpi_table_header *header)
 
 static void __init init_vec_parent_group(void)
 {
-	int i;
-
-	for (i = 0; i < MAX_IO_PICS; i++) {
-		msi_group[i].pci_segment = -1;
-		msi_group[i].node = -1;
-		pch_group[i].node = -1;
-	}
-
 	acpi_table_parse(ACPI_SIG_MCFG, early_pci_mcfg_parse);
 }
 
@@ -99,7 +98,7 @@ static int __init get_ipi_irq(void)
 
 void __init init_IRQ(void)
 {
-	int i;
+	int i, ret;
 #ifdef CONFIG_SMP
 	int r, ipi_irq;
 	static int ipi_dummy_dev;
@@ -111,7 +110,13 @@ void __init init_IRQ(void)
 	clear_csr_estat(ESTATF_IP);
 
 	init_vec_parent_group();
-	irqchip_init();
+	if (efi_bp && bpi_version <= BPI_VERSION_V1) {
+		ret = setup_legacy_IRQ();
+		if (ret)
+			panic("IRQ domain init error!\n");
+	} else {
+		irqchip_init();
+	}
 #ifdef CONFIG_SMP
 	ipi_irq = get_ipi_irq();
 	if (ipi_irq < 0)