[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka410.c,1.11,1.12 cpu_ka42.c,1.15,1.16 cpu_ka43.c,1.18,1.19 cpu_ka46.c,1.20,1.21 cpu_ka48.c,1.6,1.7 cpu_ka630.c,1.10,1.11 cpu_ka640.c,1.9,1.10 cpu_ka660.c,1.9,1.10 cpu_vxt.c,1.13,1.14

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4861

Modified Files:
	cpu_ka410.c cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka48.c 
	cpu_ka630.c cpu_ka640.c cpu_ka660.c cpu_vxt.c 
Log Message:
Add in support for new-style CPU identification


Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cpu_ka46.c	30 Sep 2004 21:16:59 -0000	1.20
+++ cpu_ka46.c	2 Oct 2004 00:03:14 -0000	1.21
@@ -144,9 +144,7 @@
 	.mv = &mv_ka46,
 	.sid_mask = VAX_SID_FAMILY_MASK,
 	.sid_match = VAX_MARIAH << VAX_SID_FAMILY_SHIFT,
-	.sidex_addr = RIGEL_SIDEX_ADDR, /* This is bogus: mariah isn't rigel
-					   and so it should have an own
-					   define! */
+	.sidex_addr = MARIAH_SIDEX_ADDR,
 	.sidex_mask = 0x00000000,
 	.sidex_match = 0x00000000,
 };

Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cpu_vxt.c	30 Sep 2004 21:15:14 -0000	1.13
+++ cpu_vxt.c	2 Oct 2004 00:03:14 -0000	1.14
@@ -54,3 +54,16 @@
 	.clock_init = generic_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_vxt = {
+        .mv = &mv_vxt,
+        .sid_mask = VAX_SID_FAMILY_MASK,
+        .sid_match = VAX_SOC << VAX_SID_FAMILY_SHIFT,
+
+        .sidex_addr = SOC_SIDEX_ADDR,
+
+        .sidex_mask = SOC_SIDEX_TYPE_MASK,
+        .sidex_match = SOC_SIDEX_TYPE_VXT << SOC_SIDEX_TYPE_SHIFT
+};
+#endif /* USE_NEW_VECTORS */
+

Index: cpu_ka630.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka630.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cpu_ka630.c	26 Feb 2004 10:30:49 -0000	1.10
+++ cpu_ka630.c	2 Oct 2004 00:03:14 -0000	1.11
@@ -29,3 +29,26 @@
 	.clock_init = generic_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka630 = {
+        .mv = &mv_ka630,
+        .sid_mask = VAX_SID_FAMILY_MASK | UVAX2_SID_SUBTYPE_MASK,
+        .sid_match = (VAX_UVAX2 << VAX_SID_FAMILY_SHIFT) |
+                        (UVAX2_SID_SUBTYPE_KA630 << UVAX2_SID_SUBTYPE_SHIFT),
+        .sidex_addr = 0,
+        .sidex_mask = 0x00000000,
+        .sidex_match = 0x00000000,
+};
+
+static struct machvec_match __CPU_MATCH mvm_charon = {
+        .mv = &mv_ka630,
+        .sid_mask = VAX_SID_FAMILY_MASK | UVAX2_SID_SUBTYPE_MASK,
+        .sid_match = (VAX_UVAX2 << VAX_SID_FAMILY_SHIFT) |
+                        (UVAX2_SID_SUBTYPE_KA630 << UVAX2_SID_SUBTYPE_SHIFT),
+        .sidex_addr = 0,
+        .sidex_mask = 0x00000000,
+        .sidex_match = 0x00000000,
+};
+
+#endif /* USE_NEW_VECTORS */
+

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cpu_ka42.c	18 Sep 2004 23:06:33 -0000	1.15
+++ cpu_ka42.c	2 Oct 2004 00:03:14 -0000	1.16
@@ -55,6 +55,18 @@
 	.clock_init = ka4x_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka42 = {
+        .mv = &mv_ka42,
+        .sid_mask = VAX_SID_FAMILY_MASK,
+        .sid_match = VAX_CVAX << VAX_SID_FAMILY_SHIFT,
+
+        .sidex_addr = CVAX_SIDEX_ADDR,
+        .sidex_mask = CVAX_SIDEX_TYPE_MASK,
+        .sidex_match = CVAX_SIDEX_TYPE_VS3100 << CVAX_SIDEX_TYPE_SHIFT,
+};
+#endif /* USE_NEW_VECTORS */
+
 static struct platform_device ka42_vsbus_device = {
 	.name = "ka4x-vsbus"
 };

