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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 9BAA5C4742C for ; Fri, 13 Nov 2020 08:28:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 2132320936 for ; Fri, 13 Nov 2020 08:28:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Q5E1hNf3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=st.com header.i=@st.com header.b="Xx156703" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2132320936 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+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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type: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:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SerDIU8tfbnVWwwUFgWj2arhgDYsnHuCHYqxPDlYJPE=; b=Q5E1hNf3DU+4C4taUBBxHCB8Ke gKz/jWo8aXVOkBgPaCGHf9dohhqz+FLTLuxkBAQBjTkkqNw7BtNirDWAAhdyOjQpOWaQfzHgZrHii KlAh9MkKlsRXdY/E4m87tvoeoZZZxu655C7btw+nM2q466CB2ft7BO866+ipmsEPhdrRqWP8MLzpv +v8lvw+crzUSaJfyqr+UFG33dveQoLbljiQ7sJPMOwJ7NF47nH2o+W39+vOU+ECCL9EHbRzp3GklH hPMhn7KAKjlPvzkXVXPsBAuUetSx3LA4hW+Oh0lnLMJF8rn0fndTdVv1dcJZhUahzdWbxtb21ZQlo IRT4n3gw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdURW-000327-5F; Fri, 13 Nov 2020 08:28:26 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdURT-00030l-Sl for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 08:28:24 +0000 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AD8R67D030468; Fri, 13 Nov 2020 09:28:17 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=subject : to : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=STMicroelectronics; bh=kNfsi7ZtmZxFM4ZtJQvG2R+5IFYOpR6oyz11MxeQh0U=; b=Xx156703FE+Jx/MC4tXWCC6Do/CaKcNA2hA4ZOOOK/lPFTL34zHv/RRsUHgiD2FUN05c HAwrn0Gk86r7YqX6cWRStD+a1i6isnGMla4D6J7L4KiF+OIDso3TdgdmI9DEyBC+v7pz H4B/qIFQ1WO435KQcFR7N32G6vZlJW3XFwTZLyBsWjia+3qosHH2Zp/OnE5GoqiO7NtR d9JoxOSbeZiUx3rBHxGVlD1yGlMRH/JBNVIx40v/ikv9fRj9NgMYqSX6HpoCrMAoAs8R 6W3ErPosprCZrDdmqKP+ldYV6kbqXAT54eMYqKEb7JxVDhjwV1P5CD2GcN4+G2aKC06v 1g== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 34nj819krb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Nov 2020 09:28:17 +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 3047F10002A; Fri, 13 Nov 2020 09:28:09 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag1node2.st.com [10.75.127.2]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 19C0222A4C0; Fri, 13 Nov 2020 09:28:09 +0100 (CET) Received: from lmecxl1060.lme.st.com (10.75.127.46) by SFHDAG1NODE2.st.com (10.75.127.2) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 13 Nov 2020 09:28:05 +0100 Subject: Re: [PATCH] [v2] i2c: stm32f7: Fix runtime PM imbalance on error To: Dinghao Liu , "kjlu@umn.edu" , Maxime Coquelin , Alexandre TORGUE , "linux-i2c@vger.kernel.org" , "linux-stm32@st-md-mailman.stormreply.com" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" References: <20200527013853.30252-1-dinghao.liu@zju.edu.cn> <20200601055634.GB17269@gnbcxd0016.gnb.st.com> From: Pierre Yves MORDRET Message-ID: <22cad188-c13c-207d-ad8e-fac9d7277346@st.com> Date: Fri, 13 Nov 2020 09:27:47 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200601055634.GB17269@gnbcxd0016.gnb.st.com> Content-Language: en-US X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SFHDAG1NODE2.st.com (10.75.127.2) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-13_05:2020-11-12, 2020-11-13 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201113_032824_140264_95EB7F17 X-CRM114-Status: GOOD ( 22.91 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hello Looks good to me Reviewed-by: Pierre-Yves MORDRET Thx Regards On 6/1/20 7:56 AM, Alain Volmat wrote: > Hi, > > Reviewed-by: Alain Volmat > > Thanks, > Alain > > On Wed, May 27, 2020 at 01:38:53AM +0000, Dinghao Liu wrote: >> pm_runtime_get_sync() increments the runtime PM usage counter even >> the call returns an error code. Thus a pairing decrement is needed >> on the error handling path to keep the counter balanced. >> >> Signed-off-by: Dinghao Liu >> --- >> >> Changelog: >> >> v2: - Use pm_runtime_put_noidle() instead of >> pm_runtime_put_autosuspend(). Fix 5 more >> similar cases within this dirver. >> --- >> drivers/i2c/busses/i2c-stm32f7.c | 24 ++++++++++++++++++------ >> 1 file changed, 18 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c >> index 330ffed011e0..822fd1f5b5ae 100644 >> --- a/drivers/i2c/busses/i2c-stm32f7.c >> +++ b/drivers/i2c/busses/i2c-stm32f7.c >> @@ -1620,8 +1620,10 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap, >> f7_msg->smbus = false; >> >> ret = pm_runtime_get_sync(i2c_dev->dev); >> - if (ret < 0) >> + if (ret < 0) { >> + pm_runtime_put_noidle(i2c_dev->dev); >> return ret; >> + } >> >> ret = stm32f7_i2c_wait_free_bus(i2c_dev); >> if (ret) >> @@ -1666,8 +1668,10 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, >> f7_msg->smbus = true; >> >> ret = pm_runtime_get_sync(dev); >> - if (ret < 0) >> + if (ret < 0) { >> + pm_runtime_put_noidle(dev); >> return ret; >> + } >> >> ret = stm32f7_i2c_wait_free_bus(i2c_dev); >> if (ret) >> @@ -1767,8 +1771,10 @@ static int stm32f7_i2c_reg_slave(struct i2c_client *slave) >> return ret; >> >> ret = pm_runtime_get_sync(dev); >> - if (ret < 0) >> + if (ret < 0) { >> + pm_runtime_put_noidle(dev); >> return ret; >> + } >> >> if (!stm32f7_i2c_is_slave_registered(i2c_dev)) >> stm32f7_i2c_enable_wakeup(i2c_dev, true); >> @@ -1837,8 +1843,10 @@ static int stm32f7_i2c_unreg_slave(struct i2c_client *slave) >> WARN_ON(!i2c_dev->slave[id]); >> >> ret = pm_runtime_get_sync(i2c_dev->dev); >> - if (ret < 0) >> + if (ret < 0) { >> + pm_runtime_put_noidle(i2c_dev->dev); >> return ret; >> + } >> >> if (id == 0) { >> mask = STM32F7_I2C_OAR1_OA1EN; >> @@ -2182,8 +2190,10 @@ static int stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_dev) >> struct stm32f7_i2c_regs *backup_regs = &i2c_dev->backup_regs; >> >> ret = pm_runtime_get_sync(i2c_dev->dev); >> - if (ret < 0) >> + if (ret < 0) { >> + pm_runtime_put_noidle(i2c_dev->dev); >> return ret; >> + } >> >> backup_regs->cr1 = readl_relaxed(i2c_dev->base + STM32F7_I2C_CR1); >> backup_regs->cr2 = readl_relaxed(i2c_dev->base + STM32F7_I2C_CR2); >> @@ -2204,8 +2214,10 @@ static int stm32f7_i2c_regs_restore(struct stm32f7_i2c_dev *i2c_dev) >> struct stm32f7_i2c_regs *backup_regs = &i2c_dev->backup_regs; >> >> ret = pm_runtime_get_sync(i2c_dev->dev); >> - if (ret < 0) >> + if (ret < 0) { >> + pm_runtime_put_noidle(i2c_dev->dev); >> return ret; >> + } >> >> cr1 = readl_relaxed(i2c_dev->base + STM32F7_I2C_CR1); >> if (cr1 & STM32F7_I2C_CR1_PE) >> -- >> 2.17.1 >> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel