UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

skd: Simplify the code for allocating DMA message buffers 

dma_alloc_coherent() guarantees alignment on a page boundary so
no explicit alignment is needed to align on a 64 byte boundary.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2017-08-17 13:13:06 -07:00 committed by Jens Axboe
parent fe4fd7235a
commit 6507f436f9
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/block/skd_main.c
View File

@ -190,7 +190,6 @@ struct skd_fitmsg_context {
u16 outstanding; u16 outstanding;
u32 length; u32 length;
u32 offset;
u8 *msg_buf; u8 *msg_buf;
dma_addr_t mb_dma_address; dma_addr_t mb_dma_address;
@ -2016,8 +2015,7 @@ static void skd_send_fitmsg(struct skd_device *skdev,
dev_dbg(&skdev->pdev->dev, "dma address 0x%llx, busy=%d\n", dev_dbg(&skdev->pdev->dev, "dma address 0x%llx, busy=%d\n",
skmsg->mb_dma_address, skdev->in_flight); skmsg->mb_dma_address, skdev->in_flight);
dev_dbg(&skdev->pdev->dev, "msg_buf 0x%p, offset %x\n", skmsg->msg_buf, dev_dbg(&skdev->pdev->dev, "msg_buf %p\n", skmsg->msg_buf);
skmsg->offset);
qcmd = skmsg->mb_dma_address; qcmd = skmsg->mb_dma_address;
qcmd |= FIT_QCMD_QID_NORMAL; qcmd |= FIT_QCMD_QID_NORMAL;
@ -3854,7 +3852,7 @@ static int skd_cons_skmsg(struct skd_device *skdev)
skmsg->state = SKD_MSG_STATE_IDLE; skmsg->state = SKD_MSG_STATE_IDLE;
skmsg->msg_buf = pci_alloc_consistent(skdev->pdev, skmsg->msg_buf = pci_alloc_consistent(skdev->pdev,
SKD_N_FITMSG_BYTES + 64, SKD_N_FITMSG_BYTES,
&skmsg->mb_dma_address); &skmsg->mb_dma_address);
if (skmsg->msg_buf == NULL) { if (skmsg->msg_buf == NULL) {
@ -3862,13 +3860,10 @@ static int skd_cons_skmsg(struct skd_device *skdev)
goto err_out; goto err_out;
} }
skmsg->offset = (u32)((u64)skmsg->msg_buf & WARN(((uintptr_t)skmsg->msg_buf | skmsg->mb_dma_address) &
(~FIT_QCMD_BASE_ADDRESS_MASK)); (FIT_QCMD_ALIGN - 1),
skmsg->msg_buf += ~FIT_QCMD_BASE_ADDRESS_MASK; "not aligned: msg_buf %p mb_dma_address %#llx\n",
skmsg->msg_buf = (u8 *)((u64)skmsg->msg_buf & skmsg->msg_buf, skmsg->mb_dma_address);
FIT_QCMD_BASE_ADDRESS_MASK);
skmsg->mb_dma_address += ~FIT_QCMD_BASE_ADDRESS_MASK;
skmsg->mb_dma_address &= FIT_QCMD_BASE_ADDRESS_MASK;
memset(skmsg->msg_buf, 0, SKD_N_FITMSG_BYTES); memset(skmsg->msg_buf, 0, SKD_N_FITMSG_BYTES);
skmsg->next = &skmsg[1]; skmsg->next = &skmsg[1];
@ -4230,8 +4225,6 @@ static void skd_free_skmsg(struct skd_device *skdev)
skmsg = &skdev->skmsg_table[i]; skmsg = &skdev->skmsg_table[i];
if (skmsg->msg_buf != NULL) { if (skmsg->msg_buf != NULL) {
skmsg->msg_buf += skmsg->offset;
skmsg->mb_dma_address += skmsg->offset;
pci_free_consistent(skdev->pdev, SKD_N_FITMSG_BYTES, pci_free_consistent(skdev->pdev, SKD_N_FITMSG_BYTES,
skmsg->msg_buf, skmsg->msg_buf,
skmsg->mb_dma_address); skmsg->mb_dma_address);

2
drivers/block/skd_s1120.h
View File

@ -28,7 +28,7 @@
#define FIT_QCMD_MSGSIZE_128 (0x1 << 4) #define FIT_QCMD_MSGSIZE_128 (0x1 << 4)
#define FIT_QCMD_MSGSIZE_256 (0x2 << 4) #define FIT_QCMD_MSGSIZE_256 (0x2 << 4)
#define FIT_QCMD_MSGSIZE_512 (0x3 << 4) #define FIT_QCMD_MSGSIZE_512 (0x3 << 4)
#define FIT_QCMD_BASE_ADDRESS_MASK (0xFFFFFFFFFFFFFFC0ull) #define FIT_QCMD_ALIGN L1_CACHE_BYTES
/* /*
* Control, 32-bit r/w * Control, 32-bit r/w