x86: EFI runtime service support: document for EFI runtime services

[powerpc.git] / Documentation / x86_64 / boot-options.txt

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 625a21d..638bf46 100644 (file)
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -14,9 +14,11 @@ Machine check
    mce=nobootlog
                Disable boot machine check logging.
    mce=tolerancelevel (number)
    mce=nobootlog
                Disable boot machine check logging.
    mce=tolerancelevel (number)

-               0: always panic, 1: panic if deadlock possible,
-               2: try to avoid panic, 3: never panic or exit (for testing)
-               default is 1
+               0: always panic on uncorrected errors, log corrected errors
+               1: panic or SIGBUS on uncorrected errors, log corrected errors
+               2: SIGBUS or log uncorrected errors, log corrected errors
+               3: never panic or SIGBUS, log all errors (for testing only)
+               Default is 1

                Can be also set using sysfs which is preferable.
 
    nomce (for compatibility with i386): same as mce=off
                Can be also set using sysfs which is preferable.
 
    nomce (for compatibility with i386): same as mce=off


@@ -108,12 +110,18 @@ Idle loop
 
 Rebooting
 
 
 Rebooting
 

-   reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old]
+   reboot=b[ios] | t[riple] | k[bd] | a[cpi] | e[fi] [, [w]arm | [c]old]

    bios          Use the CPU reboot vector for warm reset
    warm   Don't set the cold reboot flag
    cold   Set the cold reboot flag
    triple Force a triple fault (init)
    kbd    Use the keyboard controller. cold reset (default)
    bios          Use the CPU reboot vector for warm reset
    warm   Don't set the cold reboot flag
    cold   Set the cold reboot flag
    triple Force a triple fault (init)
    kbd    Use the keyboard controller. cold reset (default)

+   acpi   Use the ACPI RESET_REG in the FADT. If ACPI is not configured or the
+          ACPI reset does not work, the reboot path attempts the reset using
+          the keyboard controller.
+   efi    Use efi reset_system runtime service. If EFI is not configured or the
+          EFI reset does not work, the reboot path attempts the reset using
+          the keyboard controller.

 
    Using warm reset will be much faster especially on big memory
    systems because the BIOS will not go through the memory check.
 
    Using warm reset will be much faster especially on big memory
    systems because the BIOS will not go through the memory check.


@@ -134,12 +142,6 @@ Non Executable Mappings
 
 SMP
 
 
 SMP
 

-  nosmp        Only use a single CPU
-
-  maxcpus=NUMBER only use upto NUMBER CPUs
-
-  cpumask=MASK   only use cpus with bits set in mask
-

   additional_cpus=NUM Allow NUM more CPUs for hotplug
                 (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec)
 
   additional_cpus=NUM Allow NUM more CPUs for hotplug
                 (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec)
 


@@ -149,7 +151,19 @@ NUMA
 
   numa=noacpi   Don't parse the SRAT table for NUMA setup
 
 
   numa=noacpi   Don't parse the SRAT table for NUMA setup
 

-  numa=fake=X   Fake X nodes and ignore NUMA setup of the actual machine.
+  numa=fake=CMDLINE
+               If a number, fakes CMDLINE nodes and ignores NUMA setup of the
+               actual machine.  Otherwise, system memory is configured
+               depending on the sizes and coefficients listed.  For example:
+                       numa=fake=2*512,1024,4*256,*128
+               gives two 512M nodes, a 1024M node, four 256M nodes, and the
+               rest split into 128M chunks.  If the last character of CMDLINE
+               is a *, the remaining memory is divided up equally among its
+               coefficient:
+                       numa=fake=2*512,2*
+               gives two 512M nodes and the rest split into two nodes.
+               Otherwise, the remaining system RAM is allocated to an
+               additional node.

 
   numa=hotadd=percent
                Only allow hotadd memory to preallocate page structures upto
 
   numa=hotadd=percent
                Only allow hotadd memory to preallocate page structures upto


@@ -292,8 +306,8 @@ Debugging
                newfallback: use new unwinder but fall back to old if it gets
                        stuck (default)
 
                newfallback: use new unwinder but fall back to old if it gets
                        stuck (default)
 

-Miscellaneous
+EFI
+
+  noefi                Disable EFI support

 
 

-  noreplacement  Don't replace instructions with more appropriate ones
-                for the CPU. This may be useful on asymmetric MP systems
-                where some CPUs have less capabilities than others.
+Miscellaneous