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=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 3C6F5CA9EA0 for ; Fri, 25 Oct 2019 13:58:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B13C21E6F for ; Fri, 25 Oct 2019 13:58:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572011929; bh=3SoKi6IzLISdFNp1aPaetavHCeQsuyyi5mZ5Hv6IBRs=; h=From:To:Cc:Subject:Date:List-ID:From; b=IbIapg1Ow5vCBQ1BGaDDmM6kfpafNFy6dgfa8pnmJqrYfcT25yBHtENHwO/Tf3GZ5 SD0yM7Or/pvRyoXtAmJyHyr3TQJhnIjQoyANOmRYWDfbCUEjaux6hYLIhle6EsNGh2 7i2xNT362enURexQLCJz/uGztCG9iJd/b+AHNzfU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410391AbfJYN6r (ORCPT ); Fri, 25 Oct 2019 09:58:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:54284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410372AbfJYN6o (ORCPT ); Fri, 25 Oct 2019 09:58:44 -0400 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 9C18421E6F; Fri, 25 Oct 2019 13:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572011924; bh=3SoKi6IzLISdFNp1aPaetavHCeQsuyyi5mZ5Hv6IBRs=; h=From:To:Cc:Subject:Date:From; b=o81kMqQevv3otWh0HExWlM8yQPaP5lxATU2QwymNr+aNCteBiFsJNH35tpwBEoHgT NUbD29Q2LujDrKaid7uxpv0sbkn2eCGwz9aRMLsNhgegvGR9KefEkZzuhDASJ/eBea IrlRNlZtb/WLoDfcQj2thmzfD/ROJ6DVvv0/xvE4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Patrick Talbert , Bjorn Helgaas , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 01/16] PCI/ASPM: Do not initialize link state when aspm_disabled is set Date: Fri, 25 Oct 2019 09:58:25 -0400 Message-Id: <20191025135842.25977-1-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 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: Patrick Talbert [ Upstream commit 17c91487364fb33797ed84022564ee7544ac4945 ] Now that ASPM is configured for *all* PCIe devices at boot, a problem is seen with systems that set the FADT NO_ASPM bit. This bit indicates that the OS should not alter the ASPM state, but when pcie_aspm_init_link_state() runs it only checks for !aspm_support_enabled. This misses the ACPI_FADT_NO_ASPM case because that is setting aspm_disabled. The result is systems may hang at boot after 1302fcf; avoidable if they boot with pcie_aspm=off (sets !aspm_support_enabled). Fix this by having aspm_init_link_state() check for either !aspm_support_enabled or acpm_disabled. Link: https://bugzilla.kernel.org/show_bug.cgi?id=201001 Fixes: 1302fcf0d03e ("PCI: Configure *all* devices, not just hot-added ones") Signed-off-by: Patrick Talbert Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/pcie/aspm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index c6a012b5ba390..6cc073f1d2d15 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -560,7 +560,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) struct pcie_link_state *link; int blacklist = !!pcie_aspm_sanity_check(pdev); - if (!aspm_support_enabled) + if (!aspm_support_enabled || aspm_disabled) return; if (pdev->link_state) -- 2.20.1