Commit 76e0c88d authored by Qing Zhang's avatar Qing Zhang Committed by Thomas Bogendoerfer
Browse files

MIPS: Loongson64: Move loongson_system_configuration to loongson.h 



The purpose of separating loongson_system_configuration from boot_param.h
is to keep the other structure consistent with the firmware.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarQing Zhang <zhangqing@loongson.cn>
Acked-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent fc841062

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

+0 −18
Original line number Diff line number Diff line
@@ -198,24 +198,6 @@ enum loongson_bridge_type { 
	VIRTUAL = 3

};



struct loongson_system_configuration {

	u32 nr_cpus;

	u32 nr_nodes;

	int cores_per_node;

	int cores_per_package;

	u16 boot_cpu_id;

	u16 reserved_cpus_mask;

	enum loongson_cpu_type cputype;

	enum loongson_bridge_type bridgetype;

	u64 restart_addr;

	u64 poweroff_addr;

	u64 suspend_addr;

	u64 vgabios_addr;

	u32 dma_mask_bits;

	u64 workarounds;

	void (*early_config)(void);

};



extern struct efi_memory_map_loongson *loongson_memmap;

extern struct loongson_system_configuration loongson_sysconf;

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

+18 −0
Original line number Diff line number Diff line
@@ -12,6 +12,24 @@ 
#include <linux/irq.h>

#include <boot_param.h>



/* machine-specific boot configuration */

struct loongson_system_configuration {

	u32 nr_cpus;

	u32 nr_nodes;

	int cores_per_node;

	int cores_per_package;

	u16 boot_cpu_id;

	u16 reserved_cpus_mask;

	enum loongson_cpu_type cputype;

	enum loongson_bridge_type bridgetype;

	u64 restart_addr;

	u64 poweroff_addr;

	u64 suspend_addr;

	u64 vgabios_addr;

	u32 dma_mask_bits;

	u64 workarounds;

	void (*early_config)(void);

};



/* machine-specific reboot/halt operation */

extern void mach_prepare_reboot(void);

drivers/irqchip/irq-loongson-liointc.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/smp.h>

#include <linux/irqchip/chained_irq.h>



#include <boot_param.h>

#include <loongson.h>



#define LIOINTC_CHIP_IRQ	32

#define LIOINTC_NUM_PARENT 4