From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Alexandre Courbot <acourbot@chromium.org>,
Enric Balletbo i Serra <enric.balletbo@collabora.com>,
Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com,
mchehab@kernel.org, tfiga@chromium.org,
minghsiu.tsai@mediatek.com, houlong.wei@mediatek.com,
andrew-ct.chen@mediatek.com, tiffany.lin@mediatek.com,
matthias.bgg@gmail.com, courbot@chromium.org,
hsinyi@chromium.org, eizan@chromium.org
Subject: [PATCH v2] media: mtk-vpu: Ensure alignment of 8 for DTCM buffer
Date: Fri, 6 Aug 2021 10:28:10 +0200 [thread overview]
Message-ID: <20210806082810.9378-1-dafna.hirschfeld@collabora.com> (raw)
From: Alexandre Courbot <acourbot@chromium.org>
When running memcpy_toio:
memcpy_toio(send_obj->share_buf, buf, len);
it was found that errors appear if len is not a multiple of 8:
[58.350841] mtk-mdp 14001000.rdma: processing failed: -22
This patch ensure copy of a multile of 8 size by calling
round_up(len, 8) when copying
Fixes: e6599adfad30 ("media: mtk-vpu: avoid unaligned access to DTCM buffer.")
Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
changes since v1:
1. change sign-off-by tags
2. change values to memset
drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index ec290dde59cf..66276c5a1bc3 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -316,6 +316,7 @@ int vpu_ipi_send(struct platform_device *pdev,
{
struct mtk_vpu *vpu = platform_get_drvdata(pdev);
struct share_obj __iomem *send_obj = vpu->send_buf;
+ unsigned char data[SHARE_BUF_SIZE];
unsigned long timeout;
int ret = 0;
@@ -349,7 +350,9 @@ int vpu_ipi_send(struct platform_device *pdev,
}
} while (vpu_cfg_readl(vpu, HOST_TO_VPU));
- memcpy_toio(send_obj->share_buf, buf, len);
+ memset(data + len, 0, sizeof(data) - len);
+ memcpy(data, buf, len);
+ memcpy_toio(send_obj->share_buf, data, round_up(len, 8));
writel(len, &send_obj->len);
writel(id, &send_obj->id);
--
2.17.1
next reply other threads:[~2021-08-06 8:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 8:28 Dafna Hirschfeld [this message]
2021-08-16 6:38 ` [PATCH v2] media: mtk-vpu: Ensure alignment of 8 for DTCM buffer houlong wei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210806082810.9378-1-dafna.hirschfeld@collabora.com \
--to=dafna.hirschfeld@collabora.com \
--cc=acourbot@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=courbot@chromium.org \
--cc=dafna3@gmail.com \
--cc=eizan@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=houlong.wei@mediatek.com \
--cc=hsinyi@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=minghsiu.tsai@mediatek.com \
--cc=tfiga@chromium.org \
--cc=tiffany.lin@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).