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

Commit e7f2f991 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge phase #5 (misc) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

Merges oprofile, timers/hpet, x86/traps, x86/time, and x86/core misc items.

* 'x86-core-v4-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (132 commits)
  x86: change early_ioremap to use slots instead of nesting
  x86: adjust dependencies for CONFIG_X86_CMOV
  dumpstack: x86: various small unification steps, fix
  x86: remove additional_cpus
  x86: remove additional_cpus configurability
  x86: improve UP kernel when CPU-hotplug and SMP is enabled
  dumpstack: x86: various small unification steps
  dumpstack: i386: make kstack= an early boot-param and add oops=panic
  dumpstack: x86: use log_lvl and unify trace formatting
  dumptrace: x86: consistently include loglevel, print stack switch
  dumpstack: x86: add "end" parameter to valid_stack_ptr and print_context_stack
  dumpstack: x86: make printk_address equal
  dumpstack: x86: move die_nmi to dumpstack_32.c
  traps: x86: finalize unification of traps.c
  traps: x86: make traps_32.c and traps_64.c equal
  traps: x86: various noop-changes preparing for unification of traps_xx.c
  traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
  traps: i386: expand clear_mem_error and remove from mach_traps.h
  traps: x86_64: make io_check_error equal to the one on i386
  traps: i386: use preempt_conditional_sti/cli in do_int3
  ...
parents 11a96d18 c00193f9

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ hayes-esp.txt 
	- info on using the Hayes ESP serial driver.

highuid.txt

	- notes on the change from 16 bit to 32 bit user/group IDs.

hpet.txt

	- High Precision Event Timer Driver for Linux.

timers/

	- info on the timer related topics

hw_random.txt

Documentation/timers/00-INDEX

0 → 100644
+10 −0
Original line number Diff line number Diff line 
00-INDEX

	- this file

highres.txt

	- High resolution timers and dynamic ticks design notes

hpet.txt

	- High Precision Event Timer Driver for Linux

hrtimers.txt

	- subsystem for high-resolution kernel timers

timer_stats.txt

	- timer usage statistics

Documentation/hpet.txt→Documentation/timers/hpet.txt

+21 −22
Original line number Diff line number Diff line 
		High Precision Event Timer Driver for Linux



The High Precision Event Timer (HPET) hardware is the future replacement

for the 8254 and Real Time Clock (RTC) periodic timer functionality.

Each HPET can have up to 32 timers.  It is possible to configure the

first two timers as legacy replacements for 8254 and RTC periodic timers.

A specification done by Intel and Microsoft can be found at

<http://www.intel.com/technology/architecture/hpetspec.htm>.

The High Precision Event Timer (HPET) hardware follows a specification

by Intel and Microsoft which can be found at



	http://www.intel.com/technology/architecture/hpetspec.htm



Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision")

and up to 32 comparators.  Normally three or more comparators are provided,

each of which can generate oneshot interupts and at least one of which has

additional hardware to support periodic interrupts.  The comparators are

also called "timers", which can be misleading since usually timers are

independent of each other ... these share a counter, complicating resets.



HPET devices can support two interrupt routing modes.  In one mode, the

comparators are additional interrupt sources with no particular system

role.  Many x86 BIOS writers don't route HPET interrupts at all, which

prevents use of that mode.  They support the other "legacy replacement"

mode where the first two comparators block interrupts from 8254 timers

and from the RTC.



The driver supports detection of HPET driver allocation and initialization

of the HPET before the driver module_init routine is called.  This enables

platform code which uses timer 0 or 1 as the main timer to intercept HPET

initialization.  An example of this initialization can be found in

arch/i386/kernel/time_hpet.c.

arch/x86/kernel/hpet.c.



The driver provides two APIs which are very similar to the API found in

the rtc.c driver.  There is a user space API and a kernel space API.

An example user space program is provided below.

The driver provides a userspace API which resembles the API found in the

RTC driver framework.  An example user space program is provided below.



#include <stdio.h>

#include <stdlib.h>
@@ -286,15 +297,3 @@ out: 


	return;

}
 


