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,USER_AGENT_GIT 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 9EA0EC28EBD for ; Sun, 9 Jun 2019 17:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D660206C3 for ; Sun, 9 Jun 2019 17:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099848; bh=/RQoB0Mb3evmr+5bBnjH8AXnfnI9O9MRVe/mPA/pi6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uMd4fRSYpt1qEO3mqGWsJLFBMqJDcXkzrtv2hA4TNUyoo1M3tDkB9fcYNVOi3GcST RqVjjor9KyvHpiy+DhKMwhosp1pZAx2xwpB1rEzVYBlXPTS6JG1Ag34iv44F7lcBbJ GESuwoxLFb8SnDfLc3CPYaTkSnyTe9jTJ6Mx5wEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388557AbfFIREH (ORCPT ); Sun, 9 Jun 2019 13:04:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:42648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388543AbfFIREC (ORCPT ); Sun, 9 Jun 2019 13:04:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C69C9204EC; Sun, 9 Jun 2019 17:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099842; bh=/RQoB0Mb3evmr+5bBnjH8AXnfnI9O9MRVe/mPA/pi6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WTcNycwceKIiRfWqanY1gyFfuzyQj1/6XCz3toym5hhnuEZO64WuoA3YVl504qIVW L6zdWvIRzNreGAbdi7bmKlGtpfXZlmmzqN4M03I4AuaGQKMQUZenvOOSyYLB/nt5xo d8fjWgEUe9yBIcqwcp21/uV6X03FEPObZ8pTIVSs= 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.4 141/241] PM / core: Propagate dev->power.wakeup_path when no callbacks Date: Sun, 9 Jun 2019 18:41:23 +0200 Message-Id: <20190609164151.857030674@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 05409141ec077..8efdb823826c8 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1378,6 +1378,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