Skip to content

Commit

Permalink
skd: Simplify the code for allocating DMA message buffers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bart Van Assche authored and Jens Axboe committed Aug 18, 2017
1 parent fe4fd72 commit 6507f43
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
19 changes: 6 additions & 13 deletions drivers/block/skd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ struct skd_fitmsg_context {
u16 outstanding;

u32 length;
u32 offset;

u8 *msg_buf;
dma_addr_t mb_dma_address;
Expand Down Expand Up @@ -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",
skmsg->mb_dma_address, skdev->in_flight);
dev_dbg(&skdev->pdev->dev, "msg_buf 0x%p, offset %x\n", skmsg->msg_buf,
skmsg->offset);
dev_dbg(&skdev->pdev->dev, "msg_buf %p\n", skmsg->msg_buf);

qcmd = skmsg->mb_dma_address;
qcmd |= FIT_QCMD_QID_NORMAL;
Expand Down Expand Up @@ -3854,21 +3852,18 @@ static int skd_cons_skmsg(struct skd_device *skdev)

skmsg->state = SKD_MSG_STATE_IDLE;
skmsg->msg_buf = pci_alloc_consistent(skdev->pdev,
SKD_N_FITMSG_BYTES + 64,
SKD_N_FITMSG_BYTES,
&skmsg->mb_dma_address);

if (skmsg->msg_buf == NULL) {
rc = -ENOMEM;
goto err_out;
}

skmsg->offset = (u32)((u64)skmsg->msg_buf &
(~FIT_QCMD_BASE_ADDRESS_MASK));
skmsg->msg_buf += ~FIT_QCMD_BASE_ADDRESS_MASK;
skmsg->msg_buf = (u8 *)((u64)skmsg->msg_buf &
FIT_QCMD_BASE_ADDRESS_MASK);
skmsg->mb_dma_address += ~FIT_QCMD_BASE_ADDRESS_MASK;
skmsg->mb_dma_address &= FIT_QCMD_BASE_ADDRESS_MASK;
WARN(((uintptr_t)skmsg->msg_buf | skmsg->mb_dma_address) &
(FIT_QCMD_ALIGN - 1),
"not aligned: msg_buf %p mb_dma_address %#llx\n",
skmsg->msg_buf, skmsg->mb_dma_address);
memset(skmsg->msg_buf, 0, SKD_N_FITMSG_BYTES);

skmsg->next = &skmsg[1];
Expand Down Expand Up @@ -4230,8 +4225,6 @@ static void skd_free_skmsg(struct skd_device *skdev)
skmsg = &skdev->skmsg_table[i];

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,
skmsg->msg_buf,
skmsg->mb_dma_address);
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/skd_s1120.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define FIT_QCMD_MSGSIZE_128 (0x1 << 4)
#define FIT_QCMD_MSGSIZE_256 (0x2 << 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
Expand Down

0 comments on commit 6507f43

Please sign in to comment.