The kernel API has three interfaces exported from the driver:



	hpet_register(struct hpet_task *tp, int periodic)

	hpet_unregister(struct hpet_task *tp)

	hpet_control(struct hpet_task *tp, unsigned int cmd, unsigned long arg)



The kernel module using this interface fills in the ht_func and ht_data

members of the hpet_task structure before calling hpet_register.

hpet_control simply vectors to the hpet_ioctl routine and has the same

commands and respective arguments as the user API.  hpet_unregister

is used to terminate usage of the HPET timer reserved by hpet_register.

arch/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,20 @@ config OPROFILE 


	  If unsure, say N.



config OPROFILE_IBS

	bool "OProfile AMD IBS support (EXPERIMENTAL)"

	default n

	depends on OPROFILE && SMP && X86

	help

          Instruction-Based Sampling (IBS) is a new profiling

          technique that provides rich, precise program performance

          information. IBS is introduced by AMD Family10h processors

          (AMD Opteron Quad-Core processor “Barcelona”) to overcome

          the limitations of conventional performance counter

          sampling.



	  If unsure, say N.



config HAVE_OPROFILE

	def_bool n

arch/x86/Kconfig.cpu

+10 −19
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ config M386 
	  - "Crusoe" for the Transmeta Crusoe series.

	  - "Efficeon" for the Transmeta Efficeon series.

	  - "Winchip-C6" for original IDT Winchip.

	  - "Winchip-2" for IDT Winchip 2.

	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.

	  - "Winchip-2" for IDT Winchips with 3dNow! capabilities.

	  - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).

	  - "Geode GX/LX" For AMD Geode GX and LX processors.

	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
@@ -194,19 +193,11 @@ config MWINCHIPC6 
	  treat this chip as a 586TSC with some extended instructions

	  and alignment requirements.



config MWINCHIP2

	bool "Winchip-2"

	depends on X86_32

	help

	  Select this for an IDT Winchip-2.  Linux and GCC

	  treat this chip as a 586TSC with some extended instructions

	  and alignment requirements.



config MWINCHIP3D

	bool "Winchip-2A/Winchip-3"

	bool "Winchip-2/Winchip-2A/Winchip-3"

	depends on X86_32

	help

	  Select this for an IDT Winchip-2A or 3.  Linux and GCC

	  Select this for an IDT Winchip-2, 2A or 3.  Linux and GCC

	  treat this chip as a 586TSC with some extended instructions

	  and alignment requirements.  Also enable out of order memory

	  stores for this CPU, which can increase performance of some
@@ -318,7 +309,7 @@ config X86_L1_CACHE_SHIFT 
	int

	default "7" if MPENTIUM4 || X86_GENERIC || GENERIC_CPU || MPSC

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

	default "5" if MWINCHIP3D || MWINCHIP2 || 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



config X86_XADD
@@ -360,7 +351,7 @@ config X86_POPAD_OK 


config X86_ALIGNMENT_16

	def_bool y

	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1



config X86_INTEL_USERCOPY

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


config X86_USE_PPRO_CHECKSUM

	def_bool y

	depends on MWINCHIP3D || MWINCHIP2 || 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



config X86_USE_3DNOW

	def_bool y
@@ -376,7 +367,7 @@ config X86_USE_3DNOW 


config X86_OOSTORE

	def_bool y

	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR

	depends on (MWINCHIP3D || MWINCHIPC6) && MTRR



#

# P6_NOPs are a relatively minor optimization that require a family >=
@@ -396,7 +387,7 @@ config X86_P6_NOP 


config X86_TSC

	def_bool y

	depends on ((MWINCHIP3D || MWINCHIP2 || 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) && !X86_NUMAQ) || X86_64



config X86_CMPXCHG64

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

config X86_CMOV

	def_bool y

	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || X86_64)

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



config X86_MINIMUM_CPU_FAMILY

	int
@@ -417,7 +408,7 @@ config X86_MINIMUM_CPU_FAMILY 


config X86_DEBUGCTLMSR

	def_bool y

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)



menuconfig PROCESSOR_SELECT

	bool "Supported processor vendors" if EMBEDDED