History

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: dmaengine: use DEFINE_IDR for static initialization ioat: fix xor_idx_to_desc Avoid section type conflict in dma/ioat/dma_v3.c ioat: Adding PCI IDs for IOAT devices on SandyBridge platforms

Linus Torvalds committed 15 years ago

Commit 7f3bf7c2 parents cbc158d 21ef4b84 files · +26 −7Browse files

Unified · Split

4 files
  1. drivers/dma/dmaengine.c +1 −3
  2. drivers/dma/ioat/dma_v3.c +4 −4
  3. drivers/dma/ioat/pci.c +11 −0
  4. include/linux/pci_ids.h +10 −0
drivers/dma/dmaengine.c+1−3
@@ -62,9 +62,9 @@ · 61 unmodified lines
62#include <linux/slab.h>62#include <linux/slab.h>
63 63
64static DEFINE_MUTEX(dma_list_mutex);64static DEFINE_MUTEX(dma_list_mutex);
65static DEFINE_IDR(dma_idr);
65static LIST_HEAD(dma_device_list);66static LIST_HEAD(dma_device_list);
66static long dmaengine_ref_count;67static long dmaengine_ref_count;
67static struct idr dma_idr;
68 68
69/* --- sysfs implementation --- */69/* --- sysfs implementation --- */
70 70
@@ -1050,8 +1050,6 @@ EXPORT_SYMBOL_GPL(dma_run_dependencies); · 979 unmodified lines
1050 1050
1051static int __init dma_bus_init(void)1051static int __init dma_bus_init(void)
1052{1052{
1053 idr_init(&dma_idr);
1054 mutex_init(&dma_list_mutex);
1055 return class_register(&dma_devclass);1053 return class_register(&dma_devclass);
1056}1054}
1057arch_initcall(dma_bus_init);1055arch_initcall(dma_bus_init);
drivers/dma/ioat/dma_v3.c+4−4
@@ -73,10 +73,10 @@ · 72 unmodified lines
73/* provide a lookup table for setting the source address in the base or73/* provide a lookup table for setting the source address in the base or
74 * extended descriptor of an xor or pq descriptor74 * extended descriptor of an xor or pq descriptor
75 */75 */
76static const u8 xor_idx_to_desc __read_mostly = 0xd0;76static const u8 xor_idx_to_desc = 0xe0;
77static const u8 xor_idx_to_field[] __read_mostly = { 1, 4, 5, 6, 7, 0, 1, 2 };77static const u8 xor_idx_to_field[] = { 1, 4, 5, 6, 7, 0, 1, 2 };
78static const u8 pq_idx_to_desc __read_mostly = 0xf8;78static const u8 pq_idx_to_desc = 0xf8;
79static const u8 pq_idx_to_field[] __read_mostly = { 1, 4, 5, 0, 1, 2, 4, 5 };79static const u8 pq_idx_to_field[] = { 1, 4, 5, 0, 1, 2, 4, 5 };
80 80
81static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)81static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)
82{82{
drivers/dma/ioat/pci.c+11−0
@@ -72,6 +72,17 @@ static struct pci_device_id ioat_pci_tbl[] = { · 71 unmodified lines
72 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_JSF8) },72 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_JSF8) },
73 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_JSF9) },73 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_JSF9) },
74 74
75 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB0) },
76 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB1) },
77 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB2) },
78 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB3) },
79 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB4) },
80 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB5) },
81 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB6) },
82 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB7) },
83 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB8) },
84 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB9) },
85
75 { 0, }86 { 0, }
76};87};
77MODULE_DEVICE_TABLE(pci, ioat_pci_tbl);88MODULE_DEVICE_TABLE(pci, ioat_pci_tbl);
include/linux/pci_ids.h+10−0
@@ -2709,6 +2709,16 @@ · 2708 unmodified lines
2709#define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a602709#define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60
2710#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN 0x3b002710#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN 0x3b00
2711#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX 0x3b1f2711#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX 0x3b1f
2712#define PCI_DEVICE_ID_INTEL_IOAT_SNB0 0x3c20
2713#define PCI_DEVICE_ID_INTEL_IOAT_SNB1 0x3c21
2714#define PCI_DEVICE_ID_INTEL_IOAT_SNB2 0x3c22
2715#define PCI_DEVICE_ID_INTEL_IOAT_SNB3 0x3c23
2716#define PCI_DEVICE_ID_INTEL_IOAT_SNB4 0x3c24
2717#define PCI_DEVICE_ID_INTEL_IOAT_SNB5 0x3c25
2718#define PCI_DEVICE_ID_INTEL_IOAT_SNB6 0x3c26
2719#define PCI_DEVICE_ID_INTEL_IOAT_SNB7 0x3c27
2720#define PCI_DEVICE_ID_INTEL_IOAT_SNB8 0x3c2e
2721#define PCI_DEVICE_ID_INTEL_IOAT_SNB9 0x3c2f
2712#define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f2722#define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f
2713#define PCI_DEVICE_ID_INTEL_5100_16 0x65f02723#define PCI_DEVICE_ID_INTEL_5100_16 0x65f0
2714#define PCI_DEVICE_ID_INTEL_5100_21 0x65f52724#define PCI_DEVICE_ID_INTEL_5100_21 0x65f5

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t