Commit 1625324d authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86: move dir es7000 to es7000_32.c 



to be aligned with numaq, summit.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7203781c

arch/x86/es7000/Makefile

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



obj-$(CONFIG_X86_ES7000)	:= es7000plat.o

arch/x86/es7000/es7000.h

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line 
/*

 * Written by: Garry Forsgren, Unisys Corporation

 *             Natalie Protasevich, Unisys Corporation

 * This file contains the code to configure and interface

 * with Unisys ES7000 series hardware system manager.

 *

 * Copyright (c) 2003 Unisys Corporation.  All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write the Free Software Foundation, Inc., 59

 * Temple Place - Suite 330, Boston MA 02111-1307, USA.

 *

 * Contact information: Unisys Corporation, Township Line & Union Meeting

 * Roads-A, Unisys Way, Blue Bell, Pennsylvania, 19424, or:

 *

 * http://www.unisys.com

 */



/*

 * ES7000 chipsets

 */



#define NON_UNISYS		0

#define ES7000_CLASSIC		1

#define ES7000_ZORRO		2





#define	MIP_REG			1

#define	MIP_PSAI_REG		4



#define	MIP_BUSY		1

#define	MIP_SPIN		0xf0000

#define	MIP_VALID		0x0100000000000000ULL

#define	MIP_PORT(VALUE)	((VALUE >> 32) & 0xffff)



#define	MIP_RD_LO(VALUE)	(VALUE & 0xffffffff)



struct mip_reg_info {

	unsigned long long mip_info;

	unsigned long long delivery_info;

	unsigned long long host_reg;

	unsigned long long mip_reg;

};



struct part_info {

	unsigned char type;

	unsigned char length;

	unsigned char part_id;

	unsigned char apic_mode;

	unsigned long snum;

	char ptype[16];

	char sname[64];

	char pname[64];

};



struct psai {

	unsigned long long entry_type;

	unsigned long long addr;

	unsigned long long bep_addr;

};



struct es7000_mem_info {

	unsigned char type;

	unsigned char length;

	unsigned char resv[6];

	unsigned long long  start;

	unsigned long long  size;

};



struct es7000_oem_table {

	unsigned long long hdr;

	struct mip_reg_info mip;

	struct part_info pif;

	struct es7000_mem_info shm;

	struct psai psai;

};



#ifdef CONFIG_ACPI



struct oem_table {

	struct acpi_table_header Header;

	u32 OEMTableAddr;

	u32 OEMTableSize;

};



extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);

#endif



struct mip_reg {

	unsigned long long off_0;

	unsigned long long off_8;

	unsigned long long off_10;

	unsigned long long off_18;

	unsigned long long off_20;

	unsigned long long off_28;

	unsigned long long off_30;

	unsigned long long off_38;

};



#define	MIP_SW_APIC		0x1020b

#define	MIP_FUNC(VALUE)		(VALUE & 0xff)



extern int parse_unisys_oem (char *oemptr);

extern void setup_unisys(void);

extern int es7000_start_cpu(int cpu, unsigned long eip);

extern void es7000_sw_apic(void);

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o 
obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o

obj-$(CONFIG_X86_ES7000)	+= es7000_32.o

obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o

obj-y				+= vsmp_64.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

arch/x86/es7000/es7000plat.c→arch/x86/kernel/es7000_32.c

+84 −1
Original line number Diff line number Diff line
@@ -39,9 +39,92 @@ 
#include <asm/nmi.h>

#include <asm/smp.h>

#include <asm/apicdef.h>

#include "es7000.h"

#include <mach_mpparse.h>



/*

 * ES7000 chipsets

 */



#define NON_UNISYS		0

#define ES7000_CLASSIC		1

#define ES7000_ZORRO		2





#define	MIP_REG			1

#define	MIP_PSAI_REG		4



#define	MIP_BUSY		1

#define	MIP_SPIN		0xf0000

#define	MIP_VALID		0x0100000000000000ULL

#define	MIP_PORT(VALUE)	((VALUE >> 32) & 0xffff)



#define	MIP_RD_LO(VALUE)	(VALUE & 0xffffffff)



struct mip_reg_info {

	unsigned long long mip_info;

	unsigned long long delivery_info;

	unsigned long long host_reg;

	unsigned long long mip_reg;

};



struct part_info {

	unsigned char type;

	unsigned char length;

	unsigned char part_id;

	unsigned char apic_mode;

	unsigned long snum;

	char ptype[16];

	char sname[64];

	char pname[64];

};



struct psai {

	unsigned long long entry_type;

	unsigned long long addr;

	unsigned long long bep_addr;

};



struct es7000_mem_info {

	unsigned char type;

	unsigned char length;

	unsigned char resv[6];

	unsigned long long  start;

	unsigned long long  size;

};



struct es7000_oem_table {

	unsigned long long hdr;

	struct mip_reg_info mip;

	struct part_info pif;

	struct es7000_mem_info shm;

	struct psai psai;

};



#ifdef CONFIG_ACPI



struct oem_table {

	struct acpi_table_header Header;

	u32 OEMTableAddr;

	u32 OEMTableSize;

};



extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);

#endif



struct mip_reg {

	unsigned long long off_0;

	unsigned long long off_8;

	unsigned long long off_10;

	unsigned long long off_18;

	unsigned long long off_20;

	unsigned long long off_28;

	unsigned long long off_30;

	unsigned long long off_38;

};



#define	MIP_SW_APIC		0x1020b

#define	MIP_FUNC(VALUE)		(VALUE & 0xff)



/*

 * ES7000 Globals

 */

arch/x86/mach-generic/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,4 +9,3 @@ obj-$(CONFIG_X86_NUMAQ) += numaq.o 
obj-$(CONFIG_X86_SUMMIT)	+= summit.o

obj-$(CONFIG_X86_BIGSMP)	+= bigsmp.o

obj-$(CONFIG_X86_ES7000)	+= es7000.o
 
obj-$(CONFIG_X86_ES7000)	+= ../../x86/es7000/