Commit 3adeb256 authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

MIPS: Loongson: Improve LEFI firmware interface 



Machtypes of Loongson-3 machines become more and more, but there are
only small differences among different machtypes. Keeping a large table
of machtypes is very ugly and hard to extend. We found that the major
machtype differences are UARTs information (number of UARTs, UART IRQs,
UART clocks, etc.), platform devices (EC, temperature sensors, fan
controllers, etc.) and some workarounds (because of some CPU bugs or
mainboard bugs).

In this patch we improve the UEFI-like (LEFI) interface to make all
Loongson-3 machines use a same machtype "generic-loongson-machine".

Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/8324/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ec0f8d3f

arch/mips/include/asm/bootinfo.h

+1 −4
Original line number Diff line number Diff line
@@ -70,10 +70,7 @@ enum loongson_machine_type { 
	MACH_DEXXON_GDIUM2F10,

	MACH_LEMOTE_NAS,

	MACH_LEMOTE_LL2F,

	MACH_LEMOTE_A1004,

	MACH_LEMOTE_A1101,

	MACH_LEMOTE_A1201,

	MACH_LEMOTE_A1205,

	MACH_LOONGSON_GENERIC,

	MACH_LOONGSON_END

};

arch/mips/include/asm/mach-loongson/boot_param.h

+42 −2
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
#define VIDEO_ROM		7

#define ADAPTER_ROM		8

#define ACPI_TABLE		9

#define MAX_MEMORY_TYPE		10

#define SMBIOS_TABLE		10

#define MAX_MEMORY_TYPE		11



#define LOONGSON3_BOOT_MEM_MAP_MAX 128

struct efi_memory_map_loongson {
@@ -48,10 +49,43 @@ struct efi_cpuinfo_loongson { 
	u32 nr_cpus;

} __packed;



#define MAX_UARTS 64

struct uart_device {

	u32 iotype; /* see include/linux/serial_core.h */

	u32 uartclk;

	u32 int_offset;

	u64 uart_base;

} __packed;



#define MAX_SENSORS 64

#define SENSOR_TEMPER  0x00000001

#define SENSOR_VOLTAGE 0x00000002

#define SENSOR_FAN     0x00000004

struct sensor_device {

	char name[32];  /* a formal name */

	char label[64]; /* a flexible description */

	u32 type;       /* SENSOR_* */

	u32 id;         /* instance id of a sensor-class */

	u32 fan_policy; /* see loongson_hwmon.h */

	u32 fan_percent;/* only for constant speed policy */

	u64 base_addr;  /* base address of device registers */

} __packed;



struct system_loongson {

	u16 vers;     /* version of system_loongson */

	u32 ccnuma_smp; /* 0: no numa; 1: has numa */

	u32 sing_double_channel; /* 1:single; 2:double */

	u32 nr_uarts;

	struct uart_device uarts[MAX_UARTS];

	u32 nr_sensors;

	struct sensor_device sensors[MAX_SENSORS];

	char has_ec;

	char ec_name[32];

	u64 ec_base_addr;

	char has_tcm;

	char tcm_name[32];

	u64 tcm_base_addr;

	u64 workarounds; /* see workarounds.h */

} __packed;



struct irq_source_routing_table {
@@ -162,9 +196,15 @@ struct loongson_system_configuration { 
	u64 suspend_addr;

	u64 vgabios_addr;

	u32 dma_mask_bits;

	char ecname[32];

	u32 nr_uarts;

	struct uart_device uarts[MAX_UARTS];

	u32 nr_sensors;

	struct sensor_device sensors[MAX_SENSORS];

	u64 workarounds;

};



extern struct efi_memory_map_loongson *loongson_memmap;

extern struct loongson_system_configuration loongson_sysconf;

extern int cpuhotplug_workaround;



#endif

arch/mips/include/asm/mach-loongson/loongson.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ extern void __init prom_init_cmdline(void); 
extern void __init prom_init_machtype(void);

extern void __init prom_init_env(void);

#ifdef CONFIG_LOONGSON_UART_BASE

extern unsigned long _loongson_uart_base, loongson_uart_base;

extern unsigned long _loongson_uart_base[], loongson_uart_base[];

extern void prom_init_loongson_uart_base(void);

#endif

arch/mips/include/asm/mach-loongson/loongson_hwmon.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
#ifndef __LOONGSON_HWMON_H_

#define __LOONGSON_HWMON_H_



#include <linux/types.h>



#define MIN_TEMP	0

#define MAX_TEMP	255

#define NOT_VALID_TEMP	999



typedef int (*get_temp_fun)(int);

extern int loongson3_cpu_temp(int);



/* 0:Max speed, 1:Manual, 2:Auto */

enum fan_control_mode {

	FAN_FULL_MODE = 0,

	FAN_MANUAL_MODE = 1,

	FAN_AUTO_MODE = 2,

	FAN_MODE_END

};



struct temp_range {

	u8 low;

	u8 high;

	u8 level;

};



#define CONSTANT_SPEED_POLICY	0  /* at constent speed */

#define STEP_SPEED_POLICY	1  /* use up/down arrays to describe policy */

#define KERNEL_HELPER_POLICY	2  /* kernel as a helper to fan control */



#define MAX_STEP_NUM	16

#define MAX_FAN_LEVEL	255



/* loongson_fan_policy works when fan work at FAN_AUTO_MODE */

struct loongson_fan_policy {

	u8	type;



	/* percent only used when type is CONSTANT_SPEED_POLICY */

	u8	percent;



	/* period between two check. (Unit: S) */

	u8	adjust_period;



	/* fan adjust usually depend on a temprature input */

	get_temp_fun	depend_temp;



	/* up_step/down_step used when type is STEP_SPEED_POLICY */

	u8	up_step_num;

	u8	down_step_num;

	struct temp_range up_step[MAX_STEP_NUM];

	struct temp_range down_step[MAX_STEP_NUM];

	struct delayed_work work;

};



#endif /* __LOONGSON_HWMON_H_*/

arch/mips/include/asm/mach-loongson/machine.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#ifdef CONFIG_LOONGSON_MACH3X



#define LOONGSON_MACHTYPE MACH_LEMOTE_A1101

#define LOONGSON_MACHTYPE MACH_LOONGSON_GENERIC



#endif /* CONFIG_LOONGSON_MACH3X */

CRA Git | Maintained and supported by SUSTech CRA and CCSE