Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 366d19e1 authored by Tobias Doerffel's avatar Tobias Doerffel Committed by Ingo Molnar
Browse files

x86: add specific support for Intel Atom architecture 



Add another option when selecting CPU family so the kernel can be
optimized for Intel Atom CPUs. If GCC supports tuning options for
Intel Atom they will be used.

Signed-off-by: default avatarTobias Doerffel <tobias.doerffel@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
LKML-Reference: <1251018457-19157-1-git-send-email-tobias.doerffel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8a517c51

arch/x86/Kconfig.cpu

+14 −5
Original line number Original line Diff line number Diff line
@@ -262,6 +262,15 @@ config MCORE2 
	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15

	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15

	  (not a typo)

	  (not a typo)





config MATOM

	bool "Intel Atom"

	---help---



	  Select this for the Intel Atom platform. Intel Atom CPUs have an

	  in-order pipelining architecture and thus can benefit from

	  accordingly optimized code. Use a recent GCC with specific Atom

	  support in order to fully benefit from selecting this option.



config GENERIC_CPU

config GENERIC_CPU

	bool "Generic-x86-64"

	bool "Generic-x86-64"

	depends on X86_64

	depends on X86_64
@@ -295,7 +304,7 @@ config X86_CPU 
config X86_L1_CACHE_BYTES

config X86_L1_CACHE_BYTES

	int

	int

	default "128" if MPSC

	default "128" if MPSC

	default "64" if GENERIC_CPU || MK8 || MCORE2 || X86_32

	default "64" if GENERIC_CPU || MK8 || MCORE2 || MATOM || X86_32





config X86_INTERNODE_CACHE_BYTES

config X86_INTERNODE_CACHE_BYTES

	int

	int
@@ -310,7 +319,7 @@ config X86_L1_CACHE_SHIFT 
	default "7" if MPENTIUM4 || MPSC

	default "7" if MPENTIUM4 || MPSC

	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1

	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MVIAC7 || X86_GENERIC || GENERIC_CPU

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU





config X86_XADD

config X86_XADD

	def_bool y

	def_bool y
@@ -359,7 +368,7 @@ config X86_INTEL_USERCOPY 




config X86_USE_PPRO_CHECKSUM

config X86_USE_PPRO_CHECKSUM

	def_bool y

	def_bool y

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM





config X86_USE_3DNOW

config X86_USE_3DNOW

	def_bool y

	def_bool y
@@ -387,7 +396,7 @@ config X86_P6_NOP 




config X86_TSC

config X86_TSC

	def_bool y

	def_bool y

	depends on ((MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64

	depends on ((MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) && !X86_NUMAQ) || X86_64





config X86_CMPXCHG64

config X86_CMPXCHG64

	def_bool y

	def_bool y
@@ -397,7 +406,7 @@ config X86_CMPXCHG64 
# generates cmov.

# generates cmov.

config X86_CMOV

config X86_CMOV

	def_bool y

	def_bool y

	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64)

	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)





config X86_MINIMUM_CPU_FAMILY

config X86_MINIMUM_CPU_FAMILY

	int

	int

arch/x86/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,8 @@ else 




        cflags-$(CONFIG_MCORE2) += \

        cflags-$(CONFIG_MCORE2) += \

                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))

                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))

	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \

		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))

        cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)

        cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)

        KBUILD_CFLAGS += $(cflags-y)

        KBUILD_CFLAGS += $(cflags-y)

arch/x86/Makefile_32.cpu

+2 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,8 @@ cflags-$(CONFIG_MCYRIXIII) += $(call cc-option,-march=c3,-march=i486) $(align)-f 
cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)

cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)

cflags-$(CONFIG_MVIAC7)		+= -march=i686

cflags-$(CONFIG_MVIAC7)		+= -march=i686

cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)

cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)

cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \

	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))





# AMD Elan support

# AMD Elan support

cflags-$(CONFIG_X86_ELAN)	+= -march=i486

cflags-$(CONFIG_X86_ELAN)	+= -march=i486

arch/x86/include/asm/module.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ struct mod_arch_specific {}; 
#define MODULE_PROC_FAMILY "586MMX "

#define MODULE_PROC_FAMILY "586MMX "

#elif defined CONFIG_MCORE2

#elif defined CONFIG_MCORE2

#define MODULE_PROC_FAMILY "CORE2 "

#define MODULE_PROC_FAMILY "CORE2 "

#elif defined CONFIG_MATOM

#define MODULE_PROC_FAMILY "ATOM "

#elif defined CONFIG_M686

#elif defined CONFIG_M686

#define MODULE_PROC_FAMILY "686 "

#define MODULE_PROC_FAMILY "686 "

#elif defined CONFIG_MPENTIUMII

#elif defined CONFIG_MPENTIUMII