* [PATCH]: Fix IP22 4k cache macro in cpu-feature-overrides.h
@ 2006-01-23 20:35 Kumba
2006-01-23 20:51 ` Martin Michlmayr
0 siblings, 1 reply; 4+ messages in thread
From: Kumba @ 2006-01-23 20:35 UTC (permalink / raw)
To: linux-mips
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
In include/asm-mips/mach-ip22/cpu-feature-overrides.h, the macro to use R4K-style caches is mis-spelt. This will
cause IP22 systems to panic early in the boot due to no cache style being defined. The attached patch corrects this.
--Kumba
--
Gentoo/MIPS Team Lead
Gentoo Foundation Board of Trustees
"Such is oft the course of deeds that move the wheels of the world: small hands do them because they must, while the
eyes of the great are elsewhere." --Elrond
[-- Attachment #2: misc-2.6.15-ip22-fix-4k-cache-macro.patch --]
[-- Type: text/plain, Size: 393 bytes --]
--- include/asm-mips/mach-ip22/cpu-feature-overrides.h.orig 2006-01-23 13:18:24.000000000 -0500
+++ include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-23 13:18:53.000000000 -0500
@@ -13,7 +13,7 @@
*/
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 1
#define cpu_has_32fpr 1
#define cpu_has_counter 1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: Fix IP22 4k cache macro in cpu-feature-overrides.h
2006-01-23 20:35 [PATCH]: Fix IP22 4k cache macro in cpu-feature-overrides.h Kumba
@ 2006-01-23 20:51 ` Martin Michlmayr
0 siblings, 0 replies; 4+ messages in thread
From: Martin Michlmayr @ 2006-01-23 20:51 UTC (permalink / raw)
To: linux-mips
* Kumba <kumba@gentoo.org> [2006-01-23 20:35]:
> In include/asm-mips/mach-ip22/cpu-feature-overrides.h, the macro to
> use R4K-style caches is mis-spelt. This will cause IP22 systems to
> panic early in the boot due to no cache style being defined. The
> attached patch corrects this.
"cpu_has_4kcache" is used in a number of other files too.
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: Fix IP22 4k cache macro in cpu-feature-overrides.h
@ 2006-01-23 22:37 Kumba
0 siblings, 0 replies; 4+ messages in thread
From: Kumba @ 2006-01-23 22:37 UTC (permalink / raw)
To: linux-mips
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
> "cpu_has_4kcache" is used in a number of other files too.
Attached is an updated patch which takes care of all of those references as well.
--Kumba
--
Gentoo/MIPS Team Lead
Gentoo Foundation Board of Trustees
"Such is oft the course of deeds that move the wheels of the world: small hands do them because they must, while the
eyes of the great are elsewhere." --Elrond
[-- Attachment #2: misc-2.6.15-fix-4k-cache-macros.patch --]
[-- Type: text/plain, Size: 2819 bytes --]
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-ip22/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-ip22/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-23 16:49:30.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-23 17:16:13.000000000 -0500
@@ -13,7 +13,7 @@
*/
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 1
#define cpu_has_32fpr 1
#define cpu_has_counter 1
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-mips/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-mips/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-01-23 17:15:57.000000000 -0500
@@ -17,7 +17,7 @@
#ifdef CONFIG_CPU_MIPS32
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
/* #define cpu_has_fpu ? */
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
@@ -43,7 +43,7 @@
#ifdef CONFIG_CPU_MIPS64
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
/* #define cpu_has_fpu ? */
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-rm200/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-rm200/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-rm200/cpu-feature-overrides.h 2006-01-23 16:49:30.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-rm200/cpu-feature-overrides.h 2006-01-23 17:16:25.000000000 -0500
@@ -14,7 +14,7 @@
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 1
#define cpu_has_32fpr 1
#define cpu_has_counter 1
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-sim/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-sim/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-01-23 17:16:42.000000000 -0500
@@ -16,7 +16,7 @@
#ifdef CONFIG_CPU_MIPS32
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 0
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
@@ -41,7 +41,7 @@
#ifdef CONFIG_CPU_MIPS64
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
/* #define cpu_has_fpu ? */
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: Fix IP22 4k cache macro in cpu-feature-overrides.h
@ 2006-01-24 19:30 Kumba
0 siblings, 0 replies; 4+ messages in thread
From: Kumba @ 2006-01-24 19:30 UTC (permalink / raw)
To: linux-mips
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
MIPS machines define a macro in cpu-feature-overrides.h that
specifies the cache style they use. Several machines have a typo in
this macro that will cause the kernel to panic early in the boot
process.
The attached patch fixes these typos so the correct cache style is
defined.
Signed-off-by: Joshua Kinard <kumba@gentoo.org>
---
mach-ip22/cpu-feature-overrides.h | 2 +-
mach-mips/cpu-feature-overrides.h | 4 ++--
mach-rm200/cpu-feature-overrides.h | 2 +-
mach-sim/cpu-feature-overrides.h | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
[-- Attachment #2: fix-4k-cache-macros.patch --]
[-- Type: text/plain, Size: 2763 bytes --]
diff -Naurp mipslinux/include/asm-mips/mach-ip22/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-ip22/cpu-feature-overrides.h
--- mipslinux/include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500
+++ mipslinux-4kcache/include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500
@@ -13,7 +13,7 @@
*/
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 1
#define cpu_has_32fpr 1
#define cpu_has_counter 1
diff -Naurp mipslinux/include/asm-mips/mach-mips/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-mips/cpu-feature-overrides.h
--- mipslinux/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500
+++ mipslinux-4kcache/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500
@@ -17,7 +17,7 @@
#ifdef CONFIG_CPU_MIPS32
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
/* #define cpu_has_fpu ? */
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
@@ -43,7 +43,7 @@
#ifdef CONFIG_CPU_MIPS64
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
/* #define cpu_has_fpu ? */
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
diff -Naurp mipslinux/include/asm-mips/mach-rm200/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-rm200/cpu-feature-overrides.h
--- mipslinux/include/asm-mips/mach-rm200/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500
+++ mipslinux-4kcache/include/asm-mips/mach-rm200/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500
@@ -14,7 +14,7 @@
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 1
#define cpu_has_32fpr 1
#define cpu_has_counter 1
diff -Naurp mipslinux/include/asm-mips/mach-sim/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-sim/cpu-feature-overrides.h
--- mipslinux/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500
+++ mipslinux-4kcache/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500
@@ -16,7 +16,7 @@
#ifdef CONFIG_CPU_MIPS32
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
#define cpu_has_fpu 0
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
@@ -41,7 +41,7 @@
#ifdef CONFIG_CPU_MIPS64
#define cpu_has_tlb 1
#define cpu_has_4kex 1
-#define cpu_has_4kcache 1
+#define cpu_has_4k_cache 1
/* #define cpu_has_fpu ? */
/* #define cpu_has_32fpr ? */
#define cpu_has_counter 1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-01-24 19:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-23 20:35 [PATCH]: Fix IP22 4k cache macro in cpu-feature-overrides.h Kumba
2006-01-23 20:51 ` Martin Michlmayr
-- strict thread matches above, loose matches on Subject: below --
2006-01-23 22:37 Kumba
2006-01-24 19:30 Kumba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox