evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spcom: fix modify ion addr

Browse source 
It is expected that the 64 bit ion buffer address,
will be located on the request/response buffer at an offset
that is 64 bit aligned.
However, the user may pack the request/response on his own risk,
and the offset might not be 64 bit aligned.

Change-Id: I85e7644aa05d8c5249e2d204a61d03b5fb2f9220
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
This commit is contained in:
Amir Samuelov 2016-05-31 10:28:27 +03:00 • committed by Kyle Yan
parent d8b33a2dac
commit f8a4373fea
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/soc/qcom/spcom.c
View file

@ -1372,11 +1372,12 @@ static int modify_ion_addr(void *buf,
size_t len;
int fd;
uint32_t buf_offset;
uint64_t *addr;
char *ptr = (char *)buf;
int ret;
fd = ion_info.fd;
buf_offset = ion_info.buf_offset;
ptr += buf_offset;
if (fd < 0) {
pr_err("invalid fd [%d].\n", fd);
@ -1403,13 +1404,14 @@ static int modify_ion_addr(void *buf,
ion_free(spcom_dev->ion_client, handle);
return -EINVAL;
}
pr_debug("buf_offset [%d].\n", buf_offset);
addr = (uint64_t *) ((char *) buf + buf_offset);
if (buf_offset % sizeof(uint64_t))
pr_debug("offset [%d] is NOT 64-bit aligned.\n", buf_offset);
else
pr_debug("offset [%d] is 64-bit aligned.\n", buf_offset);
/* Replace the user ION Virtual Address with the Physical Address */
pr_debug("ion user vaddr = [0x%lx].\n", (long int) *addr);
*addr = (uint64_t) ion_phys_addr;
pr_debug("ion phys addr = [0x%lx].\n", (long int) *addr);
/* Set the ION Physical Address at the buffer offset */
pr_debug("ion phys addr = [0x%lx].\n", (long int) ion_phys_addr);
memcpy(ptr, &ion_phys_addr, sizeof(uint64_t));
/* Release the ION handle */
ion_free(spcom_dev->ion_client, handle);