openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mic: vop: copy data to kernel space then write to io memory 

Read and write io memory should address align on ARCH ARM. Change to use
memcpy_toio to avoid kernel panic caused by the address un-align issue.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Link: https://lore.kernel.org/r/20200929091106.24624-5-sherry.sun@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sherry Sun 2020-09-29 17:11:06 +08:00 committed by Greg Kroah-Hartman
parent cc1a267986
commit 675f0ad404
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/misc/mic/vop/vop_vringh.c
View File

@ -602,6 +602,7 @@ static int vop_virtio_copy_from_user(struct vop_vdev *vdev, void __user *ubuf,
size_t partlen; size_t partlen;
bool dma = VOP_USE_DMA && vi->dma_ch; bool dma = VOP_USE_DMA && vi->dma_ch;
int err = 0; int err = 0;
size_t offset = 0;
if (dma) { if (dma) {
dma_alignment = 1 << vi->dma_ch->device->copy_align; dma_alignment = 1 << vi->dma_ch->device->copy_align;
@ -655,13 +656,20 @@ static int vop_virtio_copy_from_user(struct vop_vdev *vdev, void __user *ubuf,
* We are copying to IO below and should ideally use something * We are copying to IO below and should ideally use something
* like copy_from_user_toio(..) if it existed. * like copy_from_user_toio(..) if it existed.
*/ */
if (copy_from_user((void __force *)dbuf, ubuf, len)) { while (len) {
err = -EFAULT; partlen = min_t(size_t, len, VOP_INT_DMA_BUF_SIZE);
dev_err(vop_dev(vdev), "%s %d err %d\n",
__func__, __LINE__, err); if (copy_from_user(vvr->buf, ubuf + offset, partlen)) {
goto err; err = -EFAULT;
dev_err(vop_dev(vdev), "%s %d err %d\n",
__func__, __LINE__, err);
goto err;
}
memcpy_toio(dbuf + offset, vvr->buf, partlen);
offset += partlen;
vdev->out_bytes += partlen;
len -= partlen;
} }
vdev->out_bytes += len;
err = 0; err = 0;
err: err:
vpdev->hw_ops->unmap(vpdev, dbuf); vpdev->hw_ops->unmap(vpdev, dbuf);