From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, mirela.rabulea@oss.nxp.com,
        hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, xiahong.bao@nxp.com, linux-imx@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 08/10] media: imx-jpeg: Clear slot next desc ptr if config error
Date:   Tue, 14 Feb 2023 18:04:50 +0800
Message-Id: <4cd90d5670b4df5708abccacf210930eb0f44ede.1676368610.git.ming.qian@nxp.com>
In-Reply-To: <cover.1676368610.git.ming.qian@nxp.com>
References: <cover.1676368610.git.ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8NpHm8zpXrHu6qaCTaXBHj0F3wG8XN3Mpk+xlLNlBhLfKwrvp62PrSXikn4T?=
 =?us-ascii?Q?uFiVfKkesW7clOzYe1bls2ZA8SF/N/hRhiGGj6Jb8WmJcP5XKwGRtb5uuHrS?=
 =?us-ascii?Q?f8LY8bAcQPdAUh1pm460tNjBNRt1yLoma2KXwRyLQn1aT8tU1ZOxRCM/dLc1?=
 =?us-ascii?Q?ANApkTf4+Sw6DZGyXf8s4A480y5cM8n1Ypyyo6MMCYxv22TuBeBQPThf1h4k?=
 =?us-ascii?Q?NaS8uesGg9eZ6bzqa4rFL/fjOrQ86zfTUt5ax1wov7sgWZHZz2vxGFum/sia?=
 =?us-ascii?Q?8MeshNH8GX/VXGjP3TUdlaEQOYz35A3U1SiOVCZuVPvrjXnl4Z07qAxdEOEl?=
 =?us-ascii?Q?ab5GJaSVqd7WV8mlktw/lJ8bwUu9fK9ikB8faC2tSSakEKXnrb8mCsPQdD1R?=
 =?us-ascii?Q?5IGvwTwOevykQ/detSyzF1FIrVTd7iAdPovVIAgh+gtwnsYjNDREcl124sIm?=
 =?us-ascii?Q?7Ny/GCtQ/R+Ya4S09xN+FabFTlgPREx7ih7DxBM7xS0BrxGtZuKvJeqc8w1b?=
 =?us-ascii?Q?K4aICXpXyrVY1D/65A85B8gaTcXl4njtMJj3ERieVYSQcECUST633QoppppV?=
 =?us-ascii?Q?Z3KOVBjcq0z/yI+soxDhZ1gbuDjPavMm0lga97ZsiwBReNDWTPUYUgl5rfli?=
 =?us-ascii?Q?Tns85RdwTfJ+bpLkOscXNinXXilJK7B6ga4ZLhU+Cl6iNgy7SbuQzd8+l5eV?=
 =?us-ascii?Q?VKnmJlVuLtnNgNDw8UyVhWS3jDvi+mxJqj8vdDbJky1Yo/FCzK0GgyWUQvV6?=
 =?us-ascii?Q?6FlmedcNpH0hOt6Ny4VU2Zx0a0mooL7HjP3A0fl0Mkky3QQCRlxy7vBN5eiT?=
 =?us-ascii?Q?nOloZP4N+8PNGZSEbmCqwbenrfrntzJmqDZm8A3Kc9w/ffwgxb1iRiAegWBL?=
 =?us-ascii?Q?tBW/xJ3jAYUOsSvy4cs/9/7M3pDJ2593ChvhqAKrcF79M89PdrAQLV1+pGoG?=
 =?us-ascii?Q?L7STUv/jkzWC69Y9yvs7ccKdSaZv+9HSrTBILy1Dpy9zokYwMAN+omtF8Bp2?=
 =?us-ascii?Q?1+UJ3Vkdg781pG0UT17Kyv/Uxs4OaoeB8BXM78IVMUUlrOKQsfvxecFI0UQI?=
 =?us-ascii?Q?cbVQzRwftyUjDmjIHCOVYw4wuTYdVnMqB/w7BNA6Zzv1+hqSABn/hh1qSVLt?=
 =?us-ascii?Q?A86bkbDuZilhKp1IxpHYhzF5m6+/TRZgLf4Cg2UBluy8aAGVLN6QoLT/q+nB?=
 =?us-ascii?Q?UTnRgMxrt3oRvjPzeX2Nn53lp9/NjohIL9Bh9phZtVjxnj9H75VWm1UxyP80?=
 =?us-ascii?Q?N1FJzBwonQrR60mXWGyLyyGPKbTqENbhvqkBidrdGpcpqm3XrCZOj8AxR90N?=
 =?us-ascii?Q?Ci51OoCjQqarvFUlQuY5b2D8iI8zd2GmQCXhoi2/yvr9tAJYo0xsjBUNP+TI?=
 =?us-ascii?Q?knwhUALJKI4cQTdLRl3tOLEiUkrpYeebOYhzhRvTJFKkcgcUb5ASKT1Bp78Z?=
 =?us-ascii?Q?E8s105PPDPXZW1WFU/RPUGssPSQ27vadXjl1s5uCp8PA4aowIyzFaShltN4J?=
 =?us-ascii?Q?kHpdSb2KhAO46Gjf/Gzw+YmWYLzDlhyANK+PEE0sUFLB8zKahtzHdeKoO7qq?=
 =?us-ascii?Q?QnDfkxrjlL3GycMNSRH1xHS/ZDSTyOPTtvWAwex6?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 91803d5b-eda1-40bb-ab3c-08db0e731be5
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 10:06:15.7152
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 76L/lHmsc29i3VpYuIEIlB6UkvRNQq8KS/X0pcZ/kucvVw//YvKXxYuTwjpt+Bbp0Eh6BUbNaTJxIJhHm4iH+g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6800
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

