Jammy Huang (2): media: aspeed: Fix no complete irq for non-64-aligned width media: aspeed: Fix memory overwrite if timing is 1600x900
drivers/media/platform/aspeed-video.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
From: Jammy Huang jammy_huang@aspeedtech.com
mainline inclusion from mainline-v5.18-rc1 commit 71ef8053d48fc6aad88cf23a368fa56de5c66f1d category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAPHCN CVE: CVE-2023-52916
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
In ast2500, engine will stop occasionally for 1360x768.
This is a bug which has been addressed, but the workaround is specific for 1680 only. Here we make it more complete.
Signed-off-by: Jammy Huang jammy_huang@aspeedtech.com Reviewed-by: Joel Stanley joel@jms.id.au Signed-off-by: Hans Verkuil hverkuil-cisco@xs4all.nl Signed-off-by: Mauro Carvalho Chehab mchehab@kernel.org Signed-off-by: Ye Bin yebin10@huawei.com --- drivers/media/platform/aspeed-video.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 9d9124308f6a..edc2db31579b 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -867,18 +867,19 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) /* Set capture/compression frame sizes */ aspeed_video_calc_compressed_size(video, size);
- if (video->active_timings.width == 1680) { + if (!IS_ALIGNED(act->width, 64)) { /* - * This is a workaround to fix a silicon bug on A1 and A2 - * revisions. Since it doesn't break capturing operation of + * This is a workaround to fix a AST2500 silicon bug on A1 and + * A2 revisions. Since it doesn't break capturing operation of * other revisions, use it for all revisions without checking - * the revision ID. It picked 1728 which is a very next - * 64-pixels aligned value to 1680 to minimize memory bandwidth + * the revision ID. It picked new width which is a very next + * 64-pixels aligned value to minimize memory bandwidth * and to get better access speed from video engine. */ - aspeed_video_write(video, VE_CAP_WINDOW, - 1728 << 16 | act->height); - size += (1728 - 1680) * video->active_timings.height; + u32 width = ALIGN(act->width, 64); + + aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height); + size = width * act->height; } else { aspeed_video_write(video, VE_CAP_WINDOW, act->width << 16 | act->height);
From: Jammy Huang jammy_huang@aspeedtech.com
mainline inclusion from mainline-v6.6-rc1 commit c281355068bc258fd619c5aefd978595bede7bfe category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAPHCN CVE: CVE-2023-52916
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
When capturing 1600x900, system could crash when system memory usage is tight.
The way to reproduce this issue: 1. Use 1600x900 to display on host 2. Mount ISO through 'Virtual media' on OpenBMC's web 3. Run script as below on host to do sha continuously #!/bin/bash while [ [1] ]; do find /media -type f -printf '"%h/%f"\n' | xargs sha256sum done 4. Open KVM on OpenBMC's web
The size of macro block captured is 8x8. Therefore, we should make sure the height of src-buf is 8 aligned to fix this issue.
Signed-off-by: Jammy Huang jammy_huang@aspeedtech.com Signed-off-by: Hans Verkuil hverkuil-cisco@xs4all.nl
Conflicts: drivers/media/platform/aspeed-video.c drivers/media/platform/aspeed/aspeed-video.c [As aspeed-video.c moved to aspeed directory]
Signed-off-by: Ye Bin yebin10@huawei.com --- drivers/media/platform/aspeed-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index edc2db31579b..372f8bdef005 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -862,7 +862,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) static void aspeed_video_set_resolution(struct aspeed_video *video) { struct v4l2_bt_timings *act = &video->active_timings; - unsigned int size = act->width * act->height; + unsigned int size = act->width * ALIGN(act->height, 8);
/* Set capture/compression frame sizes */ aspeed_video_calc_compressed_size(video, size); @@ -879,7 +879,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) u32 width = ALIGN(act->width, 64);
aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height); - size = width * act->height; + size = width * ALIGN(act->height, 8); } else { aspeed_video_write(video, VE_CAP_WINDOW, act->width << 16 | act->height);
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/11477 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C...
FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/11477 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C...
-
patchwork bot -
Ye Bin