From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>,
Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>,
Eddie James <eajames@linux.ibm.com>,
Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: openbmc@lists.ozlabs.org, linux-clk@vger.kernel.org,
linux-aspeed@lists.ozlabs.org, linux-media@vger.kernel.org
Subject: Re: [PATCH v2 1/1] media: aspeed: fix clock handling logic
Date: Thu, 7 Jan 2021 11:06:01 +0100 [thread overview]
Message-ID: <6cd30b60-87d9-0c92-4721-fdaa429acf3e@xs4all.nl> (raw)
In-Reply-To: <20201221223225.14723-2-jae.hyun.yoo@linux.intel.com>
Hi Stephen,
On 21/12/2020 23:32, Jae Hyun Yoo wrote:
> Video engine uses eclk and vclk for its clock sources and its reset
> control is coupled with eclk so the current clock enabling sequence works
> like below.
>
> Enable eclk
> De-assert Video Engine reset
> 10ms delay
> Enable vclk
>
> It introduces improper reset on the Video Engine hardware and eventually
> the hardware generates unexpected DMA memory transfers that can corrupt
> memory region in random and sporadic patterns. This issue is observed
> very rarely on some specific AST2500 SoCs but it causes a critical
> kernel panic with making a various shape of signature so it's extremely
> hard to debug. Moreover, the issue is observed even when the video
> engine is not actively used because udevd turns on the video engine
> hardware for a short time to make a query in every boot.
>
> To fix this issue, this commit changes the clock handling logic to make
> the reset de-assertion triggered after enabling both eclk and vclk. Also,
> it adds clk_unprepare call for a case when probe fails.
>
> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")
> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
> Reviewed-by: Joel Stanley <joel@jms.id.au>
> Reviewed-by: Eddie James <eajames@linux.ibm.com>
>
> clk: ast2600: fix reset settings for eclk and vclk
>
> Video engine reset setting should be coupled with eclk to match it
> with the setting for previous Aspeed SoCs which is defined in
> clk-aspeed.c since all Aspeed SoCs are sharing a single video engine
> driver. Also, reset bit 6 is defined as 'Video Engine' reset in
> datasheet so it should be de-asserted when eclk is enabled. This
> commit fixes the setting.
>
> Fixes: d3d04f6c330a ("clk: Add support for AST2600 SoC")
> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
> Reviewed-by: Joel Stanley <joel@jms.id.au>
I think it makes sense to merge this via the media subsystem.
Can you Ack this patch?
Thanks!
Hans
> ---
> Changes since v1:
> - Squashed two patches due to dependency.
>
> drivers/clk/clk-ast2600.c | 4 ++--
> drivers/media/platform/aspeed-video.c | 9 ++++++---
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/clk/clk-ast2600.c b/drivers/clk/clk-ast2600.c
> index 177368cac6dd..882da16575d4 100644
> --- a/drivers/clk/clk-ast2600.c
> +++ b/drivers/clk/clk-ast2600.c
> @@ -60,10 +60,10 @@ static void __iomem *scu_g6_base;
> static const struct aspeed_gate_data aspeed_g6_gates[] = {
> /* clk rst name parent flags */
> [ASPEED_CLK_GATE_MCLK] = { 0, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */
> - [ASPEED_CLK_GATE_ECLK] = { 1, -1, "eclk-gate", "eclk", 0 }, /* Video Engine */
> + [ASPEED_CLK_GATE_ECLK] = { 1, 6, "eclk-gate", "eclk", 0 }, /* Video Engine */
> [ASPEED_CLK_GATE_GCLK] = { 2, 7, "gclk-gate", NULL, 0 }, /* 2D engine */
> /* vclk parent - dclk/d1clk/hclk/mclk */
> - [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */
> + [ASPEED_CLK_GATE_VCLK] = { 3, -1, "vclk-gate", NULL, 0 }, /* Video Capture */
> [ASPEED_CLK_GATE_BCLK] = { 4, 8, "bclk-gate", "bclk", 0 }, /* PCIe/PCI */
> /* From dpll */
> [ASPEED_CLK_GATE_DCLK] = { 5, -1, "dclk-gate", NULL, CLK_IS_CRITICAL }, /* DAC */
> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
> index c46a79eace98..db072ff2df70 100644
> --- a/drivers/media/platform/aspeed-video.c
> +++ b/drivers/media/platform/aspeed-video.c
> @@ -514,8 +514,8 @@ static void aspeed_video_off(struct aspeed_video *video)
> aspeed_video_write(video, VE_INTERRUPT_STATUS, 0xffffffff);
>
> /* Turn off the relevant clocks */
> - clk_disable(video->vclk);
> clk_disable(video->eclk);
> + clk_disable(video->vclk);
>
> clear_bit(VIDEO_CLOCKS_ON, &video->flags);
> }
> @@ -526,8 +526,8 @@ static void aspeed_video_on(struct aspeed_video *video)
> return;
>
> /* Turn on the relevant clocks */
> - clk_enable(video->eclk);
> clk_enable(video->vclk);
> + clk_enable(video->eclk);
>
> set_bit(VIDEO_CLOCKS_ON, &video->flags);
> }
> @@ -1719,8 +1719,11 @@ static int aspeed_video_probe(struct platform_device *pdev)
> return rc;
>
> rc = aspeed_video_setup_video(video);
> - if (rc)
> + if (rc) {
> + clk_unprepare(video->vclk);
> + clk_unprepare(video->eclk);
> return rc;
> + }
>
> return 0;
> }
>
next prev parent reply other threads:[~2021-01-07 22:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 22:32 [PATCH v2 0/1] Fix kernel panic issues caused by AST2500 Video Engine Jae Hyun Yoo
2020-12-21 22:32 ` [PATCH v2 1/1] media: aspeed: fix clock handling logic Jae Hyun Yoo
2021-01-07 10:06 ` Hans Verkuil [this message]
2021-02-09 7:36 ` Stephen Boyd
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=6cd30b60-87d9-0c92-4721-fdaa429acf3e@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=andrew@aj.id.au \
--cc=eajames@linux.ibm.com \
--cc=jae.hyun.yoo@linux.intel.com \
--cc=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mturquette@baylibre.com \
--cc=openbmc@lists.ozlabs.org \
--cc=sboyd@kernel.org \
/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).