Commit b8d43803 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: don't assume SMEM is page-aligned 



In ipa_smem_init(), a Qualcomm SMEM region is allocated (if needed)
and then its virtual address is fetched using qcom_smem_get().  The
physical address associated with that region is also fetched.

The physical address is adjusted so that it is page-aligned, and an
attempt is made to update the size of the region to compensate for
any non-zero adjustment.

But that adjustment isn't done properly.  The physical address is
aligned twice, and as a result the size is never actually adjusted.

Fix this by *not* aligning the "addr" local variable, and instead
making the "phys" local variable be the adjusted "addr" value.

Fixes: a0036bb4 ("net: ipa: define SMEM memory region for IPA")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/20220818134206.567618-1-elder@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5fbb08eb

drivers/net/ipa/ipa_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ static int ipa_smem_init(struct ipa *ipa, u32 item, size_t size) 
	}



	/* Align the address down and the size up to a page boundary */

	addr = qcom_smem_virt_to_phys(virt) & PAGE_MASK;

	addr = qcom_smem_virt_to_phys(virt);

	phys = addr & PAGE_MASK;

	size = PAGE_ALIGN(size + addr - phys);

	iova = phys;	/* We just want a direct mapping */