ioat: device control support
PATCH 1/1 ioat: device control support
Add device control support for CBDMA v2 and v3 in the ioat driver. This allows DMA engine clients to call into the ioat driver and issue a DMA_TERMINATE_ALL.
Signed-off-by Jon Mason <[email protected]>
--- drivers/dma/ioat/dma_v2.c | 22 ++++++++++++++++++++++ drivers/dma/ioat/dma_v3.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+)
drivers/dma/ioat/dma_v2.c +22 -0
@@ -847,6 +847,27 @@ void ioat2_free_chan_resources(struct dma_chan *c) ioat->dmacount =0 ; } +static int ioat2_device_control (struct dma_chan *c,enum dma_ctrl_cmd cmd, +unsigned long arg) +{ +struct ioat2_dma_chan *ioat =to_ioat2_chan (c); +struct ioat_chan_common *chan = &ioat->base; + +switch (cmd) { +case DMA_TERMINATE_ALL : +spin_lock_bh (&chan->cleanup_lock); +spin_lock_bh (&ioat->prep_lock); +ioat2_restart_channel (ioat); +spin_unlock_bh (&ioat->prep_lock); +spin_unlock_bh (&chan->cleanup_lock); +break ; +default : +return -ENOSYS ; + } + +return 0 ; +} +static ssize_t ring_size_show (struct dma_chan *c,char *page) {struct ioat2_dma_chan *ioat =to_ioat2_chan (c);
@@ -896,6 +917,7 @@ int ioat2_dma_probe(struct ioatdma_device *device, int dca) dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; dma->device_free_chan_resources = ioat2_free_chan_resources; dma->device_tx_status = ioat_dma_tx_status; + dma->device_control = ioat2_device_control; err =ioat_probe (device);if (err)
drivers/dma/ioat/dma_v3.c +22 -0
@@ -1833,6 +1833,27 @@ static int ioat3_reset_hw(struct ioat_chan_common *chan)return err; } +static int ioat3_device_control (struct dma_chan *c,enum dma_ctrl_cmd cmd, +unsigned long arg) +{ +struct ioat2_dma_chan *ioat =to_ioat2_chan (c); +struct ioat_chan_common *chan = &ioat->base; + +switch (cmd) { +case DMA_TERMINATE_ALL : +spin_lock_bh (&chan->cleanup_lock); +spin_lock_bh (&ioat->prep_lock); +ioat3_restart_channel (ioat); +spin_unlock_bh (&ioat->prep_lock); +spin_unlock_bh (&chan->cleanup_lock); +break ; +default : +return -ENOSYS ; + } + +return 0 ; +} +static void ioat3_intr_quirk (struct ioatdma_device *device) {struct dma_device *dma;
@@ -1878,6 +1899,7 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca) dma->device_issue_pending = ioat2_issue_pending; dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; dma->device_free_chan_resources = ioat2_free_chan_resources; + dma->device_control = ioat3_device_control;if (is_xeon_cb32 (pdev)) dma->copy_align =6 ;
Signature · 1 line
1.7.9.5
Acked-by Dave Jiang <[email protected]>
Quoted 90 lines · Jon Mason
Add device control support for CBDMA v2 and v3 in the ioat driver. This allows DMA engine clients to call into the ioat driver and issue a
DMA_TERMINATE_ALL.Signed-off-by Jon Mason <[email protected]>--- drivers/dma/ioat/dma_v2.c | 22 ++++++++++++++++++++++ drivers/dma/ioat/dma_v3.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+)drivers/dma/ioat/dma_v2.c +22
-0@@ -847,6 +847,27 @@ void ioat2_free_chan_resources(struct dma_chan *c) ioat->dmacount =0 ; } +static int ioat2_device_control (struct dma_chan *c,enum dma_ctrl_cmd cmd, +unsigned long arg) +{ +struct ioat2_dma_chan *ioat =to_ioat2_chan (c); +struct ioat_chan_common *chan = &ioat->base; + +switch (cmd) { +case DMA_TERMINATE_ALL : +spin_lock_bh (&chan->cleanup_lock); +spin_lock_bh (&ioat->prep_lock); +ioat2_restart_channel (ioat); +spin_unlock_bh (&ioat->prep_lock); +spin_unlock_bh (&chan->cleanup_lock); +break ; +default : +return -ENOSYS ; + } + +return 0 ; +} +static ssize_t ring_size_show (struct dma_chan *c,char *page) {struct ioat2_dma_chan *ioat =to_ioat2_chan (c);@@ -896,6 +917,7 @@ int ioat2_dma_probe(struct ioatdma_device *device, int dca) dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; dma->device_free_chan_resources = ioat2_free_chan_resources; dma->device_tx_status = ioat_dma_tx_status; + dma->device_control = ioat2_device_control; err =ioat_probe (device);if (err)drivers/dma/ioat/dma_v3.c +22
-0@@ -1833,6 +1833,27 @@ static int ioat3_reset_hw(struct ioat_chan_common *chan)return err; } +static int ioat3_device_control (struct dma_chan *c,enum dma_ctrl_cmd cmd, +unsigned long arg) +{ +struct ioat2_dma_chan *ioat =to_ioat2_chan (c); +struct ioat_chan_common *chan = &ioat->base; + +switch (cmd) { +case DMA_TERMINATE_ALL : +spin_lock_bh (&chan->cleanup_lock); +spin_lock_bh (&ioat->prep_lock); +ioat3_restart_channel (ioat); +spin_unlock_bh (&ioat->prep_lock); +spin_unlock_bh (&chan->cleanup_lock); +break ; +default : +return -ENOSYS ; + } + +return 0 ; +} +static void ioat3_intr_quirk (struct ioatdma_device *device) {struct dma_device *dma;@@ -1878,6 +1899,7 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca) dma->device_issue_pending = ioat2_issue_pending; dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; dma->device_free_chan_resources = ioat2_free_chan_resources; + dma->device_control = ioat3_device_control;if (is_xeon_cb32 (pdev)) dma->copy_align =6 ;
Signature · 4 lines
Dave Jiang Application Engineer, Storage Divsion Intel Corp. [email protected]