[parisc-linux-cvs] linux-2.6 grundler

[Grant Grundler]

On Wed, Apr 14, 2004 at 12:18:40AM -0600, Grant Grundler wrote:
> Log message:
> 2.6.5-pa7 - first baby step for PA8800 support (mako)

This doesn't get close to booting. Still neeeds work for SBA
and apperently VM (and/or SMP.  I'll send mail to regular p-l
mailing list describing the issues.

grant


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.170
diff -u -p -r1.170 Makefile
--- a/Makefile	12 Apr 2004 15:47:59 -0000	1.170
+++ b/Makefile	14 Apr 2004 06:15:47 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 5
-EXTRAVERSION = -pa6
+EXTRAVERSION = -pa7
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*
Index: arch/parisc/kernel/firmware.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/firmware.c,v
retrieving revision 1.5
diff -u -p -r1.5 firmware.c
--- a/arch/parisc/kernel/firmware.c	21 Dec 2003 13:08:45 -0000	1.5
+++ b/arch/parisc/kernel/firmware.c	14 Apr 2004 06:15:47 -0000
@@ -582,6 +582,7 @@ int pdc_get_initiator(struct hardware_pa
 		case 10:  *period = 1000; break;
 		case 20:  *period = 500; break;
 		case 40:  *period = 250; break;
+		case 80:  *period = 125; break;
 		default: /* Do nothing */ break;
 	}
 
Index: arch/parisc/kernel/hardware.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/hardware.c,v
retrieving revision 1.3
diff -u -p -r1.3 hardware.c
--- a/arch/parisc/kernel/hardware.c	9 Mar 2004 21:13:12 -0000	1.3
+++ b/arch/parisc/kernel/hardware.c	14 Apr 2004 06:15:47 -0000
@@ -1273,8 +1273,8 @@ static struct hp_cpu_type_mask {
 	{ 0x05e6, 0x0ffe, pcxw2  },  /* 0x05e6 - 0x05e7 */
 	{ 0x05e8, 0x0ff8, pcxw2  },  /* 0x05e8 - 0x05ef */
 	{ 0x05f0, 0x0ff0, pcxw2  },  /* 0x05f0 - 0x05ff */
-	{ 0x0600, 0x0ff0, pcxl   },  /* 0x0600 - 0x060f */
-	{ 0x0610, 0x0ff0, pcxl   },  /* 0x0610 - 0x061f */
+	{ 0x0600, 0x0fe0, pcxl   },  /* 0x0600 - 0x061f */
+	{ 0x0880, 0x0ff0, mako   },  /* 0x0880 - 0x088f */
 	{ 0x0000, 0x0000, pcx    }	/* terminate table */
 };
 
@@ -1289,7 +1289,8 @@ char *cpu_name_version[][2] = {
 	[pcxu_]	{ "PA8200 (PCX-U+)",	"2.0" },
 	[pcxw]	{ "PA8500 (PCX-W)",	"2.0" },
 	[pcxw_]	{ "PA8600 (PCX-W+)",	"2.0" },
-	[pcxw2]	{ "PA8700 (PCX-W2)",	"2.0" }
+	[pcxw2]	{ "PA8700 (PCX-W2)",	"2.0" },
+	[mako]	{ "PA8800 (MAKO)",	"2.0" }
 };
 
 const char * __init
Index: arch/parisc/kernel/perf.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/perf.c,v
retrieving revision 1.1
diff -u -p -r1.1 perf.c
--- a/arch/parisc/kernel/perf.c	29 Jul 2003 17:00:41 -0000	1.1
+++ b/arch/parisc/kernel/perf.c	14 Apr 2004 06:15:47 -0000
@@ -506,9 +506,11 @@ static int __init perf_init(void)
 		perf_processor_interface = ONYX_INTF;
 	} else if (boot_cpu_data.cpu_type == pcxw ||
 		 boot_cpu_data.cpu_type == pcxw_ ||
-		 boot_cpu_data.cpu_type == pcxw2) {
+		 boot_cpu_data.cpu_type == pcxw2 ||
+		 boot_cpu_data.cpu_type == mako) {
 		perf_processor_interface = CUDA_INTF;
-		if (boot_cpu_data.cpu_type == pcxw2) 
+		if (boot_cpu_data.cpu_type == pcxw2 ||
+		    boot_cpu_data.cpu_type == mako) 
 			bitmask_array = perf_bitmasks_piranha;
 	} else {
 		perf_processor_interface = UNKNOWN_INTF;
Index: arch/parisc/kernel/setup.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/setup.c,v
retrieving revision 1.3
diff -u -p -r1.3 setup.c
--- a/arch/parisc/kernel/setup.c	21 Sep 2003 19:23:22 -0000	1.3
+++ b/arch/parisc/kernel/setup.c	14 Apr 2004 06:15:47 -0000
@@ -204,6 +204,7 @@ static void __init parisc_proc_mkdir(voi
         case pcxw:
         case pcxw_:
         case pcxw2:
+	case mako:	/* XXX : this is really mckinley bus */
                 if (NULL == proc_runway_root)
                 {
                         proc_runway_root = proc_mkdir("bus/runway", 0);
Index: include/asm-parisc/hardware.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-parisc/hardware.h,v
retrieving revision 1.1
diff -u -p -r1.1 hardware.h
--- a/include/asm-parisc/hardware.h	29 Jul 2003 17:02:03 -0000	1.1
+++ b/include/asm-parisc/hardware.h	14 Apr 2004 06:15:47 -0000
@@ -36,7 +36,8 @@ enum cpu_type {
 	pcxu_	= 7, /* pa8200	(u+)	pa 2.0  */
 	pcxw	= 8, /* pa8500		pa 2.0  */
 	pcxw_	= 9, /* pa8600	(w+)	pa 2.0  */
-	pcxw2	= 10 /* pa8700		pa 2.0  */
+	pcxw2	= 10, /* pa8700		pa 2.0  */
+	mako	= 11  /* pa8800		pa 2.0  */
 };
 
 extern char *cpu_name_version[][2]; /* mapping from enum cpu_type to strings */