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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 AD759C2D0BF for ; Mon, 16 Dec 2019 18:11:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78F9B2072D for ; Mon, 16 Dec 2019 18:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519894; bh=1sfH16P1I4MDaz88wYmpDscHnYskeF2xKyrHr+t1yZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EWuhOzEbP+XNl+pfaA7TZ6Sk1VxuCaR8NHk53igKAvsU1WuYzaVTNFlw8lL5HBlV8 +NwdeEPnH+7zMcH9GcEz5NthXajlYFNqJn4QXVZ5uEWXB66R33JRb1wzAuRcfTsqY8 1yxJFp+LobIdLmHEqmq/hhMemRyVC9ijfiFmdeW4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730798AbfLPSLd (ORCPT ); Mon, 16 Dec 2019 13:11:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:55568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730364AbfLPSLc (ORCPT ); Mon, 16 Dec 2019 13:11:32 -0500 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 D841E206E0; Mon, 16 Dec 2019 18:11:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519891; bh=1sfH16P1I4MDaz88wYmpDscHnYskeF2xKyrHr+t1yZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Blv4emAEfQ1JirvxbBeP8M+4QyhJDz4xshGCZr/468YFxgWdyYebeociRs0GJHNDU 1DgZbgE/ozXJEuKeZVvMu4henHGGwtnz/5TnZudgqeSPV7mrgiAePj86NT6mamaOoE bteVtVCj7Ymm4OoD5gExK9G0wYDWLsJQDMV15CyM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Rui , Todd Brandt , "Rafael J. Wysocki" Subject: [PATCH 5.3 110/180] ACPI: PM: Avoid attaching ACPI PM domain to certain devices Date: Mon, 16 Dec 2019 18:49:10 +0100 Message-Id: <20191216174838.673230464@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174806.018988360@linuxfoundation.org> References: <20191216174806.018988360@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 From: Rafael J. Wysocki commit b9ea0bae260f6aae546db224daa6ac1bd9d94b91 upstream. Certain ACPI-enumerated devices represented as platform devices in Linux, like fans, require special low-level power management handling implemented by their drivers that is not in agreement with the ACPI PM domain behavior. That leads to problems with managing ACPI fans during system-wide suspend and resume. For this reason, make acpi_dev_pm_attach() skip the affected devices by adding a list of device IDs to avoid to it and putting the IDs of the affected devices into that list. Fixes: e5cc8ef31267 (ACPI / PM: Provide ACPI PM callback routines for subsystems) Reported-by: Zhang Rui Tested-by: Todd Brandt Cc: 3.10+ # 3.10+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/device_pm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1309,9 +1309,19 @@ static void acpi_dev_pm_detach(struct de */ int acpi_dev_pm_attach(struct device *dev, bool power_on) { + /* + * Skip devices whose ACPI companions match the device IDs below, + * because they require special power management handling incompatible + * with the generic ACPI PM domain. + */ + static const struct acpi_device_id special_pm_ids[] = { + {"PNP0C0B", }, /* Generic ACPI fan */ + {"INT3404", }, /* Fan */ + {} + }; struct acpi_device *adev = ACPI_COMPANION(dev); - if (!adev) + if (!adev || !acpi_match_device_ids(adev, special_pm_ids)) return 0; /*