Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, robh+dt@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: amphion: release core lock before reset vpu core
Date:   Tue, 28 Jun 2022 13:19:52 +0800
Message-Id: <20220628051952.26952-1-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?gvnT/OV7KJb4Kn3gvCqVJIXs5CeRYdl/kTW2kx3sgIOTpMnQ7WwehSvJZbeq?=
 =?us-ascii?Q?7RJQh+bJh0VKa/JDs40GbY83OjnhPxKbqrtRe8Rxm2vRLa7lTe6AF/bHs6+c?=
 =?us-ascii?Q?h5OilpfDmH4ggfvsi+fNyAyst3y65Mw6y85op6BdEN3g9rQAThy61MQ9jiqc?=
 =?us-ascii?Q?wRF1vz7G+HiWtlPEAfbzBxhn1N5AZ+hn5JgbdnRkzLD8uUA6I86MdmP9+hPh?=
 =?us-ascii?Q?83pqCOq2HlfkzjsMlDrxp1KSjfoiPfv+mxk6dOdl+hRMNdOoB3qTzo42+a/b?=
 =?us-ascii?Q?riORD0rd4tWICTjkGcLbwF5vb5/qhlb/LNgubFJsVZB26WWLo5SbOSEwWhz6?=
 =?us-ascii?Q?8yr+UWYESck0/NwSUHdMevao+TmV7C62un8u0jv1foqwxHRf6lPovrC2XdzA?=
 =?us-ascii?Q?UUWOJoI1HcdvXbGj3rfYuuy2co8hhl3Sy+KvSqaw8XbH64dioQpGNa8jT2N4?=
 =?us-ascii?Q?Jgw3oaFvWc0I1So1qJBjU+yg9R8YzWTKNbhsTTf50NCsqASM8K9zMxfAsJkd?=
 =?us-ascii?Q?DVSVTBdSbO80kto6MYlKdQ7zrnL4atsFo/fVB3hsU7lPMVyEzmtG4+lXs0AY?=
 =?us-ascii?Q?2rvfwq+9JitS6/lRyXYndkCtWuwgDt3psD9LvjieWw+G3r7yogrZsQ8iApFp?=
 =?us-ascii?Q?GhWgNVkZ6dHxO18Al5xgJpuOqT5MagnVJLnV13WfbsonUizFgLST1a7Lu7S2?=
 =?us-ascii?Q?Iv0RnqHX05omomYHdZj/7NjwV1suCxs01W58MElhCSefJ5jtthN4gwiQ+2ox?=
 =?us-ascii?Q?zcSrjuuWw7uH++TYwc04mPAwAzkNkKAoueRbWBco+VtJojl21BUHmEAxFRJE?=
 =?us-ascii?Q?jRNJX1ctxvmaNWLl3fetoWv5Jmke8q3GkTEKw3PA7EvEtArKgEMwpEBQkp56?=
 =?us-ascii?Q?wAIOiz8bbI4IN2OlfT60Ckag3qrgSpCrC2++2IhglHCBXX3qjv5+o5LBy3rB?=
 =?us-ascii?Q?OD2bWKM8/E/8sEvXZiZS65Tnh52E5Hjz7QWozJHhVrZX1xoR16q26xckFlEb?=
 =?us-ascii?Q?ZB0cegnxTX/dz3uTm6EuS503j6qDEaJeSuxBeHM2ueYiSI3ISUX9K7eJoDOd?=
 =?us-ascii?Q?2lOHkreGQabLODTkRW4naAtXRKC+2gWGcmZgIeShFscFyD+yOwIk87Ip5oUK?=
 =?us-ascii?Q?itQozGeQdjIzuw7fHKWSVwWmNwAMUbjEsp04MmSdyIs2Xy7OnllokMEgW9NS?=
 =?us-ascii?Q?o2wm7abD+els5S7GvMrvd5JmE8T/yVIVimx6nnJvflybpyIC+gQaAu8Atkx5?=
 =?us-ascii?Q?lsyW05JyhKbitJh+RWN/511FxR+oj1q1KUGFfS69UNV9LdCVlcNo2ws0lU0c?=
 =?us-ascii?Q?0YEYAFDx7IR5OCZIPD/0yF66sCNJJ+FFggumxgflliiVSA7QQuCDdKp/LQ+l?=
 =?us-ascii?Q?fEmXEpWMUaSvl/mqzgobzZJlsmxOsCzmhf8FUjO/ZFwSd3eJV1P0EDs91uYD?=
 =?us-ascii?Q?Vbe5Ssq+msJCEpXkqsSmgLCPH5uFUN84W4lpi7ChX8ueRZ2ajl3InJL9yNMl?=
 =?us-ascii?Q?eaHbOfRi5wcHNDUDz2FI71awX5jtrfus6cJsxTLGDOnB596jb7YvFt2RYPlF?=
 =?us-ascii?Q?umtTkMwiC1BK+Wu5VVJFnTss/3Hhswg/Ayp9ClcH?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9abe7dc9-c75f-4bd8-862f-08da58c5ddc4
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 05:20:08.1760
 (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: xcZaa8GlFlUOru+QV8r4biM5TDOVy8FpqatTg1tFRoub6y9+QVCfjzu3Fb6/W2ow5X7usV/iQP2g5uiNr5riOQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5168
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In reset vpu core, driver will wait for a response event,
but if there are still some events unhandled,
they will be handled first, driver may acquire core lock for that.
So if we do reset in core lock, it may led to reset timeout.

Fixes: 9f599f351e86a ("media: amphion: add vpu core driver")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vpu_core.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c
index 3cca7ae2355d..73faa50d2865 100644
--- a/drivers/media/platform/amphion/vpu_core.c
+++ b/drivers/media/platform/amphion/vpu_core.c
@@ -452,8 +452,13 @@ int vpu_inst_unregister(struct vpu_inst *inst)
 	}
 	vpu_core_check_hang(core);
 	if (core->state == VPU_CORE_HANG && !core->instance_mask) {
+		int err;
+
 		dev_info(core->dev, "reset hang core\n");
-		if (!vpu_core_sw_reset(core)) {
+		mutex_unlock(&core->lock);
+		err = vpu_core_sw_reset(core);
+		mutex_lock(&core->lock);
+		if (!err) {
 			core->state = VPU_CORE_ACTIVE;
 			core->hang_mask = 0;
 		}
-- 
2.36.1