From: Pin-yen Lin <treapking@chromium.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Tiffany Lin <tiffany.lin@mediatek.com>,
linux-mediatek@lists.infradead.org,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Minghsiu Tsai <minghsiu.tsai@mediatek.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Houlong Wei <houlong.wei@mediatek.com>,
Yunfei Dong <yunfei.dong@mediatek.com>,
linux-media@vger.kernel.org, Hsin-Yi Wang <hsinyi@chromium.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Alexandre Courbot <acourbot@chromium.org>,
Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Pin-yen Lin <treapking@chromium.org>
Subject: [PATCH v6] media: mtk-vpu: Ensure alignment of 8 for DTCM buffer
Date: Fri, 26 May 2023 14:31:39 +0800 [thread overview]
Message-ID: <20230526063149.1801196-1-treapking@chromium.org> (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 is because in ARM64, memcpy_toio does byte-size access
when the length is not a multiple of 8 while access to the
vpu iomem must be 4 aligned.
This patch ensures the copy of a multiple 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: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: Pin-yen Lin <treapking@chromium.org>
Reviewed-by: Houlong Wei <houlong.wei@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
This is a re-send of v5 because it was marked obsolete, but this patch
is required for MT8173 platforms.
Changes in v6:
- Collect review tag
drivers/media/platform/mediatek/vpu/mtk_vpu.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mediatek/vpu/mtk_vpu.c b/drivers/media/platform/mediatek/vpu/mtk_vpu.c
index 5e2bc286f168..19ff4afea456 100644
--- a/drivers/media/platform/mediatek/vpu/mtk_vpu.c
+++ b/drivers/media/platform/mediatek/vpu/mtk_vpu.c
@@ -349,7 +349,22 @@ int vpu_ipi_send(struct platform_device *pdev,
}
} while (vpu_cfg_readl(vpu, HOST_TO_VPU));
- memcpy_toio(send_obj->share_buf, buf, len);
+ /*
+ * On Arm64, the memcpy_toio does byte-size access as long as address or length are
+ * not 8 aligned. Access to the vpu iomem must be 4 aligned. Byte-size access is
+ * not allowed and cause processing to fail. Therefore make sure the length
+ * sent to memcpy_toio is a multiply of 8.
+ */
+ if (len % 8 != 0) {
+ unsigned char data[sizeof(send_obj->share_buf)];
+
+ memset(data + len, 0, sizeof(data) - len);
+ memcpy(data, buf, len);
+ memcpy_toio(send_obj->share_buf, data, round_up(len, 8));
+ } else {
+ memcpy_toio(send_obj->share_buf, buf, len);
+ }
+
writel(len, &send_obj->len);
writel(id, &send_obj->id);
--
2.41.0.rc0.172.g3f132b7071-goog
next reply other threads:[~2023-05-26 6:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 6:31 Pin-yen Lin [this message]
2023-05-29 8:31 ` AngeloGioacchino Del Regno
2023-05-30 8:16 ` Pin-yen Lin
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=20230526063149.1801196-1-treapking@chromium.org \
--to=treapking@chromium.org \
--cc=acourbot@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=houlong.wei@mediatek.com \
--cc=hsinyi@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--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=tiffany.lin@mediatek.com \
--cc=yunfei.dong@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
all inboxes | Powered by JetHome®