|
@@ -18,29 +18,30 @@
|
|
|
* option) any later version.
|
|
|
*/
|
|
|
#include <linux/module.h>
|
|
|
-
|
|
|
#include <asm/bootinfo.h>
|
|
|
-
|
|
|
#include <loongson.h>
|
|
|
+#include <boot_param.h>
|
|
|
|
|
|
-unsigned long cpu_clock_freq;
|
|
|
+u32 cpu_clock_freq;
|
|
|
EXPORT_SYMBOL(cpu_clock_freq);
|
|
|
-unsigned long memsize, highmemsize;
|
|
|
+struct efi_memory_map_loongson *loongson_memmap;
|
|
|
+struct loongson_system_configuration loongson_sysconf;
|
|
|
|
|
|
#define parse_even_earlier(res, option, p) \
|
|
|
do { \
|
|
|
unsigned int tmp __maybe_unused; \
|
|
|
\
|
|
|
if (strncmp(option, (char *)p, strlen(option)) == 0) \
|
|
|
- tmp = strict_strtol((char *)p + strlen(option"="), 10, &res); \
|
|
|
+ tmp = kstrtou32((char *)p + strlen(option"="), 10, &res); \
|
|
|
} while (0)
|
|
|
|
|
|
void __init prom_init_env(void)
|
|
|
{
|
|
|
/* pmon passes arguments in 32bit pointers */
|
|
|
- int *_prom_envp;
|
|
|
- unsigned long bus_clock;
|
|
|
unsigned int processor_id;
|
|
|
+
|
|
|
+#ifndef CONFIG_LEFI_FIRMWARE_INTERFACE
|
|
|
+ int *_prom_envp;
|
|
|
long l;
|
|
|
|
|
|
/* firmware arguments are initialized in head.S */
|
|
@@ -48,7 +49,6 @@ void __init prom_init_env(void)
|
|
|
|
|
|
l = (long)*_prom_envp;
|
|
|
while (l != 0) {
|
|
|
- parse_even_earlier(bus_clock, "busclock", l);
|
|
|
parse_even_earlier(cpu_clock_freq, "cpuclock", l);
|
|
|
parse_even_earlier(memsize, "memsize", l);
|
|
|
parse_even_earlier(highmemsize, "highmemsize", l);
|
|
@@ -57,8 +57,48 @@ void __init prom_init_env(void)
|
|
|
}
|
|
|
if (memsize == 0)
|
|
|
memsize = 256;
|
|
|
- if (bus_clock == 0)
|
|
|
- bus_clock = 66000000;
|
|
|
+ pr_info("memsize=%u, highmemsize=%u\n", memsize, highmemsize);
|
|
|
+#else
|
|
|
+ struct boot_params *boot_p;
|
|
|
+ struct loongson_params *loongson_p;
|
|
|
+ struct efi_cpuinfo_loongson *ecpu;
|
|
|
+ struct irq_source_routing_table *eirq_source;
|
|
|
+
|
|
|
+ /* firmware arguments are initialized in head.S */
|
|
|
+ boot_p = (struct boot_params *)fw_arg2;
|
|
|
+ loongson_p = &(boot_p->efi.smbios.lp);
|
|
|
+
|
|
|
+ ecpu = (struct efi_cpuinfo_loongson *)
|
|
|
+ ((u64)loongson_p + loongson_p->cpu_offset);
|
|
|
+ eirq_source = (struct irq_source_routing_table *)
|
|
|
+ ((u64)loongson_p + loongson_p->irq_offset);
|
|
|
+ loongson_memmap = (struct efi_memory_map_loongson *)
|
|
|
+ ((u64)loongson_p + loongson_p->memory_offset);
|
|
|
+
|
|
|
+ cpu_clock_freq = ecpu->cpu_clock_freq;
|
|
|
+ loongson_sysconf.cputype = ecpu->cputype;
|
|
|
+ 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.pci_mem_start_addr = eirq_source->pci_mem_start_addr;
|
|
|
+ loongson_sysconf.pci_mem_end_addr = eirq_source->pci_mem_end_addr;
|
|
|
+ loongson_sysconf.pci_io_base = eirq_source->pci_io_start_addr;
|
|
|
+ loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;
|
|
|
+ if (loongson_sysconf.dma_mask_bits < 32 ||
|
|
|
+ loongson_sysconf.dma_mask_bits > 64)
|
|
|
+ loongson_sysconf.dma_mask_bits = 32;
|
|
|
+
|
|
|
+ loongson_sysconf.restart_addr = boot_p->reset_system.ResetWarm;
|
|
|
+ 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,
|
|
|
+ loongson_sysconf.vgabios_addr);
|
|
|
+#endif
|
|
|
if (cpu_clock_freq == 0) {
|
|
|
processor_id = (¤t_cpu_data)->processor_id;
|
|
|
switch (processor_id & PRID_REV_MASK) {
|
|
@@ -68,12 +108,13 @@ void __init prom_init_env(void)
|
|
|
case PRID_REV_LOONGSON2F:
|
|
|
cpu_clock_freq = 797000000;
|
|
|
break;
|
|
|
+ case PRID_REV_LOONGSON3A:
|
|
|
+ cpu_clock_freq = 900000000;
|
|
|
+ break;
|
|
|
default:
|
|
|
cpu_clock_freq = 100000000;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- pr_info("busclock=%ld, cpuclock=%ld, memsize=%ld, highmemsize=%ld\n",
|
|
|
- bus_clock, cpu_clock_freq, memsize, highmemsize);
|
|
|
+ pr_info("CpuClock = %u\n", cpu_clock_freq);
|
|
|
}
|