From patchwork Thu May 10 23:39:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 911626 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="HrZJsj/B"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hqSd5qxPz9s16 for ; Fri, 11 May 2018 09:39:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750830AbeEJXj1 (ORCPT ); Thu, 10 May 2018 19:39:27 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:41156 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750818AbeEJXj0 (ORCPT ); Thu, 10 May 2018 19:39:26 -0400 Received: by mail-pl0-f68.google.com with SMTP id az12-v6so2175720plb.8 for ; Thu, 10 May 2018 16:39:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VxVV3NBylbDynk6cha6yTCjWyMJ4wXsVowQ+OTWh2AM=; b=HrZJsj/BNlPjykw0dWk8UH1xB4THGV5YSOK28ut+qbyU4YwHzhP3LsJPG5sbdEeeyM u9tgn5JwOAOrmUL6Hkhu58T3S2KkgHnqW1qSptXaT+XQf7iCkX/pHXFYcmwlT5IpI6b6 oKml7Mcio6Flfk8GoPRHmpWDSQMBv97akTbEbcyeE0gUuE5zP3TZfahIWaTJLiLPYNCU koG34ytJbr9I1NzKHNcr8a9bj7tVphH142nN7kKE86O1ybEIIrfpOxNvLipoYsVF4IfQ n4NXFOiuPBBdPK6Ifw4R1VGEz+6AjlLMxo30TK6Jym5S09YgvcfZQhYhh6iG4qpPjqq7 dHXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VxVV3NBylbDynk6cha6yTCjWyMJ4wXsVowQ+OTWh2AM=; b=QH1YbDZ3A7DRPcJixHsKX/+xnaeax34e+1VzWCq/6aAL6GISuf0ICJeGpnBDMTw6PF mpk+KGk4I/L+JkZEppIf344VIzD3ZRFmfgjvO0ooXrKCmo4faWKO1WSp7hKct/LODB2q o62VVcTX/S9/Lu+2JjVQAiEPUlweKV1zB+SsYFlq1rfAmlQg67GMDC4htcW4tkqdIZNB tceqBpOdZ+407W0yc4UWHrHoCj9Jj6zJXiEPYromo51p3va0wxbtuS/dtoiPWLUsItFb teuxHpUcHpv/kOf7bolICdJJIOgilFoiG/PooI4rUQA9IcNqdEX8XCx9D8enzXLMIKjz AkPw== X-Gm-Message-State: ALKqPwd54rSrvg3IWfTO4U7Bd/EfCdZvWFAEmm6kFshwP9b9OEZFg6Wa JudQfFlJlFUP/J9KEm34Xyuuig== X-Google-Smtp-Source: AB8JxZpHOcq2a30zoR3vf2TqZUp0rlQqU9GNwPzTSKeUGh8whwD3T5nqx9Z99KHi9O/8T30/LHZcWQ== X-Received: by 2002:a17:902:322:: with SMTP id 31-v6mr3178342pld.122.1525995565886; Thu, 10 May 2018 16:39:25 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([2620:0:1000:1501:dc81:9a9e:fdee:decf]) by smtp.gmail.com with ESMTPSA id y29-v6sm4720167pff.42.2018.05.10.16.39.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 May 2018 16:39:25 -0700 (PDT) From: Rajat Jain To: Bjorn Helgaas , Rajat Jain , Keith Busch , Vidya Sagar , Philippe Ombredanne , Kees Cook , "Gustavo A. R. Silva" , Ard Biesheuvel , Sinan Kaya , Frederick Lawler , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, mayurkumar.patel@intel.com Cc: rajatxjain@gmail.com Subject: [PATCH v2] pci/aspm: Remove CONFIG_PCIEASPM_DEBUG Date: Thu, 10 May 2018 16:39:12 -0700 Message-Id: <20180510233912.96454-1-rajatja@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180508230148.121852-1-rajatja@google.com> References: <20180508230148.121852-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently, the linux kernel disables ASPM when a device is removed from the kernel. But it is not enabled again when a new device is added on that slot even if it was originally enabled (by the BIOS) when the system booted up (assuming POLICY_DEFAULT). This was earlier discussed here: https://www.spinics.net/lists/linux-pci/msg60212.html And some suggestions from Bjorn here: https://www.spinics.net/lists/linux-pci/msg60541.html This patch picks up one of the suggestion, to remove the CONFIG_PCIEASPM_DEBUG and thus make the code always avilable. This provides control to userspace to control ASPM on a per slot / device basis using sysfs interface. Signed-off-by: Rajat Jain Reviewed-by: Sinan Kaya --- v2: provide function definitions for !CONFIG_PCIEASPM case drivers/pci/pci.h | 8 ++------ drivers/pci/pcie/Kconfig | 8 -------- drivers/pci/pcie/aspm.c | 2 -- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 023f7cf25bff..b953b2349ca1 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -358,17 +358,13 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev); void pcie_aspm_exit_link_state(struct pci_dev *pdev); void pcie_aspm_pm_state_change(struct pci_dev *pdev); void pcie_aspm_powersave_config_link(struct pci_dev *pdev); +void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev); +void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev); #else static inline void pcie_aspm_init_link_state(struct pci_dev *pdev) { } static inline void pcie_aspm_exit_link_state(struct pci_dev *pdev) { } static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev) { } static inline void pcie_aspm_powersave_config_link(struct pci_dev *pdev) { } -#endif - -#ifdef CONFIG_PCIEASPM_DEBUG -void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev); -void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev); -#else static inline void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev) { } static inline void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev) { } #endif diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index b12e28b3d8f9..089b9f559d88 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig @@ -46,14 +46,6 @@ config PCIEASPM When in doubt, say Y. -config PCIEASPM_DEBUG - bool "Debug PCI Express ASPM" - depends on PCIEASPM - default n - help - This enables PCI Express ASPM debug support. It will add per-device - interface to control ASPM. - choice prompt "Default ASPM policy" default PCIEASPM_DEFAULT diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index c687c817b47d..8ffc13d42baa 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1161,7 +1161,6 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp) module_param_call(policy, pcie_aspm_set_policy, pcie_aspm_get_policy, NULL, 0644); -#ifdef CONFIG_PCIEASPM_DEBUG static ssize_t link_state_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -1264,7 +1263,6 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev) sysfs_remove_file_from_group(&pdev->dev.kobj, &dev_attr_clk_ctl.attr, power_group); } -#endif static int __init pcie_aspm_disable(char *str) {