diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 14:03:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 14:03:12 -0400 |
| commit | bf6f51e3a46f6a602853d3cbacd05864bc6e2a37 (patch) | |
| tree | 72ae3563c8a6703e276f005fce5b3f1a3daca08c /include/linux/pci_ids.h | |
| parent | ec8deffa33757286ba59e71d3d98173c37638b37 (diff) | |
| parent | 725c25819e4a0dafdcf42a5f31bc569341919c7c (diff) | |
Merge phase #3 (IOMMU) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-v28-for-linus-phase3-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
AMD IOMMU: use iommu_device_max_index, fix
AMD IOMMU: use iommu_device_max_index
x86: add PCI IDs for AMD Barcelona PCI devices
x86/iommu: use __GFP_ZERO instead of memset for GART
x86/iommu: convert GART need_flush to bool
x86/iommu: make GART driver checkpatch clean
x86 gart: remove unnecessary initialization
x86: restore old GART alloc_coherent behavior
revert "x86: make GART to respect device's dma_mask about virtual mappings"
x86: export pci-nommu's alloc_coherent
iommu: remove fullflush and nofullflush in IOMMU generic option
x86: remove set_bit_string()
iommu: export iommu_area_reserve helper function
AMD IOMMU: use coherent_dma_mask in alloc_coherent
add AMD IOMMU tree to MAINTAINERS file
AMD IOMMU: use cmd_buf_size when freeing the command buffer
AMD IOMMU: calculate IVHD size with a function
AMD IOMMU: remove unnecessary cast to u64 in the init code
AMD IOMMU: free domain bitmap with its allocation order
AMD IOMMU: simplify dma_mask_to_pages
...
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index a65b082a888a..f63b5455801c 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -497,6 +497,16 @@ | |||
| 497 | #define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101 | 497 | #define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101 |
| 498 | #define PCI_DEVICE_ID_AMD_K8_NB_MEMCTL 0x1102 | 498 | #define PCI_DEVICE_ID_AMD_K8_NB_MEMCTL 0x1102 |
| 499 | #define PCI_DEVICE_ID_AMD_K8_NB_MISC 0x1103 | 499 | #define PCI_DEVICE_ID_AMD_K8_NB_MISC 0x1103 |
| 500 | #define PCI_DEVICE_ID_AMD_10H_NB_HT 0x1200 | ||
| 501 | #define PCI_DEVICE_ID_AMD_10H_NB_MAP 0x1201 | ||
| 502 | #define PCI_DEVICE_ID_AMD_10H_NB_DRAM 0x1202 | ||
| 503 | #define PCI_DEVICE_ID_AMD_10H_NB_MISC 0x1203 | ||
| 504 | #define PCI_DEVICE_ID_AMD_10H_NB_LINK 0x1204 | ||
| 505 | #define PCI_DEVICE_ID_AMD_11H_NB_HT 0x1300 | ||
| 506 | #define PCI_DEVICE_ID_AMD_11H_NB_MAP 0x1301 | ||
| 507 | #define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302 | ||
| 508 | #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303 | ||
| 509 | #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304 | ||
| 500 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 | 510 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 |
| 501 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 | 511 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 |
| 502 | #define PCI_DEVICE_ID_AMD_SCSI 0x2020 | 512 | #define PCI_DEVICE_ID_AMD_SCSI 0x2020 |