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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT 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 1B0DEC28CC2 for ; Thu, 30 May 2019 03:21:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCF2D24A03 for ; Thu, 30 May 2019 03:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186492; bh=lIVMaLhmshgVfq45JXAYLYb6R1A9DPD6T82LQI64QZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MZGFfFWHjN5NMzj6XT0DawYr2C+m6TLZ6tu9eUKo4NA2MiKpD0nGJBPCMY54euAgW 5vfe57DkEOO9ERp+4PVpKKYwuQKzqEPwk6gSxLlf4Y4mhZ/CRiIkYI+N8vWtOBAP5d HN+7wOtJ4LVHAni6LCFWA/rG1ndavaxQUOF/rblY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731422AbfE3DVa (ORCPT ); Wed, 29 May 2019 23:21:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731537AbfE3DV3 (ORCPT ); Wed, 29 May 2019 23:21:29 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 44ECA249E6; Thu, 30 May 2019 03:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186489; bh=lIVMaLhmshgVfq45JXAYLYb6R1A9DPD6T82LQI64QZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MTSX9EUtZaDc+ng3q0HmnB+Of7OqC3B216P2Nm46uuDKHfVj8tN3j8VK7Cb14ymLv d6gGnHcdKHx7s4IqD81KWPYeWBv98/IR9RgMrOy5zzCiaIUYJ9M9om7K0kbCt6UPuA kVQkCJ1B/w7+AjumqtotUrg/1QXXdrIWVRZ3eu4Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Pallardy , Ulf Hansson , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 4.9 082/128] PM / core: Propagate dev->power.wakeup_path when no callbacks Date: Wed, 29 May 2019 20:06:54 -0700 Message-Id: <20190530030449.649947405@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030432.977908967@linuxfoundation.org> References: <20190530030432.977908967@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit dc351d4c5f4fe4d0f274d6d660227be0c3a03317 ] The dev->power.direct_complete flag may become set in device_prepare() in case the device don't have any PM callbacks (dev->power.no_pm_callbacks is set). This leads to a broken behaviour, when there is child having wakeup enabled and relies on its parent to be used in the wakeup path. More precisely, when the direct complete path becomes selected for the child in __device_suspend(), the propagation of the dev->power.wakeup_path becomes skipped as well. Let's address this problem, by checking if the device is a part the wakeup path or has wakeup enabled, then prevent the direct complete path from being used. Reported-by: Loic Pallardy Signed-off-by: Ulf Hansson [ rjw: Comment cleanup ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/base/power/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 98517216879d5..a2714890fe431 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1383,6 +1383,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) if (dev->power.syscore) goto Complete; + /* Avoid direct_complete to let wakeup_path propagate. */ + if (device_may_wakeup(dev) || dev->power.wakeup_path) + dev->power.direct_complete = false; + if (dev->power.direct_complete) { if (pm_runtime_status_suspended(dev)) { pm_runtime_disable(dev); -- 2.20.1