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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 7210DC43331 for ; Sun, 10 Nov 2019 02:50:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 394BE22573 for ; Sun, 10 Nov 2019 02:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354257; bh=iuc+CW/MwNh7Z3Nj4jlGrhbfNy6HZQZso3XrQC80OqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2rAJ4If7DM1yv0uEnYIuyk37d7eYOuNCd8IKQwhBBE36tgzjnkUu6NhtPyXJjhD1M QYEdhz9Ma1zZmsW+dZSXvZp3lw/nACmXoTBoZBx08sA+g58GynZXxQ8c4KWZvMEvVp J0czHDA6enMnrsBuHEj0FN+pGNPUses4cM74FtCE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729847AbfKJCuz (ORCPT ); Sat, 9 Nov 2019 21:50:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:34282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729746AbfKJCug (ORCPT ); Sat, 9 Nov 2019 21:50:36 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D9F4122790; Sun, 10 Nov 2019 02:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354235; bh=iuc+CW/MwNh7Z3Nj4jlGrhbfNy6HZQZso3XrQC80OqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QdiMwsVZwVePbsIIxtX07h1/sFJa3PlQg1l0aPPZZs6Q0zjMK+/5L5YWXNxDA7Z8s oidI/vC7Ie2cE3ZtIHEpD9Hema8iQpbTFbj5s2hWiVae7CEhvwHORMcPmhkKr30sL3 eyDG94AyWaup14X5O2VOVH5DlcgSYYC0gf7rsB7E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sinan Kaya , Michael Kelley , Bjorn Helgaas , Sasha Levin , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 02/40] PCI/ACPI: Correct error message for ASPM disabling Date: Sat, 9 Nov 2019 21:49:54 -0500 Message-Id: <20191110025032.827-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110025032.827-1-sashal@kernel.org> References: <20191110025032.827-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sinan Kaya [ Upstream commit 1ad61b612b95980a4d970c52022aa01dfc0f6068 ] If _OSC execution fails today for platforms without an _OSC entry, code is printing a misleading message saying disabling ASPM as follows: acpi PNP0A03:00: _OSC failed (AE_NOT_FOUND); disabling ASPM We need to ensure that platform supports ASPM to begin with. Reported-by: Michael Kelley Signed-off-by: Sinan Kaya Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/acpi/pci_root.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 3b0b4bd67b71b..4031ec8024cee 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -454,8 +454,9 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm) decode_osc_support(root, "OS supports", support); status = acpi_pci_osc_support(root, support); if (ACPI_FAILURE(status)) { - dev_info(&device->dev, "_OSC failed (%s); disabling ASPM\n", - acpi_format_exception(status)); + dev_info(&device->dev, "_OSC failed (%s)%s\n", + acpi_format_exception(status), + pcie_aspm_support_enabled() ? "; disabling ASPM" : ""); *no_aspm = 1; return; } -- 2.20.1