Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262173AbVCVHN4 (ORCPT ); Tue, 22 Mar 2005 02:13:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262140AbVCVHNz (ORCPT ); Tue, 22 Mar 2005 02:13:55 -0500 Received: from fire.osdl.org ([65.172.181.4]:43665 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S262173AbVCVHNo (ORCPT ); Tue, 22 Mar 2005 02:13:44 -0500 Date: Mon, 21 Mar 2005 23:13:02 -0800 From: Andrew Morton To: Kianusch Sayah Karadji Cc: alan@lxorguk.ukuu.org.uk, dvrabel@cantab.net, lsorense@csclub.uwaterloo.ca, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Support for GEODE CPUs Message-Id: <20050321231302.76b29950.akpm@osdl.org> In-Reply-To: References: <200503081935.j28JZ433020124@hera.kernel.org> <1110387668.28860.205.camel@localhost.localdomain> <20050309173344.GD17865@csclub.uwaterloo.ca> <1110405563.3072.250.camel@localhost.localdomain> <422F8623.4030405@cantab.net> <1110413198.3116.278.camel@localhost.localdomain> <20050310174206.6b2f27b8.akpm@osdl.org> <1110538950.15927.15.camel@localhost.localdomain> <20050321154105.3c24c88e.akpm@osdl.org> X-Mailer: Sylpheed version 0.9.7 (GTK+ 1.2.10; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5733 Lines: 142 Kianusch Sayah Karadji wrote: > > On Mon, 21 Mar 2005, Andrew Morton wrote: > > >> Either revert it or make it Geode GX and correct the options set. I've > >> no problem with a Geode option that sets the right options 8) > > > > Two weeks, no patch. It looks like we'll be reverting it. > > I somehow missed the thread in the list discussing the neccesary changes. > > Anyway here's a new patch (this time for 2.6.11). > > I changed the whole thing from "Geode GX" to "Geode GX1", and made the > adjustments Alan suggested. The original patch was already applied, so I made an incremental update. Please double-check it. Sometime, could you send me a little description of what the patch does ("the adjustments Alan suggested") so Linus knows what we're doing to his kernel? And a Signed-off-by: line too, please. diff -puN arch/i386/Kconfig~x86-geode-support-fixes arch/i386/Kconfig --- 25/arch/i386/Kconfig~x86-geode-support-fixes 2005-03-21 23:09:34.000000000 -0800 +++ 25-akpm/arch/i386/Kconfig 2005-03-21 23:09:53.000000000 -0800 @@ -187,7 +187,7 @@ config M386 - "Winchip-C6" for original IDT Winchip. - "Winchip-2" for IDT Winchip 2. - "Winchip-2A" for IDT Winchips with 3dNow! capabilities. - - "MediaGX/Geode" for Cyrix MediaGX aka Geode. + - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). @@ -315,12 +315,10 @@ config MWINCHIP3D stores for this CPU, which can increase performance of some operations. -config MGEODE - bool "MediaGX/Geode" +config MGEODEGX1 + bool "GeodeGX1" help - Select this for a Cyrix MediaGX aka Geode chip. Linux and GCC - treat this chip as a 586TSC with some extended instructions - and alignment reqirements. + Select this for a Geode GX1 (Cyrix MediaGX) chip. config MCYRIXIII bool "CyrixIII/VIA-C3" @@ -372,7 +370,7 @@ config X86_L1_CACHE_SHIFT int default "7" if MPENTIUM4 || X86_GENERIC default "4" if X86_ELAN || M486 || M386 - default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE + default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODEGX1 default "6" if MK7 || MK8 || MPENTIUMM config RWSEM_GENERIC_SPINLOCK @@ -391,7 +389,7 @@ config GENERIC_CALIBRATE_DELAY config X86_PPRO_FENCE bool - depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODE + depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 default y config X86_F00F_BUG @@ -421,7 +419,7 @@ config X86_POPAD_OK config X86_ALIGNMENT_16 bool - depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODE + depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 default y config X86_GOOD_APIC @@ -446,7 +444,7 @@ config X86_USE_3DNOW config X86_OOSTORE bool - depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MGEODE) && MTRR + depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR default y config HPET_TIMER @@ -582,7 +580,7 @@ config X86_VISWS_APIC config X86_TSC bool - depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODE) && !X86_NUMAQ + depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ default y config X86_MCE diff -puN arch/i386/Makefile~x86-geode-support-fixes arch/i386/Makefile --- 25/arch/i386/Makefile~x86-geode-support-fixes 2005-03-21 23:09:34.000000000 -0800 +++ 25-akpm/arch/i386/Makefile 2005-03-21 23:09:53.000000000 -0800 @@ -14,7 +14,7 @@ # 19990713 Artur Skawina # Added '-march' and '-mpreferred-stack-boundary' support # -# Kianusch Sayah Karadji +# 20050320 Kianusch Sayah Karadji # Added support for GEODE CPU LDFLAGS := -m elf_i386 @@ -54,8 +54,8 @@ cflags-$(CONFIG_MVIAC3_2) += $(call cc-o # AMD Elan support cflags-$(CONFIG_X86_ELAN) += -march=i486 -# MediaGX aka Geode support -cflags-$(CONFIG_MGEODE) += $(call cc-option,-march=pentium-mmx,-march=i586) +# Geode GX1 support +cflags-$(CONFIG_MGEODEGX1) += $(call cc-option,-march=pentium-mmx,-march=i486) # -mregparm=3 works ok on gcc-3.0 and later # diff -puN include/asm-i386/module.h~x86-geode-support-fixes include/asm-i386/module.h --- 25/include/asm-i386/module.h~x86-geode-support-fixes 2005-03-21 23:09:34.000000000 -0800 +++ 25-akpm/include/asm-i386/module.h 2005-03-21 23:09:53.000000000 -0800 @@ -52,8 +52,8 @@ struct mod_arch_specific #define MODULE_PROC_FAMILY "CYRIXIII " #elif defined CONFIG_MVIAC3_2 #define MODULE_PROC_FAMILY "VIAC3-2 " -#elif CONFIG_MGEODE -#define MODULE_PROC_FAMILY "GEODE " +#elif CONFIG_MGEODEGX1 +#define MODULE_PROC_FAMILY "GEODEGX1 " #else #error unknown processor family #endif _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/