Commit 0afe2db2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D 

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/signal_64.c
	include/asm-x86/cpufeature.h
parents d8470596 43603c8d

arch/x86/Kconfig.cpu

+54 −0
Original line number Diff line number Diff line
@@ -419,6 +419,60 @@ config X86_DEBUGCTLMSR 
	def_bool y

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)



menuconfig PROCESSOR_SELECT

	default y

	bool "Supported processor vendors" if EMBEDDED

	help

	  This lets you choose what x86 vendor support code your kernel

	  will include.



config CPU_SUP_INTEL

	default y

	bool "Support Intel processors" if PROCESSOR_SELECT

	help

	  This enables extended support for Intel processors



config CPU_SUP_CYRIX_32

	default y

	bool "Support Cyrix processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Cyrix processors



config CPU_SUP_AMD

	default y

	bool "Support AMD processors" if PROCESSOR_SELECT

	help

	  This enables extended support for AMD processors



config CPU_SUP_CENTAUR_32

	default y

	bool "Support Centaur processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Centaur processors



config CPU_SUP_CENTAUR_64

	default y

	bool "Support Centaur processors" if PROCESSOR_SELECT

	depends on 64BIT

	help

	  This enables extended support for Centaur processors



config CPU_SUP_TRANSMETA_32

	default y

	bool "Support Transmeta processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Transmeta processors



config CPU_SUP_UMC_32

	default y

	bool "Support UMC processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for UMC processors



config X86_DS

	bool "Debug Store support"

	default y

arch/x86/boot/cpu.c

+9 −8
Original line number Diff line number Diff line
@@ -59,17 +59,18 @@ int validate_cpu(void) 
			u32 e = err_flags[i];



			for (j = 0; j < 32; j++) {

				int n = (i << 5)+j;

				if (*msg_strs < n) {

				if (msg_strs[0] < i ||

				    (msg_strs[0] == i && msg_strs[1] < j)) {

					/* Skip to the next string */

					do {

						msg_strs++;

					} while (*msg_strs);

					msg_strs++;

					msg_strs += 2;

					while (*msg_strs++)

						;

				}

				if (e & 1) {

					if (*msg_strs == n && msg_strs[1])

						printf("%s ", msg_strs+1);

					if (msg_strs[0] == i &&

					    msg_strs[1] == j &&

					    msg_strs[2])

						printf("%s ", msg_strs+2);

					else

						printf("%d:%d ", i, j);

				}

arch/x86/boot/mkcpustr.c

+20 −20
Original line number Diff line number Diff line
@@ -15,33 +15,33 @@ 


#include <stdio.h>



#include "../kernel/cpu/feature_names.c"



#if NCAPFLAGS > 8

# error "Need to adjust the boot code handling of CPUID strings"

#endif

#include "../kernel/cpu/capflags.c"



int main(void)

{

	int i;

	int i, j;

	const char *str;



	printf("static const char x86_cap_strs[] = \n");



	for (i = 0; i < NCAPINTS*32; i++) {

		str = x86_cap_flags[i];

	for (i = 0; i < NCAPINTS; i++) {

		for (j = 0; j < 32; j++) {

			str = x86_cap_flags[i*32+j];



		if (i == NCAPINTS*32-1) {

			if (i == NCAPINTS-1 && j == 31) {

				/* The last entry must be unconditional; this

			   also consumes the compiler-added null character */

				   also consumes the compiler-added null

				   character */

				if (!str)

					str = "";

			printf("\t\"\\x%02x\"\"%s\"\n", i, str);

				printf("\t\"\\x%02x\\x%02x\"\"%s\"\n",

				       i, j, str);

			} else if (str) {

				printf("#if REQUIRED_MASK%d & (1 << %d)\n"

			       "\t\"\\x%02x\"\"%s\\0\"\n"

				       "\t\"\\x%02x\\x%02x\"\"%s\\0\"\n"

				       "#endif\n",

			       i >> 5, i & 31, i, str);

				       i, j, i, j, str);

			}

		}

	}

	printf("\t;\n");

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);