From patchwork Thu Apr 7 13:16:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 12805234 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EA40C433F5 for ; Thu, 7 Apr 2022 13:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231917AbiDGNTj (ORCPT ); Thu, 7 Apr 2022 09:19:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241658AbiDGNTi (ORCPT ); Thu, 7 Apr 2022 09:19:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE2751CABFD; Thu, 7 Apr 2022 06:17:34 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KZ21w02ShzgYFr; Thu, 7 Apr 2022 21:15:48 +0800 (CST) Received: from localhost.localdomain (10.67.164.66) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 7 Apr 2022 21:17:33 +0800 From: Yicong Yang To: , , CC: , , , , Subject: [PATCH] PCI/ACPI: Decouple the negotiation of ASPM and other PCIe services Date: Thu, 7 Apr 2022 21:16:02 +0800 Message-ID: <20220407131602.14727-1-yangyicong@hisilicon.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently we regard ASPM as a necessary PCIe service and if it's disabled by pcie_aspm=off we cannot enable other services like AER and hotplug. However the ASPM is just one of the PCIe services and other services mentioned no dependency on this. So this patch decouples the negotiation of ASPM and other PCIe services, then we can make use of other services in the absence of ASPM. Aaron Sierra tried to fix this originally: https://lore.kernel.org/linux-pci/20190702201318.GC128603@google.com/ Signed-off-by: Yicong Yang --- drivers/acpi/pci_root.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 6f9e75d14808..16fa7c5a11ad 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -37,8 +37,6 @@ static int acpi_pci_root_scan_dependent(struct acpi_device *adev) } #define ACPI_PCIE_REQ_SUPPORT (OSC_PCI_EXT_CONFIG_SUPPORT \ - | OSC_PCI_ASPM_SUPPORT \ - | OSC_PCI_CLOCK_PM_SUPPORT \ | OSC_PCI_MSI_SUPPORT) static const struct acpi_device_id root_device_ids[] = {