Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753104AbdLAOSH (ORCPT ); Fri, 1 Dec 2017 09:18:07 -0500 Received: from bmailout1.hostsharing.net ([83.223.95.100]:34217 "EHLO bmailout1.hostsharing.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753064AbdLAOSE (ORCPT ); Fri, 1 Dec 2017 09:18:04 -0500 Date: Fri, 1 Dec 2017 15:18:01 +0100 From: Lukas Wunner To: "Rafael J. Wysocki" Cc: Linux PM , LKML , Adrian Hunter , Greg Kroah-Hartman Subject: Re: [PATCH] PM / runtime: Fix handling of suppliers with disabled runtime PM Message-ID: <20171201141801.GA20189@wunner.de> References: <1532136.s6buYvDjaS@aspire.rjw.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1532136.s6buYvDjaS@aspire.rjw.lan> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1950 Lines: 50 On Fri, Dec 01, 2017 at 02:58:34PM +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > Prevent rpm_get_suppliers() from returning an error code if runtime > PM is disabled for one or more of the supplier devices it wants to > runtime-resume, so as to make runtime PM work for devices with links > to suppliers that don't use runtime PM (such links may be created > during device enumeration even before it is known whether or not > runtime PM will be enabled for the devices in question, for example). > > Reported-by: Adrian Hunter > Fixes: 21d5c57b3726 (PM / runtime: Use device links) > Signed-off-by: Rafael J. Wysocki > --- > drivers/base/power/runtime.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > Index: linux-pm/drivers/base/power/runtime.c > =================================================================== > --- linux-pm.orig/drivers/base/power/runtime.c > +++ linux-pm/drivers/base/power/runtime.c > @@ -276,7 +276,8 @@ static int rpm_get_suppliers(struct devi > continue; > > retval = pm_runtime_get_sync(link->supplier); > - if (retval < 0) { > + /* Ignore suppliers with disabled runtime PM. */ > + if (retval < 0 && retval != -EACCES) { > pm_runtime_put_noidle(link->supplier); > return retval; > } > You could alternatively call pm_runtime_get_sync() under the condition link->supplier->power.disable_depth > 0 but then the usage_count wouldn't be incremented and I guess we want that in case runtime PM is only temporarily disabled and later enabled, right? I'm wondering if checking for that condition in lieu of retval != -EACCES would be more explicit and less fragile here (there's a theoretical possibility that the supplier's ->runtime_resume callback returns -EACCESS, leading to a false positive). Apart from that, Reviewed-by: Lukas Wunner Thanks, Lukas