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

Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (821 commits)
  x86: make 64bit hpet_set_mapping to use ioremap too, v2
  x86: get x86_phys_bits early
  x86: max_low_pfn_mapped fix #4
  x86: change _node_to_cpumask_ptr to return const ptr
  x86: I/O APIC: remove an IRQ2-mask hack
  x86: fix numaq_tsc_disable calling
  x86, e820: remove end_user_pfn
  x86: max_low_pfn_mapped fix, #3
  x86: max_low_pfn_mapped fix, #2
  x86: max_low_pfn_mapped fix, #1
  x86_64: fix delayed signals
  x86: remove conflicting nx6325 and nx6125 quirks
  x86: Recover timer_ack lost in the merge of the NMI watchdog
  x86: I/O APIC: Never configure IRQ2
  x86: L-APIC: Always fully configure IRQ0
  x86: L-APIC: Set IRQ0 as edge-triggered
  x86: merge dwarf2 headers
  x86: use AS_CFI instead of UNWIND_INFO
  x86: use ignore macro instead of hash comment
  x86: use matching CFI_ENDPROC
  ...
parents 3b23e665 d59fdcf2

Documentation/ABI/testing/sysfs-firmware-memmap

0 → 100644
+71 −0
Original line number Original line Diff line number Diff line 
What:		/sys/firmware/memmap/

Date:		June 2008

Contact:	Bernhard Walle <bwalle@suse.de>

Description:

		On all platforms, the firmware provides a memory map which the

		kernel reads. The resources from that memory map are registered

		in the kernel resource tree and exposed to userspace via

		/proc/iomem (together with other resources).



		However, on most architectures that firmware-provided memory

		map is modified afterwards by the kernel itself, either because

		the kernel merges that memory map with other information or

		just because the user overwrites that memory map via command

		line.



		kexec needs the raw firmware-provided memory map to setup the

		parameter segment of the kernel that should be booted with

		kexec. Also, the raw memory map is useful for debugging. For

		that reason, /sys/firmware/memmap is an interface that provides

		the raw memory map to userspace.



		The structure is as follows: Under /sys/firmware/memmap there

		are subdirectories with the number of the entry as their name:



			/sys/firmware/memmap/0

			/sys/firmware/memmap/1

			/sys/firmware/memmap/2

			/sys/firmware/memmap/3

			...



		The maximum depends on the number of memory map entries provided

		by the firmware. The order is just the order that the firmware

		provides.



		Each directory contains three files:



		start	: The start address (as hexadecimal number with the

			  '0x' prefix).

		end	: The end address, inclusive (regardless whether the

			  firmware provides inclusive or exclusive ranges).

		type	: Type of the entry as string. See below for a list of

			  valid types.



		So, for example:



			/sys/firmware/memmap/0/start

			/sys/firmware/memmap/0/end

			/sys/firmware/memmap/0/type

			/sys/firmware/memmap/1/start

			...



		Currently following types exist:



		  - System RAM

		  - ACPI Tables

		  - ACPI Non-volatile Storage

		  - reserved



		Following shell snippet can be used to display that memory

		map in a human-readable format:



		-------------------- 8< ----------------------------------------

		  #!/bin/bash

		  cd /sys/firmware/memmap

		  for dir in * ; do

		      start=$(cat $dir/start)

		      end=$(cat $dir/end)

		      type=$(cat $dir/type)

		      printf "%016x-%016x (%s)\n" $start $[ $end +1] "$type"

		  done

		-------------------- >8 ----------------------------------------

Documentation/kdump/kdump.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ There are two possible methods of using Kdump. 
2) Or use the system kernel binary itself as dump-capture kernel and there is

2) Or use the system kernel binary itself as dump-capture kernel and there is

   no need to build a separate dump-capture kernel. This is possible

   no need to build a separate dump-capture kernel. This is possible

   only with the architecutres which support a relocatable kernel. As

   only with the architecutres which support a relocatable kernel. As

   of today i386 and ia64 architectures support relocatable kernel.

   of today, i386, x86_64 and ia64 architectures support relocatable kernel.





Building a relocatable kernel is advantageous from the point of view that

Building a relocatable kernel is advantageous from the point of view that

one does not have to build a second kernel for capturing the dump. But

one does not have to build a second kernel for capturing the dump. But

Documentation/kernel-parameters.txt

