Commit 9e9abecf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
  x86: standalone trampoline code
  x86: move suspend wakeup code to C
  x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
  x86: setup_trampoline() - fix section mismatch warning
  x86: section mismatch fixes, #1
  x86: fix paranoia about using BIOS quickboot mechanism.
  x86: print out buggy mptable
  x86: use cpu_online()
  x86: use cpumask_of_cpu()
  x86: remove unnecessary tmp local variable
  x86: remove unnecessary memset()
  x86: use ioapic_read_entry() and ioapic_write_entry()
  x86: avoid redundant loop in io_apic_level_ack_pending()
  x86: remove superfluous initialisation in boot code.
  x86: merge mpparse_{32,64}.c
  x86: unify mp_register_gsi
  x86: unify mp_config_acpi_legacy_irqs
  x86: unify mp_register_ioapic
  x86: unify uniq_io_apic_id
  x86: unify smp_scan_config
  ...
parents d7bb545d 77ad386e

Documentation/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ Who: Stephen Hemminger <shemminger@linux-foundation.org> 
---------------------------



What:	i386/x86_64 bzImage symlinks

When:	April 2008

When:	April 2010



Why:	The i386/x86_64 merge provides a symlink to the old bzImage

	location so not yet updated user space tools, e.g. package

Documentation/i386/boot.txt

+28 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ Offset Proto Name Meaning 
0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

023C/4	2.07+	hardware_subarch Hardware subarchitecture

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data

0248/4	2.08+	payload_offset	Offset of kernel payload

024C/4	2.08+	payload_length	Length of kernel payload



(1) For backwards compatibility, if the setup_sects field contains 0, the

    real value is 4.
@@ -512,6 +514,32 @@ Protocol: 2.07+ 


  A pointer to data that is specific to hardware subarch



Field name:	payload_offset

Type:		read

Offset/size:	0x248/4

Protocol:	2.08+



  If non-zero then this field contains the offset from the end of the

  real-mode code to the payload.



  The payload may be compressed. The format of both the compressed and

  uncompressed data should be determined using the standard magic

  numbers. Currently only gzip compressed ELF is used.

  

Field name:	payload_length

Type:		read

Offset/size:	0x24c/4

Protocol:	2.08+



  The length of the payload.



**** THE IMAGE CHECKSUM



From boot protocol version 2.08 onwards the CRC-32 is calculated over

the entire file using the characteristic polynomial 0x04C11DB7 and an

initial remainder of 0xffffffff.  The checksum is appended to the

file; therefore the CRC of the file up to the limit specified in the

syssize field of the header is always 0.



**** THE KERNEL COMMAND LINE

Documentation/kernel-parameters.txt

+18 −0
Original line number Diff line number Diff line
@@ -812,6 +812,19 @@ and is between 256 and 4096 characters. It is defined in the file 


	inttest=	[IA64]



	iommu=		[x86]

		off

		force

		noforce

		biomerge

		panic

		nopanic

		merge

		nomerge

		forcesac

		soft





	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option

		off

			Disable intel iommu driver.
@@ -1134,6 +1147,11 @@ and is between 256 and 4096 characters. It is defined in the file 
			         or

			         memmap=0x10000$0x18690000



	memtest=	[KNL,X86_64] Enable memtest

			Format: <integer>

			range: 0,4 : pattern number

			default : 0 <disable>



	meye.*=		[HW] Set MotionEye Camera parameters

			See Documentation/video4linux/meye.txt.

Documentation/x86/pat.txt

0 → 100644
+100 −0
Original line number Diff line number Diff line 


PAT (Page Attribute Table)



x86 Page Attribute Table (PAT) allows for setting the memory attribute at the

page level granularity. PAT is complementary to the MTRR settings which allows

for setting of memory types over physical address ranges. However, PAT is

more flexible than MTRR due to its capability to set attributes at page level

and also due to the fact that there are no hardware limitations on number of

such attribute settings allowed. Added flexibility comes with guidelines for

not having memory type aliasing for the same physical memory with multiple

virtual addresses.



PAT allows for different types of memory attributes. The most commonly used