Index: cpu_ka660.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka660.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cpu_ka660.c	26 Feb 2004 10:33:37 -0000	1.9
+++ cpu_ka660.c	2 Oct 2004 00:03:14 -0000	1.10
@@ -37,3 +37,17 @@
 	.clock_init = generic_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka660 = {
+        .mv = &mv_ka660,
+        .sid_mask = VAX_SID_FAMILY_MASK,
+        .sid_match = VAX_SOC << VAX_SID_FAMILY_SHIFT,
+
+        .sidex_addr = SOC_SIDEX_ADDR,
+
+        .sidex_mask = SOC_SIDEX_TYPE_MASK | SOC_Q22_SUBTYPE_MASK,
+        .sidex_match = (SOC_SIDEX_TYPE_Q22 << SOC_SIDEX_TYPE_SHIFT) |
+                        (SOC_Q22_SUBTYPE_KA660 << SOC_Q22_SUBTYPE_SHIFT),
+};
+#endif /* USE_NEW_VECTORS */
+

Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cpu_ka43.c	18 Sep 2004 23:06:33 -0000	1.18
+++ cpu_ka43.c	2 Oct 2004 00:03:14 -0000	1.19
@@ -236,6 +236,17 @@
 	.clock_init = ka4x_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka43 = {
+        .mv = &mv_ka43,
+        .sid_mask = VAX_SID_FAMILY_MASK,
+        .sid_match = VAX_RIGEL << VAX_SID_FAMILY_SHIFT,
+        .sidex_addr = RIGEL_SIDEX_ADDR,
+        .sidex_mask = 0x00000000, /* don't care */
+        .sidex_match = 0x00000000,
+};
+#endif /* USE_NEW_VECTORS */
+
 static struct platform_device ka43_vsbus_device = {
         .name = "ka4x-vsbus"
 };

Index: cpu_ka410.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka410.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cpu_ka410.c	26 Feb 2004 10:23:13 -0000	1.11
+++ cpu_ka410.c	2 Oct 2004 00:03:14 -0000	1.12
@@ -40,3 +40,15 @@
 	.clock_init = ka4x_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka410 = {
+        .mv = &mv_ka410,
+        .sid_mask = VAX_SID_FAMILY_MASK | UVAX2_SID_SUBTYPE_MASK,
+        .sid_match = (VAX_UVAX2 << VAX_SID_FAMILY_SHIFT) |
+			(UVAX2_SID_SUBTYPE_KA410 << UVAX2_SID_SUBTYPE_SHIFT),
+        .sidex_addr = 0,
+        .sidex_mask = 0x00000000,
+        .sidex_match = 0x00000000,
+};
+#endif /* USE_NEW_VECTORS */
+

Index: cpu_ka640.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka640.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cpu_ka640.c	26 Feb 2004 10:31:31 -0000	1.9
+++ cpu_ka640.c	2 Oct 2004 00:03:14 -0000	1.10
@@ -55,3 +55,17 @@
 	.clock_init = generic_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka640 = {
+        .mv = &mv_ka640,
+        .sid_mask = VAX_SID_FAMILY_MASK,
+        .sid_match = VAX_CVAX << VAX_SID_FAMILY_SHIFT,
+
+        .sidex_addr = CVAX_SIDEX_ADDR,
+
+        .sidex_mask = CVAX_SIDEX_TYPE_MASK | CVAX_Q22_SUBTYPE_MASK,
+        .sidex_match = (CVAX_SIDEX_TYPE_Q22 << CVAX_SIDEX_TYPE_SHIFT) |
+                        (CVAX_Q22_SUBTYPE_KA640 << CVAX_Q22_SUBTYPE_SHIFT),
+};
+#endif /* USE_NEW_VECTORS */
+

Index: cpu_ka48.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka48.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cpu_ka48.c	20 Sep 2004 08:53:18 -0000	1.6
+++ cpu_ka48.c	2 Oct 2004 00:03:14 -0000	1.7
@@ -130,6 +130,17 @@
 	.clock_init = ka4x_clock_init,
 };
 
+#ifdef USE_NEW_VECTORS
+static struct machvec_match __CPU_MATCH mvm_ka48 = {
+        .mv = &mv_ka48,
+        .sid_mask = VAX_SID_FAMILY_MASK,
+        .sid_match = VAX_SOC << VAX_SID_FAMILY_SHIFT,
+        .sidex_addr = SOC_SIDEX_ADDR,
+        .sidex_mask = SOC_SIDEX_TYPE_MASK,
+        .sidex_match = SOC_SIDEX_TYPE_KA48 << SOC_SIDEX_TYPE_SHIFT,
+};
+#endif /* USE_NEW_VECTORS */
+
 static struct platform_device ka48_vsbus_device = {
 	.name = "ka4x-vsbus"
 };