Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f3bf7cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cbc158d6 21ef4b8b

drivers/dma/dmaengine.c

+1 −3
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ 
#include <linux/slab.h>



static DEFINE_MUTEX(dma_list_mutex);

static DEFINE_IDR(dma_idr);

static LIST_HEAD(dma_device_list);

static long dmaengine_ref_count;

static struct idr dma_idr;



/* --- sysfs implementation --- */
@@ -1050,8 +1050,6 @@ EXPORT_SYMBOL_GPL(dma_run_dependencies); 


static int __init dma_bus_init(void)

{

	idr_init(&dma_idr);

	mutex_init(&dma_list_mutex);

	return class_register(&dma_devclass);

}

arch_initcall(dma_bus_init);

drivers/dma/ioat/dma_v3.c

+4 −4
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ 
/* provide a lookup table for setting the source address in the base or

 * extended descriptor of an xor or pq descriptor

 */

static const u8 xor_idx_to_desc __read_mostly = 0xd0;

static const u8 xor_idx_to_field[] __read_mostly = { 1, 4, 5, 6, 7, 0, 1, 2 };

static const u8 pq_idx_to_desc __read_mostly = 0xf8;

static const u8 pq_idx_to_field[] __read_mostly = { 1, 4, 5, 0, 1, 2, 4, 5 };

static const u8 xor_idx_to_desc = 0xe0;

static const u8 xor_idx_to_field[] = { 1, 4, 5, 6, 7, 0, 1, 2 };

static const u8 pq_idx_to_desc = 0xf8;

static const u8 pq_idx_to_field[] = { 1, 4, 5, 0, 1, 2, 4, 5 };



static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)

{

drivers/dma/ioat/pci.c

+11 −0
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@ static struct pci_device_id ioat_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_JSF8) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_JSF9) },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB0) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB1) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB2) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB3) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB4) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB5) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB6) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB7) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB8) },

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB9) },



	{ 0, }

};

MODULE_DEVICE_TABLE(pci, ioat_pci_tbl);

include/linux/pci_ids.h

+10 −0
Original line number Diff line number Diff line
@@ -2709,6 +2709,16 @@ 
#define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60

#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN	0x3b00

#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f

#define PCI_DEVICE_ID_INTEL_IOAT_SNB0	0x3c20

#define PCI_DEVICE_ID_INTEL_IOAT_SNB1	0x3c21

#define PCI_DEVICE_ID_INTEL_IOAT_SNB2	0x3c22

#define PCI_DEVICE_ID_INTEL_IOAT_SNB3	0x3c23

#define PCI_DEVICE_ID_INTEL_IOAT_SNB4	0x3c24

#define PCI_DEVICE_ID_INTEL_IOAT_SNB5	0x3c25

#define PCI_DEVICE_ID_INTEL_IOAT_SNB6	0x3c26

#define PCI_DEVICE_ID_INTEL_IOAT_SNB7	0x3c27

#define PCI_DEVICE_ID_INTEL_IOAT_SNB8	0x3c2e

#define PCI_DEVICE_ID_INTEL_IOAT_SNB9	0x3c2f

#define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f

#define PCI_DEVICE_ID_INTEL_5100_16	0x65f0

#define PCI_DEVICE_ID_INTEL_5100_21	0x65f5