diff options
Diffstat (limited to 'Documentation/x86')
-rw-r--r-- | Documentation/x86/boot.txt | 6 | ||||
-rw-r--r-- | Documentation/x86/pat.txt | 24 | ||||
-rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 11 | ||||
-rw-r--r-- | Documentation/x86/x86_64/mm.txt | 2 |
4 files changed, 28 insertions, 15 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 83c0033ee9e0..fcdc62b3c3d8 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt | |||
@@ -349,7 +349,7 @@ Protocol: 2.00+ | |||
349 | 3 SYSLINUX | 349 | 3 SYSLINUX |
350 | 4 EtherBoot | 350 | 4 EtherBoot |
351 | 5 ELILO | 351 | 5 ELILO |
352 | 7 GRuB | 352 | 7 GRUB |
353 | 8 U-BOOT | 353 | 8 U-BOOT |
354 | 9 Xen | 354 | 9 Xen |
355 | A Gujin | 355 | A Gujin |
@@ -537,8 +537,8 @@ Type: read | |||
537 | Offset/size: 0x248/4 | 537 | Offset/size: 0x248/4 |
538 | Protocol: 2.08+ | 538 | Protocol: 2.08+ |
539 | 539 | ||
540 | If non-zero then this field contains the offset from the end of the | 540 | If non-zero then this field contains the offset from the beginning |
541 | real-mode code to the payload. | 541 | of the protected-mode code to the payload. |
542 | 542 | ||
543 | The payload may be compressed. The format of both the compressed and | 543 | The payload may be compressed. The format of both the compressed and |
544 | uncompressed data should be determined using the standard magic | 544 | uncompressed data should be determined using the standard magic |
diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt index c93ff5f4c0dd..cf08c9fff3cd 100644 --- a/Documentation/x86/pat.txt +++ b/Documentation/x86/pat.txt | |||
@@ -80,6 +80,30 @@ pci proc | -- | -- | WC | | |||
80 | | | | | | 80 | | | | | |
81 | ------------------------------------------------------------------- | 81 | ------------------------------------------------------------------- |
82 | 82 | ||
83 | Advanced APIs for drivers | ||
84 | ------------------------- | ||
85 | A. Exporting pages to users with remap_pfn_range, io_remap_pfn_range, | ||
86 | vm_insert_pfn | ||
87 | |||
88 | Drivers wanting to export some pages to userspace do it by using mmap | ||
89 | interface and a combination of | ||
90 | 1) pgprot_noncached() | ||
91 | 2) io_remap_pfn_range() or remap_pfn_range() or vm_insert_pfn() | ||
92 | |||
93 | With PAT support, a new API pgprot_writecombine is being added. So, drivers can | ||
94 | continue to use the above sequence, with either pgprot_noncached() or | ||
95 | pgprot_writecombine() in step 1, followed by step 2. | ||
96 | |||
97 | In addition, step 2 internally tracks the region as UC or WC in memtype | ||
98 | list in order to ensure no conflicting mapping. | ||
99 | |||
100 | Note that this set of APIs only works with IO (non RAM) regions. If driver | ||
101 | wants to export a RAM region, it has to do set_memory_uc() or set_memory_wc() | ||
102 | as step 0 above and also track the usage of those pages and use set_memory_wb() | ||
103 | before the page is freed to free pool. | ||
104 | |||
105 | |||
106 | |||
83 | Notes: | 107 | Notes: |
84 | 108 | ||
85 | -- in the above table mean "Not suggested usage for the API". Some of the --'s | 109 | -- in the above table mean "Not suggested usage for the API". Some of the --'s |
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index f6d561a1a9b2..34c13040a718 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt | |||
@@ -79,17 +79,6 @@ Timing | |||
79 | Report when timer interrupts are lost because some code turned off | 79 | Report when timer interrupts are lost because some code turned off |
80 | interrupts for too long. | 80 | interrupts for too long. |
81 | 81 | ||
82 | nmi_watchdog=NUMBER[,panic] | ||
83 | NUMBER can be: | ||
84 | 0 don't use an NMI watchdog | ||
85 | 1 use the IO-APIC timer for the NMI watchdog | ||
86 | 2 use the local APIC for the NMI watchdog using a performance counter. Note | ||
87 | This will use one performance counter and the local APIC's performance | ||
88 | vector. | ||
89 | When panic is specified panic when an NMI watchdog timeout occurs. | ||
90 | This is useful when you use a panic=... timeout and need the box | ||
91 | quickly up again. | ||
92 | |||
93 | nohpet | 82 | nohpet |
94 | Don't use the HPET timer. | 83 | Don't use the HPET timer. |
95 | 84 | ||
diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt index efce75097369..29b52b14d0b4 100644 --- a/Documentation/x86/x86_64/mm.txt +++ b/Documentation/x86/x86_64/mm.txt | |||
@@ -6,7 +6,7 @@ Virtual memory map with 4 level page tables: | |||
6 | 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm | 6 | 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm |
7 | hole caused by [48:63] sign extension | 7 | hole caused by [48:63] sign extension |
8 | ffff800000000000 - ffff80ffffffffff (=40 bits) guard hole | 8 | ffff800000000000 - ffff80ffffffffff (=40 bits) guard hole |
9 | ffff810000000000 - ffffc0ffffffffff (=46 bits) direct mapping of all phys. memory | 9 | ffff880000000000 - ffffc0ffffffffff (=57 TB) direct mapping of all phys. memory |
10 | ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole | 10 | ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole |
11 | ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space | 11 | ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space |
12 | ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) | 12 | ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) |