From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96E36C43387 for ; Thu, 17 Jan 2019 15:20:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62A45205C9 for ; Thu, 17 Jan 2019 15:20:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="feO9GUBs"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="a56qrrEI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728392AbfAQPUA (ORCPT ); Thu, 17 Jan 2019 10:20:00 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:45626 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725970AbfAQPUA (ORCPT ); Thu, 17 Jan 2019 10:20:00 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5F1CA60854; Thu, 17 Jan 2019 15:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1547738399; bh=yvgmVO8D14MSCmLKPZotqFQq9YZa5LG6cCqcUWPhPP8=; h=From:To:Cc:Subject:Date:From; b=feO9GUBsSZNCkT33qxQk2pd4UCGldzrvVHXyzUxUPgIcWny9zYGImWuvGpgHDV0YX BSIupklbYYH1ZNeDQj5742H/owqxQlXwoYT1uTfZuvNKpGHvwKyANUiiKYwwRQ3OAr GvLkXBZ14DVeQV8NgueWhu0X/chk7wvO/rZaR02E= Received: from blr-ubuntu-253.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: saiprakash.ranjan@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8330460854; Thu, 17 Jan 2019 15:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1547738398; bh=yvgmVO8D14MSCmLKPZotqFQq9YZa5LG6cCqcUWPhPP8=; h=From:To:Cc:Subject:Date:From; b=a56qrrEIMAi1at8jdTawZI+3A8kuUg2oxZ4RMcIswqYcW1OuiNpBp7dngBNXMhxRf rJ5NO6KbYkqfmdgeoTyl8GsienJQt7F/Lm3nlrin7ohrHJKZtsEOlw9AD7iExrmMzB F0fCzMUx5zYVAf/l3rNNj5BcQat6nuy6xNpq60HY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8330460854 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=saiprakash.ranjan@codeaurora.org From: Sai Prakash Ranjan To: Guenter Roeck , Wim Van Sebroeck , linux-watchdog@vger.kernel.org, Guenter Roeck Cc: Rajendra Nayak , Vivek Gautam , Sibi Sankar , Stephen Boyd , Doug Anderson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Sai Prakash Ranjan Subject: [PATCHv2] watchdog: qcom: Add suspend/resume support Date: Thu, 17 Jan 2019 20:49:42 +0530 Message-Id: <20190117151942.6092-1-saiprakash.ranjan@codeaurora.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds the support for qcom watchdog suspend and resume when entering and exiting deep sleep states. Otherwise having watchdog active after suspend would result in unwanted crashes/resets if resume happens after a long time. Signed-off-by: Sai Prakash Ranjan --- v2: * Use __maybe_unused instead of #ifdef as suggested by Brian and Guenter --- drivers/watchdog/qcom-wdt.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c index 780971318810..5dfd604477a4 100644 --- a/drivers/watchdog/qcom-wdt.c +++ b/drivers/watchdog/qcom-wdt.c @@ -245,6 +245,28 @@ static int qcom_wdt_remove(struct platform_device *pdev) return 0; } +static int __maybe_unused qcom_wdt_suspend(struct device *dev) +{ + struct qcom_wdt *wdt = dev_get_drvdata(dev); + + if (watchdog_active(&wdt->wdd)) + qcom_wdt_stop(&wdt->wdd); + + return 0; +} + +static int __maybe_unused qcom_wdt_resume(struct device *dev) +{ + struct qcom_wdt *wdt = dev_get_drvdata(dev); + + if (watchdog_active(&wdt->wdd)) + qcom_wdt_start(&wdt->wdd); + + return 0; +} + +static SIMPLE_DEV_PM_OPS(qcom_wdt_pm_ops, qcom_wdt_suspend, qcom_wdt_resume); + static const struct of_device_id qcom_wdt_of_table[] = { { .compatible = "qcom,kpss-timer", .data = reg_offset_data_apcs_tmr }, { .compatible = "qcom,scss-timer", .data = reg_offset_data_apcs_tmr }, @@ -259,6 +281,7 @@ static struct platform_driver qcom_watchdog_driver = { .driver = { .name = KBUILD_MODNAME, .of_match_table = qcom_wdt_of_table, + .pm = &qcom_wdt_pm_ops, }, }; module_platform_driver(qcom_watchdog_driver); -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation