fix CONFIG_X86_L1_CACHE_SHIFT
PATCH 1/1 fix CONFIG_X86_L1_CACHE_SHIFT
Hi Marcelo,
Peter Daum reported in the "2.4.22 with CONFIG_M686: networking broken" thread some problems when using a kernel with CONFIG_M686 on a Pentium 4.
With CONFIG_M686 CONFIG_X86_L1_CACHE_SHIFT was set to 5, but a Pentium 4 requires 7.
The problem comes from the fact that in 2.4 selecting a processor means "this processor and all better processors are supported". Without breaking this semantics in a kernel series the only solution is to make CONFIG_X86_L1_CACHE_SHIFT for older processors higher.
The patch below does:
- set CONFIG_X86_L1_CACHE_SHIFT 7 for all Intel processors (needed for the Pentium 4)
- set CONFIG_X86_L1_CACHE_SHIFT 6 for the K6 (needed for the Athlon)
This issue was already resolved in 2.6.
Please apply
Adrian
arch/i386/config.in renamed from arch/i386/config.in.old +8 -8
@@ -51,7 +51,7 @@ if [ "$CONFIG_M386" = "y" ]; then define_bool CONFIG_X86_CMPXCHG n define_bool CONFIG_X86_XADD n - define_int CONFIG_X86_L1_CACHE_SHIFT 4 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n define_bool CONFIG_X86_PPRO_FENCE y
@@ -67,21 +67,21 @@ define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM y fi if [ "$CONFIG_M486" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 4 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_X86_USE_STRING_486 y define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_PPRO_FENCE y define_bool CONFIG_X86_F00F_WORKS_OK n fi if [ "$CONFIG_M586" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 5 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_X86_USE_STRING_486 y define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_PPRO_FENCE y define_bool CONFIG_X86_F00F_WORKS_OK n fi if [ "$CONFIG_M586TSC" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 5 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_X86_USE_STRING_486 y define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_HAS_TSC y
@@ -89,7 +89,7 @@ define_bool CONFIG_X86_F00F_WORKS_OK n fi if [ "$CONFIG_M586MMX" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 5 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_X86_USE_STRING_486 y define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_HAS_TSC y
@@ -98,7 +98,7 @@ define_bool CONFIG_X86_F00F_WORKS_OK n fi if [ "$CONFIG_M686" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 5 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_X86_HAS_TSC y define_bool CONFIG_X86_GOOD_APIC y bool 'PGE extensions (not for Cyrix/Transmeta)' CONFIG_X86_PGE
@@ -107,7 +107,7 @@ define_bool CONFIG_X86_F00F_WORKS_OK y fi if [ "$CONFIG_MPENTIUMIII" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 5 + define_int CONFIG_X86_L1_CACHE_SHIFT 7 define_bool CONFIG_X86_HAS_TSC y define_bool CONFIG_X86_GOOD_APIC y define_bool CONFIG_X86_PGE y
@@ -123,7 +123,7 @@ define_bool CONFIG_X86_F00F_WORKS_OK y fi if [ "$CONFIG_MK6" = "y" ]; then - define_int CONFIG_X86_L1_CACHE_SHIFT 5 + define_int CONFIG_X86_L1_CACHE_SHIFT 6 define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_HAS_TSC y define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
Hi,
Quoted 3 lines · Adrian Bunk
Peter Daum reported in the "2.4.22 with
CONFIG_M686: networking broken" thread some problems when using a kernel withCONFIG_M686on a Pentium 4.
... actually, the problems also occurred when running on machines with Pentium II/Pentium Pro CPUs - even on these machines, I only could use kernels compiled with "CONFIG_MPENTIUM4".
Adrian's patch does fix these problems. What is amazing, is that in kernel version 2.4.20, the same values were used for "CONFIG_X86_L1_CACHE_SHIFT". The problems that I described, however, occur only with 2.4.22 - the same machines with the same configuration work just fine with 2.4.20. Maybe, there's something else involved, too?
Regards,
Peter