+37 −0
Original line number Original line Diff line number Diff line
@@ -271,6 +271,17 @@ and is between 256 and 4096 characters. It is defined in the file 
	aic79xx=	[HW,SCSI]

	aic79xx=	[HW,SCSI]

			See Documentation/scsi/aic79xx.txt.

			See Documentation/scsi/aic79xx.txt.





	amd_iommu=	[HW,X86-84]

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			isolate - enable device isolation (each device, as far

			          as possible, will get its own protection

			          domain)

	amd_iommu_size= [HW,X86-64]

			Define the size of the aperture for the AMD IOMMU

			driver. Possible values are:

			'32M', '64M' (default), '128M', '256M', '512M', '1G'



	amijoy.map=	[HW,JOY] Amiga joystick support

	amijoy.map=	[HW,JOY] Amiga joystick support

			Map of devices attached to JOY0DAT and JOY1DAT

			Map of devices attached to JOY0DAT and JOY1DAT

			Format: <a>,<b>

			Format: <a>,<b>
@@ -599,6 +610,29 @@ and is between 256 and 4096 characters. It is defined in the file 
			See drivers/char/README.epca and

			See drivers/char/README.epca and

			Documentation/digiepca.txt.

			Documentation/digiepca.txt.





	disable_mtrr_cleanup [X86]

	enable_mtrr_cleanup [X86]

			The kernel tries to adjust MTRR layout from continuous

			to discrete, to make X server driver able to add WB

			entry later. This parameter enables/disables that.



	mtrr_chunk_size=nn[KMG] [X86]

			used for mtrr cleanup. It is largest continous chunk

			that could hold holes aka. UC entries.



	mtrr_gran_size=nn[KMG] [X86]

			Used for mtrr cleanup. It is granularity of mtrr block.

			Default is 1.

			Large value could prevent small alignment from

			using up MTRRs.



	mtrr_spare_reg_nr=n [X86]

			Format: <integer>

			Range: 0,7 : spare reg number

			Default : 1

			Used for mtrr cleanup. It is spare mtrr entries number.

			Set to 2 or more if your graphical card needs more.



	disable_mtrr_trim [X86, Intel and AMD only]

	disable_mtrr_trim [X86, Intel and AMD only]

			By default the kernel will trim any uncacheable

			By default the kernel will trim any uncacheable

			memory out of your available memory pool based on

			memory out of your available memory pool based on
@@ -2116,6 +2150,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	usbhid.mousepoll=

	usbhid.mousepoll=

			[USBHID] The interval which mice are to be polled at.

			[USBHID] The interval which mice are to be polled at.





	add_efi_memmap	[EFI; x86-32,X86-64] Include EFI memory map in

			kernel's map of available physical RAM.



	vdso=		[X86-32,SH,x86-64]

	vdso=		[X86-32,SH,x86-64]

			vdso=2: enable compat VDSO (default with COMPAT_VDSO)

			vdso=2: enable compat VDSO (default with COMPAT_VDSO)

			vdso=1: enable VDSO (default)

			vdso=1: enable VDSO (default)

Documentation/nmi_watchdog.txt

+7 −9
Original line number Original line Diff line number Diff line
@@ -22,8 +22,7 @@ CONFIG_X86_UP_IOAPIC is for uniprocessor with an IO-APIC. [Note: certain 
kernel debugging options, such as Kernel Stack Meter or Kernel Tracer,

kernel debugging options, such as Kernel Stack Meter or Kernel Tracer,

may implicitly disable the NMI watchdog.]

may implicitly disable the NMI watchdog.]





For x86-64, the needed APIC is always compiled in, and the NMI watchdog is

For x86-64, the needed APIC is always compiled in.

always enabled with I/O-APIC mode (nmi_watchdog=1).





Using local APIC (nmi_watchdog=2) needs the first performance register, so

Using local APIC (nmi_watchdog=2) needs the first performance register, so

you can't use it for other purposes (such as high precision performance

you can't use it for other purposes (such as high precision performance
@@ -67,12 +66,11 @@ time. The I/O APIC watchdog is driven externally and has no such shortcoming. 
But its NMI frequency is much higher, resulting in a more significant hit

But its NMI frequency is much higher, resulting in a more significant hit

to the overall system performance.

to the overall system performance.





NOTE: starting with 2.4.2-ac18 the NMI-oopser is disabled by default,

On x86 nmi_watchdog is disabled by default so you have to enable it with

you have to enable it with a boot time parameter.  Prior to 2.4.2-ac18

a boot time parameter.

the NMI-oopser is enabled unconditionally on x86 SMP boxes.





On x86-64 the NMI oopser is on by default. On 64bit Intel CPUs

NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally

it uses IO-APIC by default and on AMD it uses local APIC.

on x86 SMP boxes.





[ feel free to send bug reports, suggestions and patches to

[ feel free to send bug reports, suggestions and patches to

  Ingo Molnar <mingo@redhat.com> or the Linux SMP mailing

  Ingo Molnar <mingo@redhat.com> or the Linux SMP mailing

CRA Git | Maintained and supported by SUSTech CRA and CCSE