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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 04F0AC43460 for ; Wed, 5 May 2021 13:56:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62722613CB for ; Wed, 5 May 2021 13:56:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233561AbhEEN5l (ORCPT ); Wed, 5 May 2021 09:57:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233178AbhEEN5k (ORCPT ); Wed, 5 May 2021 09:57:40 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFD4DC061574; Wed, 5 May 2021 06:56:43 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id l14so1957738wrx.5; Wed, 05 May 2021 06:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:content-transfer-encoding:date:message-id:to:cc :subject:from:references:in-reply-to; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=rHQPvxjAuK2Pff3yz8wDRSkCbFh7jdBrno1hGfOSliik/K37WXholSfq5fnbl5g4tD D9vY7q3tQDIx7X7eAU4HPA9exN2PxY47yjtGnDFc9DcUbUjdKD/t1jVq9lghDvpLXU+R pCYRfvxuY+DKcNtzYOhoMg8+knE65iw6S2qZ7W9zNn0KBSIhCg/9aJpu4iI6Rh4VXDEm foteZEQ9xZRj2agkDMGY4k/OtG/fii1KtIPHqcJhYbE1uCP7M2IJr1FY1eE6FKN3bOn4 JP7mDe8VW2XdfAOOiKruStlKFvdgDN38R/D4KsTpR33qet0a19AEiNmLGQGlj1+SlbUP zS7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:content-transfer-encoding:date :message-id:to:cc:subject:from:references:in-reply-to; bh=w5NxWLLzhgPNs7hgKxObXSucJQTrVLPMT6JRaxXmMGg=; b=SAv+H3SpHgKVoffqA0Jjxo5qeuqnInwrle+5l0PR3Wz8VAiDEZQhdgesr9IWJ5ysOM XJJqVJxg/TR/3Nbv9rLgheKcdJuY1PXbGQHPWx37FUVOFQ/l53kZt/tOxaWZ5/Q8/j6q sh+utF8S6RwVprM/vV7PbltPn5/m0lnMkHdSiTy7aWF7ipSlDxTv3mZTozjWnqLA7O43 MtZobCO1+SLrBzHNz4lpO+dReXYg5NgeVjdWmipfirrfeJGHNTTjuH5UqYKlpp7VS7Mz 06N6cBsqUgNXIQ0/vYdxlWiz0AkV9RtCbAc4K43EliW/ITmRIqpY9DJ/WywTX0p3NmMI gCEA== X-Gm-Message-State: AOAM533anH8K+cuvHL6huplBVLbQPri7y3LhtRRYWgoe6FQ7JSvKMZic REorEhBa4WgSHuvBFT/Vpd0= X-Google-Smtp-Source: ABdhPJyV2UBegtSOrw2Zpi3F53Lq+71q6vd8Wp3vO3VMu7mlOM4kKYHZucbGpdf2r8Tyhuih4H/9fg== X-Received: by 2002:adf:fc11:: with SMTP id i17mr34684916wrr.368.1620223002719; Wed, 05 May 2021 06:56:42 -0700 (PDT) Received: from localhost (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id s5sm6062841wmh.37.2021.05.05.06.56.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 06:56:41 -0700 (PDT) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 05 May 2021 14:56:40 +0100 Message-Id: To: "Jonathan Cameron" , "Mauro Carvalho Chehab" Cc: , , "Fabio Estevam" , "Greg Kroah-Hartman" , "Mauro Carvalho Chehab" , "NXP Linux Team" , "Pengutronix Kernel Team" , "Philipp Zabel" , "Sascha Hauer" , "Shawn Guo" , "Steve Longerbeam" , , , , Subject: Re: [PATCH 02/25] staging: media: imx7-mipi-csis: fix pm_runtime_get_sync() usage count From: "Rui Miguel Silva" References: <793a5806a63b6313606fd1c344b9eec41e61a440.1620207353.git.mchehab+huawei@kernel.org> <20210505120652.00001236@Huawei.com> In-Reply-To: <20210505120652.00001236@Huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Wed May 5, 2021 at 12:06 PM WEST, Jonathan Cameron wrote: > On Wed, 5 May 2021 11:41:52 +0200 > Mauro Carvalho Chehab wrote: > > > The pm_runtime_get_sync() internally increments the > > dev->power.usage_count without decrementing it, even on errors. > > Replace it by the new pm_runtime_resume_and_get(), introduced by: > > commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to dea= l with usage counter") > > in order to properly decrement the usage counter, avoiding > > a potential PM usage counter leak. > >=20 > > Acked-by: Rui Miguel Silva > > Signed-off-by: Mauro Carvalho Chehab > > Not a fix as far as I can see, just a cleanup - so perhaps not this set? yes, the original changelog of this patch, that I acked, made it clear it was a cleanup: " Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") = = =20 added pm_runtime_resume_and_get() in order to automatically handle=20 dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. " This one above is new, but I saw Mauro is going change it. ------ Cheers, Rui > > Jonathan > > > > --- > > drivers/staging/media/imx/imx7-mipi-csis.c | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > >=20 > > diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/stagi= ng/media/imx/imx7-mipi-csis.c > > index 025fdc488bd6..1dc680d94a46 100644 > > --- a/drivers/staging/media/imx/imx7-mipi-csis.c > > +++ b/drivers/staging/media/imx/imx7-mipi-csis.c > > @@ -695,11 +695,10 @@ static int mipi_csis_s_stream(struct v4l2_subdev = *mipi_sd, int enable) > > =20 > > mipi_csis_clear_counters(state); > > =20 > > - ret =3D pm_runtime_get_sync(&state->pdev->dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(&state->pdev->dev); > > + ret =3D pm_runtime_resume_and_get(&state->pdev->dev); > > + if (ret < 0) > > return ret; > > - } > > + > > ret =3D v4l2_subdev_call(state->src_sd, core, s_power, 1); > > if (ret < 0 && ret !=3D -ENOIOCTLCMD) > > goto done;