1 files changed, 48 insertions, 1 deletions

diff --git a/arch/mips/loongson/common/env.c b/arch/mips/loongson/common/env.c
index 0c543eae49bf..f15228550a22 100644
--- a/arch/mips/loongson/common/env.c
+++ b/arch/mips/loongson/common/env.c
@@ -27,6 +27,12 @@ EXPORT_SYMBOL(cpu_clock_freq);
 struct efi_memory_map_loongson *loongson_memmap;
 struct loongson_system_configuration loongson_sysconf;
 
+u64 loongson_chipcfg[MAX_PACKAGES] = {0xffffffffbfc00180};
+u64 loongson_freqctrl[MAX_PACKAGES];
+
+unsigned long long smp_group[4];
+int cpuhotplug_workaround = 0;
+
 #define parse_even_earlier(res, option, p)                              \
 do {                                                                    \
         unsigned int tmp __maybe_unused;                                \
@@ -77,9 +83,47 @@ void __init prom_init_env(void)
 
         cpu_clock_freq = ecpu->cpu_clock_freq;
         loongson_sysconf.cputype = ecpu->cputype;
+        if (ecpu->cputype == Loongson_3A) {
+                loongson_sysconf.cores_per_node = 4;
+                loongson_sysconf.cores_per_package = 4;
+                smp_group[0] = 0x900000003ff01000;
+                smp_group[1] = 0x900010003ff01000;
+                smp_group[2] = 0x900020003ff01000;
+                smp_group[3] = 0x900030003ff01000;
+                loongson_chipcfg[0] = 0x900000001fe00180;
+                loongson_chipcfg[1] = 0x900010001fe00180;
+                loongson_chipcfg[2] = 0x900020001fe00180;
+                loongson_chipcfg[3] = 0x900030001fe00180;
+                loongson_sysconf.ht_control_base = 0x90000EFDFB000000;
+        } else if (ecpu->cputype == Loongson_3B) {
+                loongson_sysconf.cores_per_node = 4; /* One chip has 2 nodes */
+                loongson_sysconf.cores_per_package = 8;
+                smp_group[0] = 0x900000003ff01000;
+                smp_group[1] = 0x900010003ff05000;
+                smp_group[2] = 0x900020003ff09000;
+                smp_group[3] = 0x900030003ff0d000;
+                loongson_chipcfg[0] = 0x900000001fe00180;
+                loongson_chipcfg[1] = 0x900020001fe00180;
+                loongson_chipcfg[2] = 0x900040001fe00180;
+                loongson_chipcfg[3] = 0x900060001fe00180;
+                loongson_freqctrl[0] = 0x900000001fe001d0;
+                loongson_freqctrl[1] = 0x900020001fe001d0;
+                loongson_freqctrl[2] = 0x900040001fe001d0;
+                loongson_freqctrl[3] = 0x900060001fe001d0;
+                loongson_sysconf.ht_control_base = 0x90001EFDFB000000;
+                cpuhotplug_workaround = 1;
+        } else {
+                loongson_sysconf.cores_per_node = 1;
+                loongson_sysconf.cores_per_package = 1;
+                loongson_chipcfg[0] = 0x900000001fe00180;
+        }
+
         loongson_sysconf.nr_cpus = ecpu->nr_cpus;
         if (ecpu->nr_cpus > NR_CPUS || ecpu->nr_cpus == 0)
                 loongson_sysconf.nr_cpus = NR_CPUS;
+        loongson_sysconf.nr_nodes = (loongson_sysconf.nr_cpus +
+                loongson_sysconf.cores_per_node - 1) /
+                loongson_sysconf.cores_per_node;
 
         loongson_sysconf.pci_mem_start_addr = eirq_source->pci_mem_start_addr;
         loongson_sysconf.pci_mem_end_addr = eirq_source->pci_mem_end_addr;
@@ -93,7 +137,6 @@ void __init prom_init_env(void)
         loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
         loongson_sysconf.suspend_addr = boot_p->reset_system.DoSuspend;
 
-        loongson_sysconf.ht_control_base = 0x90000EFDFB000000;
         loongson_sysconf.vgabios_addr = boot_p->efi.smbios.vga_bios;
         pr_debug("Shutdown Addr: %llx, Restart Addr: %llx, VBIOS Addr: %llx\n",
                 loongson_sysconf.poweroff_addr, loongson_sysconf.restart_addr,
@@ -111,6 +154,10 @@ void __init prom_init_env(void)
                 case PRID_REV_LOONGSON3A:
                         cpu_clock_freq = 900000000;
                         break;
+                case PRID_REV_LOONGSON3B_R1:
+                case PRID_REV_LOONGSON3B_R2:
+                        cpu_clock_freq = 1000000000;
+                        break;
                 default:
                         cpu_clock_freq = 100000000;
                         break;