clear slot next desc ptr if config error,
otherwise codec will report config error interrupt repeatedly,
it may led to system hang.

Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c | 5 +++++
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 1 +
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
index ef28122a5ed4..bbd5d6a9fc86 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
@@ -178,3 +178,8 @@ void mxc_jpeg_set_desc(u32 desc, void __iomem *reg, int slot)
 	writel(desc | MXC_NXT_DESCPT_EN,
 	       reg + MXC_SLOT_OFFSET(slot, SLOT_NXT_DESCPT_PTR));
 }
+
+void mxc_jpeg_clr_desc(void __iomem *reg, int slot)
+{
+	writel(0, reg + MXC_SLOT_OFFSET(slot, SLOT_NXT_DESCPT_PTR));
+}
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
index ecf3b6562ba2..8b7cd6526efd 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
@@ -137,6 +137,7 @@ void mxc_jpeg_set_bufsize(struct mxc_jpeg_desc *desc,  u32 bufsize);
 void mxc_jpeg_set_res(struct mxc_jpeg_desc *desc, u16 w, u16 h);
 void mxc_jpeg_set_line_pitch(struct mxc_jpeg_desc *desc, u32 line_pitch);
 void mxc_jpeg_set_desc(u32 desc, void __iomem *reg, int slot);
+void mxc_jpeg_clr_desc(void __iomem *reg, int slot);
 void mxc_jpeg_set_regs_from_desc(struct mxc_jpeg_desc *desc,
 				 void __iomem *reg);
 #endif
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 70b6eea733e7..3f1c9bc4b144 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -692,6 +692,7 @@ static irqreturn_t mxc_jpeg_dec_irq(int irq, void *priv)
 		u32 ret = readl(reg + CAST_STATUS12);
 
 		dev_err(dev, "Encoder/decoder error, status=0x%08x", ret);
+		mxc_jpeg_clr_desc(reg, slot);
 		mxc_jpeg_sw_reset(reg);
 		buf_state = VB2_BUF_STATE_ERROR;
 		goto buffers_done;
-- 
2.38.1