diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2018-11-22 13:11:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 16:59:48 +0100 |
| commit | 2513eb0dd7ba8a8766b9642075c19ac5f2d5463b (patch) | |
| tree | 034c9a02290754acfcddd8341eb5249015c32221 /drivers/misc | |
| parent | c55bf542e91b5c9156d57fd0461aa257b7d20858 (diff) | |
mei: hw: add dma ring control block
The DMA ring control block contains write and read
indices for host and device circular buffers.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/dma-ring.c | 20 | ||||
| -rw-r--r-- | drivers/misc/mei/hbm.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/hw.h | 23 | ||||
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 1 |
4 files changed, 46 insertions, 0 deletions
diff --git a/drivers/misc/mei/dma-ring.c b/drivers/misc/mei/dma-ring.c index 56f4c0882a20..b73d5ab54070 100644 --- a/drivers/misc/mei/dma-ring.c +++ b/drivers/misc/mei/dma-ring.c @@ -97,3 +97,23 @@ bool mei_dma_ring_is_allocated(struct mei_device *dev) { return !!dev->dr_dscr[DMA_DSCR_HOST].vaddr; } + +static inline +struct hbm_dma_ring_ctrl *mei_dma_ring_ctrl(struct mei_device *dev) +{ + return (struct hbm_dma_ring_ctrl *)dev->dr_dscr[DMA_DSCR_CTRL].vaddr; +} + +/** + * mei_dma_ring_reset() - reset the dma control block + * @dev: mei device + */ +void mei_dma_ring_reset(struct mei_device *dev) +{ + struct hbm_dma_ring_ctrl *ctrl = mei_dma_ring_ctrl(dev); + + if (!ctrl) + return; + + memset(ctrl, 0, sizeof(*ctrl)); +} diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c index b458c5612245..78c26cebf5d4 100644 --- a/drivers/misc/mei/hbm.c +++ b/drivers/misc/mei/hbm.c @@ -323,6 +323,8 @@ static int mei_hbm_dma_setup_req(struct mei_device *dev) req.dma_dscr[i].size = dev->dr_dscr[i].size; } + mei_dma_ring_reset(dev); + ret = mei_hbm_write_message(dev, &mei_hdr, &req); if (ret) { dev_err(dev->dev, "dma setup request write failed: ret = %d.\n", diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h index 65655925791a..4f09bbcdbc2a 100644 --- a/drivers/misc/mei/hw.h +++ b/drivers/misc/mei/hw.h @@ -512,4 +512,27 @@ struct hbm_dma_setup_response { u8 reserved[2]; } __packed; +/** + * struct mei_dma_ring_ctrl - dma ring control block + * + * @hbuf_wr_idx: host circular buffer write index in slots + * @reserved1: reserved for alignment + * @hbuf_rd_idx: host circular buffer read index in slots + * @reserved2: reserved for alignment + * @dbuf_wr_idx: device circular buffer write index in slots + * @reserved3: reserved for alignment + * @dbuf_rd_idx: device circular buffer read index in slots + * @reserved4: reserved for alignment + */ +struct hbm_dma_ring_ctrl { + u32 hbuf_wr_idx; + u32 reserved1; + u32 hbuf_rd_idx; + u32 reserved2; + u32 dbuf_wr_idx; + u32 reserved3; + u32 dbuf_rd_idx; + u32 reserved4; +} __packed; + #endif diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index a6796e3f712b..033b5eff8e59 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -597,6 +597,7 @@ void mei_cancel_work(struct mei_device *dev); int mei_dmam_ring_alloc(struct mei_device *dev); void mei_dmam_ring_free(struct mei_device *dev); bool mei_dma_ring_is_allocated(struct mei_device *dev); +void mei_dma_ring_reset(struct mei_device *dev); /* * MEI interrupt functions prototype |