From patchwork Thu Jun 13 13:13:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Richard X-Patchwork-Id: 804447 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 204291448E0; Thu, 13 Jun 2024 13:13:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718284421; cv=none; b=PX1EUvDd0byR0JVJ3htPenRlawobYSy5/B7T2wcGIpwCJsmgzUvsZsL23XeZrlwPHLTTfkcDrqc31+y+JnjOPt5moNk7cdHai1NquIEjnK5FhS+Ydskk9dTh2DJi0LJJzigyFj1bCZ1NqJDChICyHqkPddwEHICDBG1SrGcB6qw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718284421; c=relaxed/simple; bh=EYPaH6HcYOZCqyGlWoEHW3wVG4t2hDe+OBWpMsvbE6E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QY2EbnY1lCrZ/ig7zSPgdBJI9fy6WWE207iwSTWbwa8roU8OlRdng0x8zTTMADivrORlSd85vpdCFNHLgEYncDkRrTgyoPDiyDjHpOYuN871HIkIWVYmhvJpbOzTTNdhNJ3CtXzp5Rnus7eUycwJYpzFGZmKAuQRpii3euk6K1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=Z0vsLImH; arc=none smtp.client-ip=217.70.183.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Z0vsLImH" Received: by mail.gandi.net (Postfix) with ESMTPSA id E81202000F; Thu, 13 Jun 2024 13:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1718284417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O3GaXSbxwPm6mJzK7Jl/toxcNOtijxizQmUCJV+spiw=; b=Z0vsLImHpfwbC16x0Azm80oH1pItnoipJeEPTPJln7vXinX/DpQk2/eiKq8lUsnjccLLro kwQoC7emmQaBIeswR6mb6sADKAYSJnvpcfUMoMNbirwPvbLc0cs1z5PIv4HAWPuff94EP2 BNVyuQbwCLrXAzHQM8HLfrul+jt4clFeCeo+ZHWRDhAMdLmSyNK9I5Is4xcWh9yA4lrW3S cowthIa0N1pIYxYd5oG4waCr+Nwx4ffy486V7L1BtaXvUI3oWSgBQge0PhztDTvPHJrJ2R 7EXIkGr+DrQTzH82YGOYzExp4RPG05EgF9Py/aSjReMc2w58clynOg8b/XmPBg== From: Thomas Richard Date: Thu, 13 Jun 2024 15:13:27 +0200 Subject: [PATCH 1/2] i2c: omap: switch to NOIRQ_SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS() Precedence: bulk X-Mailing-List: linux-omap@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240613-i2c-omap-wakeup-controller-during-suspend-v1-1-aab001eb1ad1@bootlin.com> References: <20240613-i2c-omap-wakeup-controller-during-suspend-v1-0-aab001eb1ad1@bootlin.com> In-Reply-To: <20240613-i2c-omap-wakeup-controller-during-suspend-v1-0-aab001eb1ad1@bootlin.com> To: Vignesh R , Aaro Koskinen , Janusz Krzysztofik , Tony Lindgren , Andi Shyti Cc: linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, gregory.clement@bootlin.com, theo.lebrun@bootlin.com, thomas.petazzoni@bootlin.com, u-kumar1@ti.com, Thomas Richard X-Mailer: b4 0.12.0 X-GND-Sasl: thomas.richard@bootlin.com Replace SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() by NOIRQ_SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS(). The usage of pm_ptr() and these more recent macros allows the compiler to see and drop the dead code. The unnecessary '__maybe_unused' annotations on PM functions can be removed. Signed-off-by: Thomas Richard --- drivers/i2c/busses/i2c-omap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 30a5ea282a8b..410c8b37f768 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1534,7 +1534,7 @@ static void omap_i2c_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); } -static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev) +static int omap_i2c_runtime_suspend(struct device *dev) { struct omap_i2c_dev *omap = dev_get_drvdata(dev); @@ -1560,7 +1560,7 @@ static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused omap_i2c_runtime_resume(struct device *dev) +static int omap_i2c_runtime_resume(struct device *dev) { struct omap_i2c_dev *omap = dev_get_drvdata(dev); @@ -1575,10 +1575,10 @@ static int __maybe_unused omap_i2c_runtime_resume(struct device *dev) } static const struct dev_pm_ops omap_i2c_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) - SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend, - omap_i2c_runtime_resume, NULL) + NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) + RUNTIME_PM_OPS(omap_i2c_runtime_suspend, + omap_i2c_runtime_resume, NULL) }; static struct platform_driver omap_i2c_driver = { @@ -1586,7 +1586,7 @@ static struct platform_driver omap_i2c_driver = { .remove_new = omap_i2c_remove, .driver = { .name = "omap_i2c", - .pm = &omap_i2c_pm_ops, + .pm = pm_ptr(&omap_i2c_pm_ops), .of_match_table = of_match_ptr(omap_i2c_of_match), }, }; From patchwork Thu Jun 13 13:13:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Richard X-Patchwork-Id: 804028 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD835143C46; Thu, 13 Jun 2024 13:13:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718284422; cv=none; b=bORedvrdwVY2j7Lz7X8fd0At+ekkPlLBUJ/x+tbRzu9Vwbqe9K/uKmAuFxm9fSJqsWDLsDyycbu7oKd7q9gh/BsefODe7ElGZz4H5NfACSY+S74qiFWEVZ//o0IxDBivM7chzr6FESNTO1IER/MArIAyMj6H4TiRB12pIj76Klo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718284422; c=relaxed/simple; bh=Ty2UCqUCB0l7oVWoD5eKOXaiKOi1EakKfeomsmmXcoU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=n8ZJ3WUkLFxHADkOGrmOxE1tRkBGW7aduu9kQzuo5IbqmVZrz/QPhR3ZpJlAUL66DYaf5hFR2w2BYbdTg3PoES3Krkc2mDiDjcV7Ovgym37R3RIZVQkJ4ajMgqpYBPUg8CMw025B89dI3CB/UBiDq+oQVIyyexm+T59OX7IaGcI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=oXZS6Y03; arc=none smtp.client-ip=217.70.183.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="oXZS6Y03" Received: by mail.gandi.net (Postfix) with ESMTPSA id A012720003; Thu, 13 Jun 2024 13:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1718284418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NnXBYdyT0gNgWX4/GEGtMkJeHalCuEmPx0jaEIE6hhg=; b=oXZS6Y03Py2abvBDLCedfdQ9y7RgtZWBDeY21qzLJK5MmtDCtpZP9WO0Yeibpug5vd9D9T JhhcFZ0Xj86WrJ9C4OwAXxW1+v/0limydcCxwt5XnGYcAffUjWuGOl0Odc0xHGgpKG+CsM v7vResNn1d6LrTDfTM+DBCPRNP3XyMzlo752JQBEsl3R9h1Q4gIeXJY2hXDQiamAm/aox5 QL3ivUvV/hoekJgSxe7BHmhDXcWAeMut8aPJJcCTWh+wDYOCByj2Qp/6yejU3pqaTGGR15 7xiTmZ6Vtr7nT8DBNDXcfpbrmprD7NaQh0iuraIMskpaKd39Tr67Nl5rSWfSlQ== From: Thomas Richard Date: Thu, 13 Jun 2024 15:13:28 +0200 Subject: [PATCH 2/2] i2c: omap: wakeup the controller during suspend() callback Precedence: bulk X-Mailing-List: linux-omap@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240613-i2c-omap-wakeup-controller-during-suspend-v1-2-aab001eb1ad1@bootlin.com> References: <20240613-i2c-omap-wakeup-controller-during-suspend-v1-0-aab001eb1ad1@bootlin.com> In-Reply-To: <20240613-i2c-omap-wakeup-controller-during-suspend-v1-0-aab001eb1ad1@bootlin.com> To: Vignesh R , Aaro Koskinen , Janusz Krzysztofik , Tony Lindgren , Andi Shyti Cc: linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, gregory.clement@bootlin.com, theo.lebrun@bootlin.com, thomas.petazzoni@bootlin.com, u-kumar1@ti.com, Thomas Richard , Wolfram Sang X-Mailer: b4 0.12.0 X-GND-Sasl: thomas.richard@bootlin.com A device may need the controller up during suspend_noirq() or resume_noirq(). But if the controller is autosuspended, there is no way to wakeup it during suspend_noirq() or resume_noirq() because runtime pm is disabled at this time. The suspend() callback wakes up the controller, so it is available until its suspend_noirq() callback (pm_runtime_force_suspend()). During the resume, it's restored by resume_noirq() callback (pm_runtime_force_resume()). Then resume() callback enables autosuspend. So the controller is up during a little time slot in suspend and resume sequences even if it's not used. Reviewed-by: Andi Shyti Acked-by: Wolfram Sang Reviewed-by: Tony Lindgren Signed-off-by: Thomas Richard --- drivers/i2c/busses/i2c-omap.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 410c8b37f768..35a3f0a64986 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1574,9 +1574,31 @@ static int omap_i2c_runtime_resume(struct device *dev) return 0; } +static int omap_i2c_suspend(struct device *dev) +{ + /* + * If the controller is autosuspended, there is no way to wakeup it once + * runtime pm is disabled (in suspend_late()). + * But a device may need the controller up during suspend_noirq() or + * resume_noirq(). + * Wakeup the controller while runtime pm is enabled, so it is available + * until its suspend_noirq(), and from resume_noirq(). + */ + return pm_runtime_resume_and_get(dev); +} + +static int omap_i2c_resume(struct device *dev) +{ + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); + + return 0; +} + static const struct dev_pm_ops omap_i2c_pm_ops = { NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) + SYSTEM_SLEEP_PM_OPS(omap_i2c_suspend, omap_i2c_resume) RUNTIME_PM_OPS(omap_i2c_runtime_suspend, omap_i2c_runtime_resume, NULL) };