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.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 A0A2AC33CB1 for ; Wed, 15 Jan 2020 09:14:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7572B2081E for ; Wed, 15 Jan 2020 09:14:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="agXjc/bl"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=st.com header.i=@st.com header.b="MhojVoYQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7572B2081E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=st.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=znfCZQh2o19GtUNpYa+t9cPCBmnyRxKnk8kOnpDTzfQ=; b=agXjc/bl4P5yUw 4Pixsmd+UkMMOIZVsuCvxEy8hFOhaqAdBgcisw0pMHZnIYHRyBvMW8QOdQyWHRAkutsWayt/NIXGh 1sY9y7qjqPailkkLC5l9MqA/Z5H5nVczmuez3qCXN/Vb+EiKfxy9ZGgpgPONxXn5Kn48vjliQ6VHL GDuX/WDGXI87hrlEt22uz18nytai2y2PmuZNjcTq0uSiMJuBNdJJvFgZJ308Jr9emb32qInu4x5Ek hyJI4kQasUDso4PGIgznVP8luyHbXwDuZkhyh0z4JNtgVhfc1iyRXk+vqzHgH7NgPUQX4AjqmftqH JcAYKN5IDTBFI/3igjtQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irekU-0000ew-Ow; Wed, 15 Jan 2020 09:14:02 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irekO-0000ba-Md for linux-arm-kernel@lists.infradead.org; Wed, 15 Jan 2020 09:14:01 +0000 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00F9Dowl027725; Wed, 15 Jan 2020 10:13:52 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=STMicroelectronics; bh=HlHbEvYjB0DFsNrNSDZVNAFVsnTnh8Skc5KNww6mesE=; b=MhojVoYQ/rX9nVDtZ1lsBN6W8ayvN/TsErKPCp9nm56qV84EPyHqcfwmteimov2xkH3O 3nsBX14R6YEVsi++vRpCAE9YabaKzMfSln8IvImz1Ma8Zw+k/rWKaeE5H5iuD4ujsyHF hzOzxDPBJu4fWXm30gRlkBzPpCSFPrwWzZn2vr/ENnjJdlkCu8tw9AbHdHE2RdG7QL/o xZFo9aj/KBYRlsZFQ4JSTyTAg/SGfFyrAPaXPYasRC4MOoW5LFvC1mFUF3Dl8Mgfm1f2 731lu9N0XD1hzJZZli1rbf9H5YMWPNGlA19xNchYYWc7hIkQg6U3Eae6B254TYbZyZSS Dg== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2xf78saa74-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Jan 2020 10:13:52 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 35CBD10003A; Wed, 15 Jan 2020 10:13:50 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag5node2.st.com [10.75.127.14]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 2508D21CA99; Wed, 15 Jan 2020 10:13:50 +0100 (CET) Received: from [10.48.1.171] (10.75.127.46) by SFHDAG5NODE2.st.com (10.75.127.14) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 15 Jan 2020 10:13:49 +0100 Subject: Re: [PATCH 5/6] i2c: i2c-stm32f7: allow controller to be wakeup-source To: Alain Volmat , , References: <1578317314-17197-1-git-send-email-alain.volmat@st.com> <1578317314-17197-6-git-send-email-alain.volmat@st.com> From: Pierre Yves MORDRET Message-ID: <803ec9f1-c940-0c95-612d-f1222fc0dcc2@st.com> Date: Wed, 15 Jan 2020 10:13:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <1578317314-17197-6-git-send-email-alain.volmat@st.com> Content-Language: en-US X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG4NODE2.st.com (10.75.127.11) To SFHDAG5NODE2.st.com (10.75.127.14) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-01-15_01:2020-01-15, 2020-01-14 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200115_011357_075245_6F3BAE3F X-CRM114-Status: GOOD ( 27.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, alexandre.torgue@st.com, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, mcoquelin.stm32@gmail.com, fabrice.gasnier@st.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all Reviewed-by: Pierre-Yves MORDRET Thanks and regards On 1/6/20 2:28 PM, Alain Volmat wrote: > Allow the i2c-stm32f7 controller to become a wakeup-source > of the system. In such case, when a slave is registered to the > I2C controller, receiving a I2C message targeting that registered > slave address wakes up the suspended system. > > In order to be able to wake-up, the I2C controller DT node > must have the property wakeup-source defined and a slave > must be registered. > > Signed-off-by: Alain Volmat > --- > drivers/i2c/busses/i2c-stm32f7.c | 98 ++++++++++++++++++++++++++++++++++------ > 1 file changed, 83 insertions(+), 15 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c > index 5c3e8ac6ad92..844a22d64aa8 100644 > --- a/drivers/i2c/busses/i2c-stm32f7.c > +++ b/drivers/i2c/busses/i2c-stm32f7.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -49,6 +50,7 @@ > > /* STM32F7 I2C control 1 */ > #define STM32F7_I2C_CR1_PECEN BIT(23) > +#define STM32F7_I2C_CR1_WUPEN BIT(18) > #define STM32F7_I2C_CR1_SBC BIT(16) > #define STM32F7_I2C_CR1_RXDMAEN BIT(15) > #define STM32F7_I2C_CR1_TXDMAEN BIT(14) > @@ -301,6 +303,7 @@ struct stm32f7_i2c_msg { > * @dma: dma data > * @use_dma: boolean to know if dma is used in the current transfer > * @regmap: holds SYSCFG phandle for Fast Mode Plus bits > + * @wakeup_src: boolean to know if the device is a wakeup source > */ > struct stm32f7_i2c_dev { > struct i2c_adapter adap; > @@ -323,6 +326,7 @@ struct stm32f7_i2c_dev { > struct stm32_i2c_dma *dma; > bool use_dma; > struct regmap *regmap; > + bool wakeup_src; > }; > > /* > @@ -1691,6 +1695,9 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, > return ret; > } > > +static void stm32f7_i2c_enable_wakeup(struct stm32f7_i2c_dev *i2c_dev, > + bool enable); > + > static int stm32f7_i2c_reg_slave(struct i2c_client *slave) > { > struct stm32f7_i2c_dev *i2c_dev = i2c_get_adapdata(slave->adapter); > @@ -1717,6 +1724,9 @@ static int stm32f7_i2c_reg_slave(struct i2c_client *slave) > if (ret < 0) > return ret; > > + if (!stm32f7_i2c_is_slave_registered(i2c_dev)) > + stm32f7_i2c_enable_wakeup(i2c_dev, true); > + > if (id == 0) { > /* Configure Own Address 1 */ > oar1 = readl_relaxed(i2c_dev->base + STM32F7_I2C_OAR1); > @@ -1758,6 +1768,9 @@ static int stm32f7_i2c_reg_slave(struct i2c_client *slave) > > ret = 0; > pm_free: > + if (!stm32f7_i2c_is_slave_registered(i2c_dev)) > + stm32f7_i2c_enable_wakeup(i2c_dev, false); > + > pm_runtime_mark_last_busy(dev); > pm_runtime_put_autosuspend(dev); > > @@ -1791,8 +1804,10 @@ static int stm32f7_i2c_unreg_slave(struct i2c_client *slave) > > i2c_dev->slave[id] = NULL; > > - if (!(stm32f7_i2c_is_slave_registered(i2c_dev))) > + if (!stm32f7_i2c_is_slave_registered(i2c_dev)) { > stm32f7_i2c_disable_irq(i2c_dev, STM32F7_I2C_ALL_IRQ_MASK); > + stm32f7_i2c_enable_wakeup(i2c_dev, false); > + } > > pm_runtime_mark_last_busy(i2c_dev->dev); > pm_runtime_put_autosuspend(i2c_dev->dev); > @@ -1879,6 +1894,9 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) > return irq_error ? : -ENOENT; > } > > + i2c_dev->wakeup_src = of_property_read_bool(pdev->dev.of_node, > + "wakeup-source"); > + > i2c_dev->clk = devm_clk_get(&pdev->dev, NULL); > if (IS_ERR(i2c_dev->clk)) { > dev_err(&pdev->dev, "Error: Missing controller clock\n"); > @@ -1985,6 +2003,16 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) > goto clk_free; > } > > + if (i2c_dev->wakeup_src) { > + device_set_wakeup_capable(i2c_dev->dev, true); > + > + ret = dev_pm_set_wake_irq(i2c_dev->dev, irq_event); > + if (ret) { > + dev_err(i2c_dev->dev, "Failed to set wake up irq\n"); > + goto clr_wakeup_capable; > + } > + } > + > platform_set_drvdata(pdev, i2c_dev); > > pm_runtime_set_autosuspend_delay(i2c_dev->dev, > @@ -2014,6 +2042,13 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) > pm_runtime_set_suspended(i2c_dev->dev); > pm_runtime_dont_use_autosuspend(i2c_dev->dev); > > + if (i2c_dev->wakeup_src) > + dev_pm_clear_wake_irq(i2c_dev->dev); > + > +clr_wakeup_capable: > + if (i2c_dev->wakeup_src) > + device_set_wakeup_capable(i2c_dev->dev, false); > + > if (i2c_dev->dma) { > stm32_i2c_dma_free(i2c_dev->dma); > i2c_dev->dma = NULL; > @@ -2032,6 +2067,15 @@ static int stm32f7_i2c_remove(struct platform_device *pdev) > i2c_del_adapter(&i2c_dev->adap); > pm_runtime_get_sync(i2c_dev->dev); > > + if (i2c_dev->wakeup_src) { > + dev_pm_clear_wake_irq(i2c_dev->dev); > + /* > + * enforce that wakeup is disabled and that the device > + * is marked as non wakeup capable > + */ > + device_init_wakeup(i2c_dev->dev, false); > + } > + > pm_runtime_put_noidle(i2c_dev->dev); > pm_runtime_disable(i2c_dev->dev); > pm_runtime_set_suspended(i2c_dev->dev); > @@ -2127,20 +2171,41 @@ stm32f7_i2c_regs_restore(struct stm32f7_i2c_dev *i2c_dev) > return ret; > } > > +static void stm32f7_i2c_enable_wakeup(struct stm32f7_i2c_dev *i2c_dev, > + bool enable) > +{ > + void __iomem *base = i2c_dev->base; > + u32 mask = STM32F7_I2C_CR1_WUPEN; > + > + if (!i2c_dev->wakeup_src) > + return; > + > + if (enable) { > + device_set_wakeup_enable(i2c_dev->dev, true); > + stm32f7_i2c_set_bits(base + STM32F7_I2C_CR1, mask); > + } else { > + device_set_wakeup_enable(i2c_dev->dev, false); > + stm32f7_i2c_clr_bits(base + STM32F7_I2C_CR1, mask); > + } > +} > + > static int __maybe_unused stm32f7_i2c_suspend(struct device *dev) > { > struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev); > int ret; > > i2c_mark_adapter_suspended(&i2c_dev->adap); > - ret = stm32f7_i2c_regs_backup(i2c_dev); > - if (ret < 0) { > - i2c_mark_adapter_resumed(&i2c_dev->adap); > - return ret; > - } > > - pinctrl_pm_select_sleep_state(dev); > - pm_runtime_force_suspend(dev); > + if (!device_may_wakeup(dev) && !dev->power.wakeup_path) { > + ret = stm32f7_i2c_regs_backup(i2c_dev); > + if (ret < 0) { > + i2c_mark_adapter_resumed(&i2c_dev->adap); > + return ret; > + } > + > + pinctrl_pm_select_sleep_state(dev); > + pm_runtime_force_suspend(dev); > + } > > return 0; > } > @@ -2150,14 +2215,17 @@ static int __maybe_unused stm32f7_i2c_resume(struct device *dev) > struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev); > int ret; > > - ret = pm_runtime_force_resume(dev); > - if (ret < 0) > - return ret; > - pinctrl_pm_select_default_state(dev); > + if (!device_may_wakeup(dev) && !dev->power.wakeup_path) { > + ret = pm_runtime_force_resume(dev); > + if (ret < 0) > + return ret; > + pinctrl_pm_select_default_state(dev); > + > + ret = stm32f7_i2c_regs_restore(i2c_dev); > + if (ret < 0) > + return ret; > + } > > - ret = stm32f7_i2c_regs_restore(i2c_dev); > - if (ret < 0) > - return ret; > i2c_mark_adapter_resumed(&i2c_dev->adap); > > return 0; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel