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: support for reloading module
Date:   Tue, 17 May 2022 16:01:16 +0800
Message-Id: <20220517080116.24502-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?IvO57ftuMJXrLrZ8M1Tu4netf2BaoOY2eJ8lSbja977BD29vrx2TZSXFyyma?=
 =?us-ascii?Q?I5j44Jj0uJE+NvX6QPRLbmYouQMmVazSt8fW3Cei96wMAbZ5LO4IhI124ZEd?=
 =?us-ascii?Q?X44w5fH9S0f+nqBKnpBgPRPE5e1mH3HC2bZ36Rsw/V1SwPfAftv7TjcypCS4?=
 =?us-ascii?Q?/cv1o323rhbPlusvRF1BTlJYg1rcnthU2XprDpYb3b+6ZPjAq9kfIzeAKE6I?=
 =?us-ascii?Q?GvX7US2LP+29BvQN+/E0vIsYS2SbfQkscFVU4toPArm12F35IiEpwD8Etp78?=
 =?us-ascii?Q?0Ml/ldwIMVf/hQwHGPnLx+CxMFzlwsBXr+JKOvMK0TFZ8wQ0YQ0e7BsgKOpE?=
 =?us-ascii?Q?blWYg9mj+RRZE20rPRzpIBFurkX099zli/ZmfGf81aA3stnvntanOVq8Acl/?=
 =?us-ascii?Q?0a8KJPfxiZOuSsV55oquGf4QFYem6Aa7HEaSvzwSMv5HiuAGbrn4Emqb2rO6?=
 =?us-ascii?Q?jFVC40ktyft2nimt7JghDlYJLFt0H5g2exRzC7tVLNHEY8fD0sNQmQCMnJod?=
 =?us-ascii?Q?kSouyR4Rpjd7r6R81lUbnDwzWSKdB+3IZ3ZsSZhWsm6UqjTdfhDqfSwkLius?=
 =?us-ascii?Q?bNdzg0KqPigGYLrf3yanv9iPV8j8BxF7x73GQP1nbltKkRi4MCz1LU8pMQGG?=
 =?us-ascii?Q?vbKVrayBOLjMNcv9dGCOddesyHdWx4NGZ6lYotgyndB4KSfWGwDfO1c/6fb2?=
 =?us-ascii?Q?repeU+yrfNdmYVMZBCmUmVXfbEOBCWSSJjlqVzLbGrnYQZfFPHBL4pCrDxVj?=
 =?us-ascii?Q?PkFBT+FAUfpdqo7y0b4CKUfvzBrsJATH+nQHJYD7Lo64HyGTf3cY7euszzeM?=
 =?us-ascii?Q?/UvippK4WxH/oBfutl8W4aWZWyglsAOcTraIfDqzePHyQlJAnX6ByUdx0d0w?=
 =?us-ascii?Q?DNdKYYnV7y8/FMeqGBKlHZGUMYxBlgcEevG3wG6StjmFY0fBIQTlYmA3vvBS?=
 =?us-ascii?Q?9xjq7XzG60qCW36fgCDFuj2xqiZpAB8rh+1A+jmtKOkdca/raon6nZFU452O?=
 =?us-ascii?Q?+eVkjh9ZbG8GTkaxZe1QhBGVsnIpUUq8Daqy8K3rkwPYUokwLLVkIvlvcMPe?=
 =?us-ascii?Q?/ARwPv0yGhKpeZe9SNSYPFiSQ7OX/2OW1XsJ2xPLmNwNVbd8pWH5If5XP+FN?=
 =?us-ascii?Q?t7e9IwPK2aV0L+cKdUH7ePYxSLdm/nGzhUgDN6XcMEJWmjr2uR+F8CvYONBM?=
 =?us-ascii?Q?0C35kpameMA6CsO3dwsv5/Qxqap4LhRp7+/qdGPOy8aKqBabrgueX7xD21rz?=
 =?us-ascii?Q?fngQl7+FazGo/5yIxuHmwg/9TWAuzxmSSMxLMXCsoZ6Jw+/jxKOwdHp98TEF?=
 =?us-ascii?Q?KpF8irP7D131zQr38RPBrx/5b/7ScT8psuycE1UFBwA+QmN/QEOciOlkNqIo?=
 =?us-ascii?Q?dT0OC8YAZLewTMCgA8NXh6J3oA76pQ05mpU1Ujj0sr/5kSK/ibdIpxWzuXQy?=
 =?us-ascii?Q?ArSgJlFKjHx0svE6PoQmgrdTOn7aB7B8J/PHDOdq+fkkgmsiZmwzWROVABq/?=
 =?us-ascii?Q?ExEernF+N2eQwW2nhU9jkE0xyueLqXYuDjpmjst9EL2/EQ8ChEurSjU1F6Rk?=
 =?us-ascii?Q?vbof6g+F9FhDu9WzosZqEIgM9tWDLZGNRKEFEjcE3G4or0mfmqnudtYLXoCP?=
 =?us-ascii?Q?k8wuLLw4uDCKTd+uQocvlhM60572UjK5c3N0x/1byFifAplXSIvA0YkJ3VMb?=
 =?us-ascii?Q?gqUxU0tHQgJaZNy7rEl26EQ7UthuxTXJsvm3bOM8f6gbjsE1Xy4XwmSLMTWs?=
 =?us-ascii?Q?cKkqS7jiVQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd57076e-5a4f-44d0-cf56-08da37db742f
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 08:01:31.6595
 (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: QOwDkhhMZWOfGTQcfsW4bmh69kRKbdRFIchIsxJ1kDNWtotpAzNSJuBJZ8bl4wiwA5xkhIwWTIyr1pzsc5niYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5924
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

As there is no interface to power off vpu core.
So it need to boot from cold on first load.
but on the second load, driver need to restore the status
instead of booting.

Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vpu_core.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c
index 68ad183925fd..3cca7ae2355d 100644
--- a/drivers/media/platform/amphion/vpu_core.c
+++ b/drivers/media/platform/amphion/vpu_core.c
@@ -257,14 +257,8 @@ static int vpu_core_register(struct device *dev, struct vpu_core *core)
 	}
 
 	list_add_tail(&core->list, &vpu->cores);
-
 	vpu_core_get_vpu(core);
 
-	if (vpu_iface_get_power_state(core))
-		ret = vpu_core_restore(core);
-	if (ret)
-		goto error;
-
 	return 0;
 error:
 	if (core->msg_buffer) {
@@ -362,7 +356,10 @@ struct vpu_core *vpu_request_core(struct vpu_dev *vpu, enum vpu_core_type type)
 	pm_runtime_resume_and_get(core->dev);
 
 	if (core->state == VPU_CORE_DEINIT) {
-		ret = vpu_core_boot(core, true);
+		if (vpu_iface_get_power_state(core))
+			ret = vpu_core_restore(core);
+		else
+			ret = vpu_core_boot(core, true);
 		if (ret) {
 			pm_runtime_put_sync(core->dev);
 			mutex_unlock(&core->lock);
-- 
2.36.1