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

Commit e12c4fa3 authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'ioat' into dmaengine

parents a348a7e6 4b652f0d

drivers/dma/Makefile

+1 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o

obj-$(CONFIG_NET_DMA) += iovlock.o

obj-$(CONFIG_DMATEST) += dmatest.o

obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o

ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o

obj-$(CONFIG_INTEL_IOATDMA) += ioat/

obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o

obj-$(CONFIG_FSL_DMA) += fsldma.o

obj-$(CONFIG_MV_XOR) += mv_xor.o

drivers/dma/ioat/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o

ioatdma-objs := pci.o dma.o dma_v2.o dca.o

drivers/dma/ioat_dca.c→drivers/dma/ioat/dca.c

+8 −5
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24)

#endif



#include "ioatdma.h"

#include "ioatdma_registers.h"

#include "dma.h"

#include "registers.h"



/*

 * Bit 7 of a tag map entry is the "valid" bit, if it is set then bits 0:6
@@ -242,7 +242,8 @@ static struct dca_ops ioat_dca_ops = { 
};





struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)

struct dca_provider * __devinit

ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)

{

	struct dca_provider *dca;

	struct ioat_dca_priv *ioatdca;
@@ -407,7 +408,8 @@ static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset) 
	return slots;

}



struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)

struct dca_provider * __devinit

ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)

{

	struct dca_provider *dca;

	struct ioat_dca_priv *ioatdca;
@@ -602,7 +604,8 @@ static int ioat3_dca_count_dca_slots(void *iobase, u16 dca_offset) 
	return slots;

}



struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)

struct dca_provider * __devinit

ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase)

{

	struct dca_provider *dca;

	struct ioat_dca_priv *ioatdca;