From patchwork Fri Nov 10 10:07:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raghavendra X-Patchwork-Id: 743350 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA488C4332F for ; Fri, 10 Nov 2023 17:57:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235424AbjKJR5M (ORCPT ); Fri, 10 Nov 2023 12:57:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230037AbjKJR4P (ORCPT ); Fri, 10 Nov 2023 12:56:15 -0500 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B36327048; Fri, 10 Nov 2023 02:07:53 -0800 (PST) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3AAA7bnJ112103; Fri, 10 Nov 2023 04:07:37 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1699610857; bh=mxg1FHFd1rRvOC36n+OHwsPn0OmqfcxRKRDGDy9uAcI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=DT+hVshrjO7vdhNxIT15tWkNSdAqW0Duo9P8wf7DC4oVXlFVeWvxcg8bGpUOZEbTG Zjb+W7zqtG5NM5WAKE4iqXMkjL1jFW9y1buOnsrufpsoAd28YDouVEfTyZNRcnczXZ njvC/676o5TyQUiT7WVWDcqXMVL50ybbZvjty4BI= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3AAA7bKu003760 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 10 Nov 2023 04:07:37 -0600 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 10 Nov 2023 04:07:37 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 10 Nov 2023 04:07:37 -0600 Received: from uda0132425.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3AAA7S4r051776; Fri, 10 Nov 2023 04:07:35 -0600 From: Vignesh Raghavendra To: Wim Van Sebroeck , Guenter Roeck CC: Tero Kristo , , , Vignesh Raghavendra , , , Subject: [PATCH 2/2] watchdog: rti_wdt: Drop RPM watchdog when unused Date: Fri, 10 Nov 2023 15:37:26 +0530 Message-ID: <20231110100726.2930218-3-vigneshr@ti.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231110100726.2930218-1-vigneshr@ti.com> References: <20231110100726.2930218-1-vigneshr@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Do a RPM put if watchdog is not already started during probe and re enable it in watchdog start. On K3 SoCs, watchdogs and their corresponding CPUs are under same PD, so if the reference count of unused watchdogs aren't dropped, it will lead to CPU hotplug failures as Device Management firmware won't allow to turn off the PD due to dangling reference count. Fixes: 2d63908bdbfb ("watchdog: Add K3 RTI watchdog support") Signed-off-by: Vignesh Raghavendra --- drivers/watchdog/rti_wdt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index 163bdeb6929a..87f2c333a41d 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -78,6 +78,9 @@ static int rti_wdt_start(struct watchdog_device *wdd) u32 timer_margin; struct rti_wdt_device *wdt = watchdog_get_drvdata(wdd); + if (pm_runtime_suspended(wdd->parent)) + pm_runtime_get_sync(wdd->parent); + /* set timeout period */ timer_margin = (u64)wdd->timeout * wdt->freq; timer_margin >>= WDT_PRELOAD_SHIFT; @@ -337,6 +340,9 @@ static int rti_wdt_probe(struct platform_device *pdev) if (last_ping) watchdog_set_last_hw_keepalive(wdd, last_ping); + if (!watchdog_hw_running(wdd)) + pm_runtime_put_sync(&pdev->dev); + return 0; } @@ -345,6 +351,9 @@ static void rti_wdt_remove(struct platform_device *pdev) struct rti_wdt_device *wdt = platform_get_drvdata(pdev); watchdog_unregister_device(&wdt->wdd); + + if (!pm_runtime_suspended(&pdev->dev)) + pm_runtime_put_sync(&pdev->dev); } static const struct of_device_id rti_wdt_of_match[] = {