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

Commit 6507f436 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

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: default avatarBart 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: default avatarJens Axboe <axboe@kernel.dk>
parent fe4fd723

drivers/block/skd_main.c

+6 −13
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ struct skd_fitmsg_context { 
	u16 outstanding;



	u32 length;

	u32 offset;



	u8 *msg_buf;

	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",

		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;
@@ -3854,7 +3852,7 @@ 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) {
@@ -3862,13 +3860,10 @@ static int skd_cons_skmsg(struct skd_device *skdev) 
			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];
@@ -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);

drivers/block/skd_s1120.h

+1 −1
Original line number Diff line number Diff line
@@ -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