On Tue, 17 Oct 2000, Mikael Pettersson wrote:
> Since initial Pentium IV processors have model 0 according to Intel's
> Pentium IV supplement to the CPUID manual (AP-485), this code may
> actually deduce that a Pentium IV has the bug (if the mask < 3).
Valid point. I copied the same fix from 2.2.18pre.
Obviously its broken there also.
> --- linux-2.4.0-test10-pre3/arch/i386/kernel/setup.c.~1~ Mon Oct 16 17:29:05 2000
> +++ linux-2.4.0-test10-pre3/arch/i386/kernel/setup.c Mon Oct 16 23:13:21 2000
> @@ -1548,7 +1548,6 @@
>
> /* Pentium IV. */
> if (c->x86 == 15) {
> - c->x86 = 6;
> get_model_name(c);
> goto name_decoded;
> }
> --- linux-2.4.0-test10-pre3/include/asm-i386/bugs.h.~1~ Sat Sep 9 12:49:40 2000
> +++ linux-2.4.0-test10-pre3/include/asm-i386/bugs.h Mon Oct 16 23:14:42 2000
> @@ -426,5 +426,5 @@
> check_pentium_f00f();
> #endif
> check_cyrix_coma();
> - system_utsname.machine[1] = '0' + boot_cpu_data.x86;
> + system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
> }
Seems more sane to me.
Alan, same diff for 2.2 ?
> mtrr.c will need fixing too, but we can't really do that until Intel
> releases a new IA-32 System Programming manual with Pentium IV updates.
Agreed.
Why Intel chose family 15 is still beyond me though.
regards,
Dave.
-- | Dave Jones <davej@suse.de> http://www.suse.de/~davej | SuSE Labs- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Oct 23 2000 - 21:00:10 EST