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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E101DC6FA82 for ; Fri, 23 Sep 2022 13:26:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229963AbiIWN03 (ORCPT ); Fri, 23 Sep 2022 09:26:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232361AbiIWN0Q (ORCPT ); Fri, 23 Sep 2022 09:26:16 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 810CB145C8E for ; Fri, 23 Sep 2022 06:26:01 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id n10so20397170wrw.12 for ; Fri, 23 Sep 2022 06:26:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=nX/6+loplHgFJT8kUh2DaZVIOlAUdD2TqBvnDdwr7aE=; b=zO9vbyWNjy0PacyXptByLwKcbKljVXwkFXuhRToBCZtT8PIHa0uRfUrvJKIgMWz7jA JcnS0OhBPVyZbHyeVsChSyOY1pqKb7s8IpQjeGcbDDIBEQIxD/C+53bPd97jui5U0vRB 2PG+9bAHes7ggkOd+bD7DCmcSIQdbfeM9diNNwBoZX4FvgZP+lDY1invPHhfPirpR8tc ZD3BG3l3hpJz8CyFCkArfZI1tXSQ51rCZ92nlMbQzhiLsVZv40yG/BrdiBzWWEdv3+Yq cBRcVRvCZFKs+Up2KLID+QGfVKkgmqyb6CudO6UfP9OcfKq87UmznWMjFqg6JBhXPUSi FY4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=nX/6+loplHgFJT8kUh2DaZVIOlAUdD2TqBvnDdwr7aE=; b=FD9QnBWMbFzA8XZJAjK+lKLdR6xoa9rGce29nNHEhLDM8kkJK2+rXpOXN5Jd+xtwP+ woUCM6ma3QzjQsg2iw7T9eOzMGN8Yd5a8D6rhsY4m99POJVp/hRcoBnSzuDiCBvHWTRt j2Rv658pjFIIvoTJpoaQM+o/SWuU6elQSulQ06vdFEI/wjIryQ5vzQjfyKPPYgN+EUy3 itnUXBo091JgD7hVpQW2/dAi6dE4R5cx40x1mWTODtBOOvjLcyahiLvneOYWhYItxv7w dne1bcUo9/4GP3uw1nRysvNWXgyBDHeI1SrLN/oyiY95MMDCJHM4kcKWWwoWygilFvqx S2Xg== X-Gm-Message-State: ACrzQf2FzhAZqtD41Kn0tK5dhi1HFYqM13jUpqExpWMAnPWhewd5UEBQ OOoulLHxVYv3dscUIKoxpfgF03ttb37HgN41UrY1WQ== X-Google-Smtp-Source: AMsMyM5Hwm5z8nHMJU3o3+1pxIo2s6caIcdyscKttqVtqZ86KBo6V8EuE8SL6NwE+bRv++IJJ3/RogZgqq8M8uuC8Ss= X-Received: by 2002:a5d:6d8e:0:b0:22a:4831:e0e with SMTP id l14-20020a5d6d8e000000b0022a48310e0emr4991454wrs.442.1663939560054; Fri, 23 Sep 2022 06:26:00 -0700 (PDT) MIME-Version: 1.0 References: <12079576.O9o76ZdvQC@kreacher> In-Reply-To: <12079576.O9o76ZdvQC@kreacher> From: Ulf Hansson Date: Fri, 23 Sep 2022 15:25:23 +0200 Message-ID: Subject: Re: [PATCH] PM: runtime: Return -EINPROGRESS from rpm_resume() in the RPM_NOWAIT case To: "Rafael J. Wysocki" Cc: Linux PM , Douglas Anderson , LKML , Alan Stern Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Thu, 22 Sept 2022 at 20:04, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki > > The prospective callers of rpm_resume() passing RPM_NOWAIT to it may > be confused when it returns 0 without actually resuming the device > which may happen if the device is suspending at the given time and it > will only resume when the suspend in progress has completed. To avoid > that confusion, return -EINPROGRESS from rpm_resume() in that case. > > Since none of the current callers passing RPM_NOWAIT to rpm_resume() > check its return value, this change has no functional impact. Sounds like there are additional improvements that can be made around this, right? > > Signed-off-by: Rafael J. Wysocki Looks good to me! Reviewed-by: Ulf Hansson Kind regards Uffe > --- > drivers/base/power/runtime.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > Index: linux-pm/drivers/base/power/runtime.c > =================================================================== > --- linux-pm.orig/drivers/base/power/runtime.c > +++ linux-pm/drivers/base/power/runtime.c > @@ -792,10 +792,13 @@ static int rpm_resume(struct device *dev > DEFINE_WAIT(wait); > > if (rpmflags & (RPM_ASYNC | RPM_NOWAIT)) { > - if (dev->power.runtime_status == RPM_SUSPENDING) > + if (dev->power.runtime_status == RPM_SUSPENDING) { > dev->power.deferred_resume = true; > - else > + if (rpmflags & RPM_NOWAIT) > + retval = -EINPROGRESS; > + } else { > retval = -EINPROGRESS; > + } > goto out; > } > > > >