ones that will be supported at this time are Write-back, Uncached,

Write-combined and Uncached Minus.



There are many different APIs in the kernel that allows setting of memory

attributes at the page level. In order to avoid aliasing, these interfaces

should be used thoughtfully. Below is a table of interfaces available,

their intended usage and their memory attribute relationships. Internally,

these APIs use a reserve_memtype()/free_memtype() interface on the physical

address range to avoid any aliasing.





-------------------------------------------------------------------

API                    |    RAM   |  ACPI,...  |  Reserved/Holes  |

-----------------------|----------|------------|------------------|

                       |          |            |                  |

ioremap                |    --    |    UC      |       UC         |

                       |          |            |                  |

ioremap_cache          |    --    |    WB      |       WB         |

                       |          |            |                  |

ioremap_nocache        |    --    |    UC      |       UC         |

                       |          |            |                  |

ioremap_wc             |    --    |    --      |       WC         |

                       |          |            |                  |

set_memory_uc          |    UC    |    --      |       --         |

 set_memory_wb         |          |            |                  |

                       |          |            |                  |

set_memory_wc          |    WC    |    --      |       --         |

 set_memory_wb         |          |            |                  |

                       |          |            |                  |

pci sysfs resource     |    --    |    --      |       UC         |

                       |          |            |                  |

pci sysfs resource_wc  |    --    |    --      |       WC         |

 is IORESOURCE_PREFETCH|          |            |                  |

                       |          |            |                  |

pci proc               |    --    |    --      |       UC         |

 !PCIIOC_WRITE_COMBINE |          |            |                  |

                       |          |            |                  |

pci proc               |    --    |    --      |       WC         |

 PCIIOC_WRITE_COMBINE  |          |            |                  |

                       |          |            |                  |

/dev/mem               |    --    |    UC      |       UC         |

 read-write            |          |            |                  |

                       |          |            |                  |

/dev/mem               |    --    |    UC      |       UC         |

 mmap SYNC flag        |          |            |                  |

                       |          |            |                  |

/dev/mem               |    --    |  WB/WC/UC  |    WB/WC/UC      |

 mmap !SYNC flag       |          |(from exist-|  (from exist-    |

 and                   |          |  ing alias)|    ing alias)    |

 any alias to this area|          |            |                  |

                       |          |            |                  |

/dev/mem               |    --    |    WB      |       WB         |

 mmap !SYNC flag       |          |            |                  |

 no alias to this area |          |            |                  |

 and                   |          |            |                  |

 MTRR says WB          |          |            |                  |

                       |          |            |                  |

/dev/mem               |    --    |    --      |    UC_MINUS      |

 mmap !SYNC flag       |          |            |                  |

 no alias to this area |          |            |                  |

 and                   |          |            |                  |

 MTRR says !WB         |          |            |                  |

                       |          |            |                  |

-------------------------------------------------------------------



Notes:



-- in the above table mean "Not suggested usage for the API". Some of the --'s

are strictly enforced by the kernel. Some others are not really enforced

today, but may be enforced in future.



For ioremap and pci access through /sys or /proc - The actual type returned

can be more restrictive, in case of any existing aliasing for that address.

For example: If there is an existing uncached mapping, a new ioremap_wc can

return uncached mapping in place of write-combine requested.



set_memory_[uc|wc] and set_memory_wb should be used in pairs, where driver will

first make a region uc or wc and switch it back to wb after use.



Over time writes to /proc/mtrr will be deprecated in favor of using PAT based

interfaces. Users writing to /proc/mtrr are suggested to use above interfaces.



Drivers should use ioremap_[uc|wc] to access PCI BARs with [uc|wc] access

types.



Drivers should use set_memory_[uc|wc] to set access type for RAM ranges.

Documentation/x86_64/boot-options.txt

+5 −0
Original line number Diff line number Diff line
@@ -307,3 +307,8 @@ Debugging 
			stuck (default)



Miscellaneous



	nogbpages

		Do not use GB pages for kernel direct mappings.

	gbpages

		Use GB pages for kernel direct mappings.

CRA Git | Maintained and supported by SUSTech CRA and CCSE