[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230526063149.1801196-1-treapking@chromium.org>
Date: Fri, 26 May 2023 14:31:39 +0800
From: Pin-yen Lin <treapking@...omium.org>
To: Mauro Carvalho Chehab <mchehab@...nel.org>,
Matthias Brugger <matthias.bgg@...il.com>,
Hans Verkuil <hverkuil-cisco@...all.nl>
Cc: Tiffany Lin <tiffany.lin@...iatek.com>,
linux-mediatek@...ts.infradead.org,
Andrew-CT Chen <andrew-ct.chen@...iatek.com>,
Minghsiu Tsai <minghsiu.tsai@...iatek.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>,
Houlong Wei <houlong.wei@...iatek.com>,
Yunfei Dong <yunfei.dong@...iatek.com>,
linux-media@...r.kernel.org, Hsin-Yi Wang <hsinyi@...omium.org>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Alexandre Courbot <acourbot@...omium.org>,
Dafna Hirschfeld <dafna.hirschfeld@...labora.com>,
Pin-yen Lin <treapking@...omium.org>
Subject: [PATCH v6] media: mtk-vpu: Ensure alignment of 8 for DTCM buffer
From: Alexandre Courbot <acourbot@...omium.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@...omium.org>
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@...labora.com>
Signed-off-by: Pin-yen Lin <treapking@...omium.org>
Reviewed-by: Houlong Wei <houlong.wei@...iatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.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
Powered by blists - more mailing lists