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

Commit 2ffb2b02 authored by Sujeev Dias's avatar Sujeev Dias Committed by Gerrit - the friendly Code Review server
Browse files

mhi: core: rename iova address to dma_addr 



dma_addr are not necessarily same as physical address if iova is
enabled, rename to correct name to avoid confusions.

CRs-Fixed: 2258358
Change-Id: If55418500f94fcc9ebdc08786adea8bbf398cad3
Signed-off-by: default avatarSujeev Dias <sdias@codeaurora.org>
parent 9c5305af

drivers/bus/mhi/core/mhi_boot.c

+9 −7
Original line number Original line Diff line number Diff line
@@ -275,7 +275,7 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, 
	int i, ret;

	int i, ret;

	void __iomem *base = mhi_cntrl->bhi;

	void __iomem *base = mhi_cntrl->bhi;

	rwlock_t *pm_lock = &mhi_cntrl->pm_lock;

	rwlock_t *pm_lock = &mhi_cntrl->pm_lock;

	dma_addr_t phys = dma_map_single(mhi_cntrl->dev, buf, size,

	dma_addr_t dma_addr = dma_map_single(mhi_cntrl->dev, buf, size,

					     DMA_TO_DEVICE);

					     DMA_TO_DEVICE);

	struct {

	struct {

		char *name;

		char *name;
@@ -288,7 +288,7 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, 
		{ NULL },

		{ NULL },

	};

	};





	if (dma_mapping_error(mhi_cntrl->dev, phys))

	if (dma_mapping_error(mhi_cntrl->dev, dma_addr))

		return -ENOMEM;

		return -ENOMEM;





	MHI_LOG("Starting BHI programming\n");

	MHI_LOG("Starting BHI programming\n");
@@ -301,8 +301,10 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, 
	}

	}





	mhi_write_reg(mhi_cntrl, base, BHI_STATUS, 0);

	mhi_write_reg(mhi_cntrl, base, BHI_STATUS, 0);

	mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_HIGH, upper_32_bits(phys));

	mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_HIGH,

	mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_LOW, lower_32_bits(phys));

		      upper_32_bits(dma_addr));

	mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_LOW,

		      lower_32_bits(dma_addr));

	mhi_write_reg(mhi_cntrl, base, BHI_IMGSIZE, size);

	mhi_write_reg(mhi_cntrl, base, BHI_IMGSIZE, size);

	mhi_cntrl->session_id = prandom_u32() & BHI_TXDB_SEQNUM_BMSK;

	mhi_cntrl->session_id = prandom_u32() & BHI_TXDB_SEQNUM_BMSK;

	mhi_write_reg(mhi_cntrl, base, BHI_IMGTXDB, mhi_cntrl->session_id);

	mhi_write_reg(mhi_cntrl, base, BHI_IMGTXDB, mhi_cntrl->session_id);
@@ -337,12 +339,12 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, 
		goto invalid_pm_state;

		goto invalid_pm_state;

	}

	}





	dma_unmap_single(mhi_cntrl->dev, phys, size, DMA_TO_DEVICE);

	dma_unmap_single(mhi_cntrl->dev, dma_addr, size, DMA_TO_DEVICE);





	return (tx_status == BHI_STATUS_SUCCESS) ? 0 : -ETIMEDOUT;

	return (tx_status == BHI_STATUS_SUCCESS) ? 0 : -ETIMEDOUT;





invalid_pm_state:

invalid_pm_state:

	dma_unmap_single(mhi_cntrl->dev, phys, size, DMA_TO_DEVICE);

	dma_unmap_single(mhi_cntrl->dev, dma_addr, size, DMA_TO_DEVICE);





	return -EIO;

	return -EIO;

}

}