From patchwork Wed Aug 9 13:28:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9890653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F298760384 for ; Wed, 9 Aug 2017 13:29:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEF3227FA9 for ; Wed, 9 Aug 2017 13:29:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E205628111; Wed, 9 Aug 2017 13:29:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FF5527FA9 for ; Wed, 9 Aug 2017 13:29:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314AbdHIN3B (ORCPT ); Wed, 9 Aug 2017 09:29:01 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:38400 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752499AbdHIN3A (ORCPT ); Wed, 9 Aug 2017 09:29:00 -0400 Received: by mail-lf0-f50.google.com with SMTP id y15so27878082lfd.5 for ; Wed, 09 Aug 2017 06:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=F3JnYvi9oTiTlu3ZcgARhVGlD2nGeE5aMqx1AqSMwjI=; b=VS3+xInCz9FDHcFoRpeZ93MNlT29RVxIYCxeYcrmxHNgnvob4zf4TPjBna+ndaWfg3 ZhbafUjZE1VL0nsE6u0diFYgQGn1tu6sx0KgAZ5PCKdEbKDnZp8JtY+GA4PHls2NaOAG +WyJ3rIOn0983yo0p5ohvvhRxFAPfPrd+zWG4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=F3JnYvi9oTiTlu3ZcgARhVGlD2nGeE5aMqx1AqSMwjI=; b=XSkBmP46xxw62fJ+qBDOpL3nDmEc+5EY88Yc2OQOFCp8BuqH8xF38HGU3H4KNYEIR0 bOgNWDTpqqUmrkO+h7nS+Au8IowxH6oxviaK+JoECCPITtg85ZHyirna9/ITOObPXmb+ df/2kR8kwWVbQ9g44TNJVMoGw/1bG0yzGIwemtADyEJzZsUiKtv7+g+qX1ofWkvINs0X nlRZGkf/HH647BAc3twj7YzaHxi2+/RC+BwGVkjfg41X/LyNhp9FCa9SfCFKiPq671yn i9VAwQ+TERFyFCcfv1MDF4X4nx5rHbIcpcs8IzD4kkrvHcQcaHabHjR+DWj/0jn4fZy+ BLcQ== X-Gm-Message-State: AHYfb5jDSgkSI+JF0jtC9bMHP3O4rO1KM41OG2E7q19Qsusl/7CHpkgo +s2OVp3PYUomrhEL X-Received: by 10.25.81.141 with SMTP id g13mr739070lfl.52.1502285338775; Wed, 09 Aug 2017 06:28:58 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id s27sm654282ljd.67.2017.08.09.06.28.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Aug 2017 06:28:58 -0700 (PDT) From: Ulf Hansson To: Wolfram Sang , "Rafael J . Wysocki" , linux-i2c@vger.kernel.org Cc: Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Jisheng Zhang , John Stultz , Guodong Xu , Sumit Semwal , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, Ulf Hansson , "# v4 . 4+" Subject: [PATCH] i2c: designware: Fix system suspend Date: Wed, 9 Aug 2017 15:28:22 +0200 Message-Id: <1502285302-21552-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The commit 8503ff166504 ("i2c: designware: Avoid unnecessary resuming during system suspend"), may suggest to the PM core to try out the so called direct_complete path for system sleep. In this path, the PM core treats a runtime suspended device as it's already in a proper low power state for system sleep, which makes it skip calling the system sleep callbacks for the device, except for the ->prepare() and the ->complete() callbacks. However, the PM core may unset the direct_complete flag for a parent device, in case its child device are being system suspended before. In this scenario, the PM core invokes the system sleep callbacks, no matter if the device is runtime suspended or not. Particularly in cases of an existing i2c slave device, the above path is triggered, which breaks the assumption that the i2c device is always runtime resumed whenever the dw_i2c_plat_suspend() is being called. More precisely, dw_i2c_plat_suspend() calls clk_core_disable() and clk_core_unprepare(), for an already disabled/unprepared clock, leading to a splat in the log about clocks calls being wrongly balanced and breaking system sleep. To still allow the direct_complete path in cases when it's possible, but also to keep the fix simple, let's runtime resume the i2c device in the ->suspend() callback, before continuing to put the device into low power state. Note, in cases when the i2c device is attached to the ACPI PM domain, this problem doesn't occur, because ACPI's ->suspend() callback, assigned to acpi_subsys_suspend(), already calls pm_runtime_resume() for the device. It should also be noted that this change does not fix commit 8503ff166504 ("i2c: designware: Avoid unnecessary resuming during system suspend"). Because for the non-ACPI case, the system sleep support was already broken prior that point. Cc: # v4.4+ Signed-off-by: Ulf Hansson Tested-by: John Stultz Tested-by: Jarkko Nikula Acked-by: Jarkko Nikula Reviewed-by: Mika Westerberg --- I decided to post this as a separate change, instead of as earlier folding it in the series that extends the ACPI PM domain to cope with the runtime PM centric path for system sleep. This change applies on a fresh v4.4+. If someone wants it's applied for earlier version, please send a backport yourself. It's based on 4.13 rc4 and I assume it should go as a fix via the i2c tree. Changes in v2: - Updated changelog. - Runtime resume the device in ->suspend() instead of in ->prepare(). --- drivers/i2c/busses/i2c-designware-platdrv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 2ea6d0d..bb3b8c8 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -426,7 +426,7 @@ static void dw_i2c_plat_complete(struct device *dev) #endif #ifdef CONFIG_PM -static int dw_i2c_plat_suspend(struct device *dev) +static int dw_i2c_plat_runtime_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); @@ -448,11 +448,21 @@ static int dw_i2c_plat_resume(struct device *dev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int dw_i2c_plat_suspend(struct device *dev) +{ + pm_runtime_resume(dev); + return dw_i2c_plat_runtime_suspend(dev); +} +#endif + static const struct dev_pm_ops dw_i2c_dev_pm_ops = { .prepare = dw_i2c_plat_prepare, .complete = dw_i2c_plat_complete, SET_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume) - SET_RUNTIME_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume, NULL) + SET_RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, + dw_i2c_plat_resume, + NULL) }; #define DW_I2C_DEV_PMOPS (&dw_i2c_dev_pm_ops)