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 v2 08/10] media: imx-jpeg: Clear slot next desc ptr if config error
Date:   Wed,  1 Feb 2023 14:02:30 +0800
Message-Id: <fc13259ec56aef6da1e1158a4327b0b677128590.1675230665.git.ming.qian@nxp.com>
In-Reply-To: <cover.1675230665.git.ming.qian@nxp.com>
References: <cover.1675230665.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?61MDlAlUMhNlXHwGSNOFcJcwlJyM1n2zfoPB/LythPhpY370+pOlRNT3VFzf?=
 =?us-ascii?Q?a6gR7i0Zznr7bkuA8PWyyL40mbdKVIFfF5ydFrMuuKik9N32FqL5zGbRzQSR?=
 =?us-ascii?Q?9ZBQd7V5DkjA2zv4BukALUkJS77WiHw9kd3l4vgDWz+XExAo8Pm4jC+VBlFH?=
 =?us-ascii?Q?k+MpAS4fsTOLASWaSvwBJBJvUDMMc23uNcHw51FQtMzroCPyYywzccFgOYKI?=
 =?us-ascii?Q?fMdioQsDAB+Z1ObWPIVO6zu1BL2ZWZzOaOV6/JbIogMBk2hyyx+QzjoYsucl?=
 =?us-ascii?Q?7s+R8vyHQhMLAAkpdiorxL9oLRwb1xWxHMDlDZpkYOi7iaU3xrQFOwqgOzkO?=
 =?us-ascii?Q?M4sDS61/cY9jjHt5e2bIa7Wewv9RmvvC3pzpvH5MAVAi5wj5Zlr86VGZJGjV?=
 =?us-ascii?Q?CBqsnoxbVsLESJIt5SsmmbFIW53UNLLyuMscPA4rKQm2B3KdTDdFJndz9s9J?=
 =?us-ascii?Q?n71nlWuhw9bhK9YN8YMCfA+DMS1Ra9drj9VSRo2GIxUhPlmyBOy6grPmZnVG?=
 =?us-ascii?Q?9IYBj2VzB/OkPpoeTebc7ybsXDf9P6drU48FZ3ZsU9OgkaqMkYdNTNzMIUx4?=
 =?us-ascii?Q?WGa7IXUm1mUg59qStbaoURxVj1OOzmlkPhsMT2WBES4Cfkx3MetHy5s8lELo?=
 =?us-ascii?Q?3I2Tc6/k/rHP4RKZX55EqonELxC9QdX6NKdYdNl7aLPVsyWLIFlARQOtVMGA?=
 =?us-ascii?Q?ApMtlbB9Av2X+mlrooEDDXRuMgxem17H+w1MiHGjz9HcwQc+RKJTLI3qOkr2?=
 =?us-ascii?Q?Nx4M0VYbG5bfjK0HJHuoIDsaND2CTGVj2VVCuhDeY8IqFdtLJInTTLdqZJzK?=
 =?us-ascii?Q?Xh6lL4iUySqmN3v8uoUQ8jUCCLIGFIT5hx8sK3kI13WcSyguQjqIqBPRrFPt?=
 =?us-ascii?Q?lCIWH0KflQyR7qCbizSdsckK0Kd+VJ0H1q/CkSgPn0yeyQmw+9zD/HM7ghvL?=
 =?us-ascii?Q?cCXjtVv4XfqDsFeUrFYfACkLPqT88SdvzAU12NiVhQrn+CJU45phEKS1MWby?=
 =?us-ascii?Q?mx35mDnaaITVRstuthpNIh6AfMz3udXaQPz0NzKzIye+wBuxFMTi+zCN65bZ?=
 =?us-ascii?Q?cTCx3S9DXCNlyKoMLZSrSR1iTX4pY07nCmpuXDJ120ttfSLL+E6h2VTHD5kw?=
 =?us-ascii?Q?YKAK2TXzP00Nk4vlpTiBx4tTv0m08lxnMYwUMN2gquEKzuiWMCKj+McWghVa?=
 =?us-ascii?Q?B0RNQxT7p4CqPbTuxVcdyE18o5ltUUjMfq5o4UxK9Mq9GY/RmU0Lj58H61Fb?=
 =?us-ascii?Q?qFbNu0l/PXVl7A5TXQaKOBAun2qdQuL2vhkG/feHYGKoPfcaXLfMjK43I1xz?=
 =?us-ascii?Q?bAbOLq1DVh+E11D5xk27BjdhCKHCUIrt2dSAVCoHYA7bncU6MDnB1gAj9YcX?=
 =?us-ascii?Q?JKrQ2PaCzRN5w0F+/cfuCvM1RWyDF6GpUtZWGq3ie/Df1Dvau8i2BWtGUXW6?=
 =?us-ascii?Q?70pA5RbK5YnrDOMRRlBgpro2RcNNELX0HV2x6cQPmtkVaCHyaaBm0XbSIjds?=
 =?us-ascii?Q?IVlBGS7MDzkdSjanFEgasCVsHOXuPmT3bqi02T3gghzJ3c+KAcru1Qgftd85?=
 =?us-ascii?Q?7atRji/ElhYhZ0SrJT/Zx4vQlATQZM5tmdeM/adK?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4a2bbf4f-dbf7-4ce6-cff0-08db041a1640
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 06:03:49.3626
 (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: U+rSYZZnEM0v9c6x4+HKuEFobGtZ3nr1g/vCzFIWGJP2+8kqcga4Q4lB6e/GdvmqJ2s7llneiJgQkdD8pc058g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8429
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