Commit c5e8e938 authored by Pranjal Ramajor Asha Kanojiya's avatar Pranjal Ramajor Asha Kanojiya Committed by Jeff Hugo
Browse files

accel/qaic: Fix the for loop used to walk SG table 



Only for_each_sgtable_dma_sg() should be used to walk through a SG table
to grab correct bus address and length pair after calling DMA MAP API on
a SG table as DMA MAP APIs updates the SG table and for_each_sgtable_sg()
walks through the original SG table.

Fixes: ff13be83 ("accel/qaic: Add datapath")
Fixes: 129776ac ("accel/qaic: Add control path")
Signed-off-by: default avatarPranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Reviewed-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241004193252.3888544-1-quic_jhugo@quicinc.com
parent f07fd958

drivers/accel/qaic/qaic_control.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int encode_addr_size_pairs(struct dma_xfer *xfer, struct wrapper_list *wr 
	nents = sgt->nents;

	nents_dma = nents;

	*size = QAIC_MANAGE_EXT_MSG_LENGTH - msg_hdr_len - sizeof(**out_trans);

	for_each_sgtable_sg(sgt, sg, i) {

	for_each_sgtable_dma_sg(sgt, sg, i) {

		*size -= sizeof(*asp);

		/* Save 1K for possible follow-up transactions. */

		if (*size < SZ_1K) {

drivers/accel/qaic/qaic_data.c

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl 
	nents = 0;



	size = size ? size : PAGE_SIZE;

	for (sg = sgt_in->sgl; sg; sg = sg_next(sg)) {

	for_each_sgtable_dma_sg(sgt_in, sg, j) {

		len = sg_dma_len(sg);



		if (!len)
@@ -221,7 +221,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl 


	/* copy relevant sg node and fix page and length */

	sgn = sgf;

	for_each_sgtable_sg(sgt, sg, j) {

	for_each_sgtable_dma_sg(sgt, sg, j) {

		memcpy(sg, sgn, sizeof(*sg));

		if (sgn == sgf) {

			sg_dma_address(sg) += offf;
@@ -301,7 +301,7 @@ static int encode_reqs(struct qaic_device *qdev, struct bo_slice *slice, 
	 * fence.

	 */

	dev_addr = req->dev_addr;

	for_each_sgtable_sg(slice->sgt, sg, i) {

	for_each_sgtable_dma_sg(slice->sgt, sg, i) {

		slice->reqs[i].cmd = cmd;

		slice->reqs[i].src_addr = cpu_to_le64(slice->dir == DMA_TO_DEVICE ?

						      sg_dma_address(sg) : dev_addr);