Menu
▾
▴
[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka410.c,1.12,1.13 cpu_ka42.c,1.16,1.17 cpu_ka43.c,1.19,1.20 cpu_ka46.c,1.21,1.22 cpu_ka48.c,1.7,1.8 cpu_ka49.c,1.1,1.2 cpu_ka55.c,1.11,1.12 cpu_ka630.c,1.11,1.12 cpu_ka640.c,1.10,1.11 cpu_ka650.c,1.14,1.15 cpu_ka660.c,1.10,1.11 vmlinux.lds.S,1.4,1.5
|
From: Kenn H. <ke...@us...> - 2004-10-02 11:42:58
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11843/arch/vax/kernel Modified Files: cpu_ka410.c cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka48.c cpu_ka49.c cpu_ka55.c cpu_ka630.c cpu_ka640.c cpu_ka650.c cpu_ka660.c vmlinux.lds.S Log Message: Switch over to new-style CPU identification. Rename the "machine vector match" stuff to "CPU match". Index: cpu_ka46.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- cpu_ka46.c 2 Oct 2004 00:03:14 -0000 1.21 +++ cpu_ka46.c 2 Oct 2004 11:42:46 -0000 1.22 @@ -81,10 +81,6 @@ ka46_cache_clear(); ka46_cache_enable(); -#ifndef USE_NEW_VECTORS - mv_ka46.sidex = *(unsigned int *)RIGEL_SIDEX_ADDR; -#endif - __mtpr(PR_ACCS, 2); /* Enable floating points */ } @@ -139,8 +135,7 @@ .clock_init = ka4x_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka46 = { +static struct cpu_match __CPU_MATCH cpumatch_ka46 = { .mv = &mv_ka46, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_MARIAH << VAX_SID_FAMILY_SHIFT, @@ -148,7 +143,6 @@ .sidex_mask = 0x00000000, .sidex_match = 0x00000000, }; -#endif /* USE_NEW_VECTORS */ static struct platform_device ka46_vsbus_device = { .name = "ka4x-vsbus" Index: cpu_ka49.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka49.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cpu_ka49.c 30 Sep 2004 21:05:45 -0000 1.1 +++ cpu_ka49.c 2 Oct 2004 11:42:46 -0000 1.2 @@ -123,21 +123,12 @@ return "KA49"; } -static void ka49_pre_vm_init(void) -{ -#ifndef USE_NEW_VECTORS - mv_ka49.sidex = * (unsigned int *) NVAX_SIDEX_ADDR; -#endif - // KA46: __mtpr(PR_ACCS, 2); /* Enable floating points */ -} - static void ka49_init_devices(void) { printk ("ka49: init_devices\n"); } struct vax_mv mv_ka49 = { - .pre_vm_init = ka49_pre_vm_init, .post_vm_init = ka49_post_vm_init, .pre_vm_putchar = ka46_48_49_prom_putchar, .pre_vm_getchar = ka46_48_49_prom_getchar, @@ -148,8 +139,7 @@ .clock_init = ka4x_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka49 = { +static struct cpu_match __CPU_MATCH cpumatch_ka49 = { .mv = &mv_ka49, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_NVAX << VAX_SID_FAMILY_SHIFT, @@ -158,7 +148,6 @@ SID + SIDEX, so keep it tight */ .sidex_match = 0x02000104, }; -#endif /* USE_NEW_VECTORS */ static struct platform_device ka49_vsbus_device = { .name = "ka4x-vsbus" Index: cpu_ka42.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- cpu_ka42.c 2 Oct 2004 00:03:14 -0000 1.16 +++ cpu_ka42.c 2 Oct 2004 11:42:46 -0000 1.17 @@ -20,11 +20,6 @@ #include <asm/clock.h> /* For clock_init routines */ #include <asm/bus/vsbus.h> -static void ka42_pre_vm_init(void) -{ - mv_ka42.sidex = *(unsigned int *)CVAX_SIDEX_ADDR; -} - static void ka42_post_vm_init(void) { #define KA42_CADR_S2E 0x80 @@ -45,7 +40,6 @@ } struct vax_mv mv_ka42 = { - .pre_vm_init = ka42_pre_vm_init, .post_vm_init = ka42_post_vm_init, .pre_vm_putchar = ka4x_prom_putchar, .pre_vm_getchar = ka4x_prom_getchar, @@ -55,8 +49,7 @@ .clock_init = ka4x_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka42 = { +static struct cpu_match __CPU_MATCH cpu_match_ka42 = { .mv = &mv_ka42, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_CVAX << VAX_SID_FAMILY_SHIFT, @@ -65,7 +58,6 @@ .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_ka410.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka410.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- cpu_ka410.c 2 Oct 2004 00:03:14 -0000 1.12 +++ cpu_ka410.c 2 Oct 2004 11:42:46 -0000 1.13 @@ -40,8 +40,7 @@ .clock_init = ka4x_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka410 = { +static struct cpu_match __CPU_MATCH cpumatch_ka410 = { .mv = &mv_ka410, .sid_mask = VAX_SID_FAMILY_MASK | UVAX2_SID_SUBTYPE_MASK, .sid_match = (VAX_UVAX2 << VAX_SID_FAMILY_SHIFT) | @@ -50,5 +49,4 @@ .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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- cpu_ka640.c 2 Oct 2004 00:03:14 -0000 1.10 +++ cpu_ka640.c 2 Oct 2004 11:42:47 -0000 1.11 @@ -19,7 +19,6 @@ static void ka640_pre_vm_init(void) { - mv_ka640.sidex = *(unsigned int *)CVAX_SIDEX_ADDR; __mtpr(0, PR_CADR); } @@ -35,8 +34,6 @@ * the level 1 cache */ __mtpr(KA640_CADR_S2E|KA640_CADR_S1E|KA640_CADR_ISE|KA640_CADR_DSE, PR_CADR); - - printk("KA640 sidex = %08x\n", mv_ka640.sidex); } static const char *ka640_cpu_type_str(void) @@ -55,8 +52,7 @@ .clock_init = generic_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka640 = { +static struct cpu_match __CPU_MATCH cpumatch_ka640 = { .mv = &mv_ka640, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_CVAX << VAX_SID_FAMILY_SHIFT, @@ -67,5 +63,4 @@ .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.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- cpu_ka48.c 2 Oct 2004 00:03:14 -0000 1.7 +++ cpu_ka48.c 2 Oct 2004 11:42:46 -0000 1.8 @@ -75,7 +75,6 @@ ka48_cache_disable(); ka48_cache_clear(); ka48_cache_enable(); - mv_ka48.sidex = *(unsigned int *)SOC_SIDEX_ADDR; __mtpr(PR_ACCS, 2); /* Enable floating points */ } @@ -130,8 +129,7 @@ .clock_init = ka4x_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka48 = { +static struct cpu_match __CPU_MATCH cpumatch_ka48 = { .mv = &mv_ka48, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_SOC << VAX_SID_FAMILY_SHIFT, @@ -139,7 +137,6 @@ .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" Index: cpu_ka650.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka650.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- cpu_ka650.c 30 Sep 2004 11:52:32 -0000 1.14 +++ cpu_ka650.c 2 Oct 2004 11:42:47 -0000 1.15 @@ -22,9 +22,6 @@ static void ka650_pre_vm_init(void) { -#ifndef USE_NEW_VECTORS - mv_ka650.sidex = *(unsigned int *)CVAX_SIDEX_ADDR; -#endif /* * Disable the level 1 and level 2 caches. My docs say that the * caches are disabled automatically at power up and when DCOK @@ -63,7 +60,6 @@ * the level 1 cache. */ __mtpr(KA650_CADR_S2E|KA650_CADR_S1E|KA650_CADR_ISE|KA650_CADR_DSE, PR_CADR); - printk("KA650 sidex = %08x\n", mv_ka650.sidex); } static const char *ka650_cpu_type_str(void) @@ -82,8 +78,7 @@ .clock_init = generic_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka650 = { +static struct cpu_match __CPU_MATCH cpumatch_ka650 = { .mv = &mv_ka650, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_CVAX << VAX_SID_FAMILY_SHIFT, @@ -95,7 +90,7 @@ (CVAX_Q22_SUBTYPE_KA650 << CVAX_Q22_SUBTYPE_SHIFT), }; -static struct machvec_match __CPU_MATCH mvm_ka655 = { +static struct cpu_match __CPU_MATCH cpumatch_ka655 = { .mv = &mv_ka650, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_CVAX << VAX_SID_FAMILY_SHIFT, @@ -106,7 +101,6 @@ .sidex_match = (CVAX_SIDEX_TYPE_Q22 << CVAX_SIDEX_TYPE_SHIFT) | (CVAX_Q22_SUBTYPE_KA655 << CVAX_Q22_SUBTYPE_SHIFT), }; -#endif /* USE_NEW_VECTORS */ static struct platform_device ka650_cqbic_device = { .name = "cqbic" Index: cpu_ka660.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka660.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- cpu_ka660.c 2 Oct 2004 00:03:14 -0000 1.10 +++ cpu_ka660.c 2 Oct 2004 11:42:47 -0000 1.11 @@ -17,18 +17,12 @@ #include <asm/vaxcpu.h> #include <asm/clock.h> /* For clock_init routines */ -static void ka660_pre_vm_init(void) -{ - mv_ka660.sidex = *(unsigned int *)SOC_SIDEX_ADDR; -} - static const char *ka660_cpu_type_str(void) { return "KA660"; } struct vax_mv mv_ka660 = { - .pre_vm_init = ka660_pre_vm_init, .pre_vm_putchar = mtpr_putchar, .pre_vm_getchar = mtpr_getchar, .post_vm_putchar = mtpr_putchar, @@ -37,8 +31,7 @@ .clock_init = generic_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka660 = { +static struct cpu_match __CPU_MATCH cpumatch_ka660 = { .mv = &mv_ka660, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_SOC << VAX_SID_FAMILY_SHIFT, @@ -49,5 +42,4 @@ .sidex_match = (SOC_SIDEX_TYPE_Q22 << SOC_SIDEX_TYPE_SHIFT) | (SOC_Q22_SUBTYPE_KA660 << SOC_Q22_SUBTYPE_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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- cpu_ka630.c 2 Oct 2004 00:03:14 -0000 1.11 +++ cpu_ka630.c 2 Oct 2004 11:42:47 -0000 1.12 @@ -29,8 +29,7 @@ .clock_init = generic_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka630 = { +static struct cpu_match __CPU_MATCH cpumatch_ka630 = { .mv = &mv_ka630, .sid_mask = VAX_SID_FAMILY_MASK | UVAX2_SID_SUBTYPE_MASK, .sid_match = (VAX_UVAX2 << VAX_SID_FAMILY_SHIFT) | @@ -40,7 +39,7 @@ .sidex_match = 0x00000000, }; -static struct machvec_match __CPU_MATCH mvm_charon = { +static struct cpu_match __CPU_MATCH cpumatch_charon = { .mv = &mv_ka630, .sid_mask = VAX_SID_FAMILY_MASK | UVAX2_SID_SUBTYPE_MASK, .sid_match = (VAX_UVAX2 << VAX_SID_FAMILY_SHIFT) | @@ -50,5 +49,3 @@ .sidex_match = 0x00000000, }; -#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.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- cpu_ka43.c 2 Oct 2004 00:03:14 -0000 1.19 +++ cpu_ka43.c 2 Oct 2004 11:42:46 -0000 1.20 @@ -65,11 +65,6 @@ "undefined data bus state", /* Code 19: Bus error */ }; -static void ka43_pre_vm_init(void) -{ - mv_ka43.sidex = *(unsigned int *)RIGEL_SIDEX_ADDR; -} - static void ka43_cache_disable(volatile unsigned int *creg_addr) { __mtpr(KA43_PCS_REFRESH, PR_PCSTS); /* Disable primary cache */ @@ -225,7 +220,6 @@ } struct vax_mv mv_ka43 = { - .pre_vm_init = ka43_pre_vm_init, .post_vm_init = ka43_post_vm_init, .pre_vm_putchar = ka4x_prom_putchar, .pre_vm_getchar = ka4x_prom_getchar, @@ -236,8 +230,7 @@ .clock_init = ka4x_clock_init, }; -#ifdef USE_NEW_VECTORS -static struct machvec_match __CPU_MATCH mvm_ka43 = { +static struct cpu_match __CPU_MATCH cpumatch_ka43 = { .mv = &mv_ka43, .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_RIGEL << VAX_SID_FAMILY_SHIFT, @@ -245,7 +238,6 @@ .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_ka55.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka55.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- cpu_ka55.c 30 May 2004 09:36:47 -0000 1.11 +++ cpu_ka55.c 2 Oct 2004 11:42:46 -0000 1.12 @@ -37,11 +37,6 @@ return 0; } -static void ka55_pre_vm_init(void) -{ - mv_ka55.sidex = *(unsigned int *)RIGEL_SIDEX_ADDR; -} - static void ka55_post_vm_init(void) { #ifdef CONFIG_DZ @@ -63,7 +58,6 @@ } struct vax_mv mv_ka55 = { - .pre_vm_init = ka55_pre_vm_init, .post_vm_init = ka55_post_vm_init, .pre_vm_putchar = ka55_prom_putchar, .pre_vm_getchar = ka55_prom_getchar, @@ -74,3 +68,5 @@ .clock_init = generic_clock_init, }; +#warning KA55 needs a struct cpumatch + Index: vmlinux.lds.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/vmlinux.lds.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vmlinux.lds.S 29 Sep 2004 10:39:17 -0000 1.4 +++ vmlinux.lds.S 2 Oct 2004 11:42:47 -0000 1.5 @@ -96,9 +96,9 @@ *(.initcall7.init) } __initcall_end = .; - __init_vecmatch_start = .; - .init.vecmatch : { *(.init.vecmatch) } - __init_vecmatch_end = .; + __init_cpumatch_start = .; + .init.cpumatch : { *(.init.cpumatch) } + __init_cpumatch_end = .; . = ALIGN(4096); .init.ramfs : { __initramfs_start = .; |
