From patchwork Sun May 18 08:05:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Robert P. J. Day" X-Patchwork-Id: 4197601 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F20D0BEEAB for ; Sun, 18 May 2014 08:07:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7E2620253 for ; Sun, 18 May 2014 08:07:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53BC5201E7 for ; Sun, 18 May 2014 08:07:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbaERIHg (ORCPT ); Sun, 18 May 2014 04:07:36 -0400 Received: from astoria.ccjclearline.com ([64.235.106.9]:49805 "EHLO astoria.ccjclearline.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbaERIH2 (ORCPT ); Sun, 18 May 2014 04:07:28 -0400 Received: from [99.240.204.5] (port=47211 helo=crashcourse.ca) by astoria.ccjclearline.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80) (envelope-from ) id 1Wlw82-00006m-Ii for linux-pci@vger.kernel.org; Sun, 18 May 2014 04:07:30 -0400 Date: Sun, 18 May 2014 04:05:06 -0400 (EDT) From: "Robert P. J. Day" X-X-Sender: rpjday@localhost To: Linux PCI mailing list Subject: [PATCH] Clean up PCI-related Kconfig files with "if" and fix "help" Message-ID: User-Agent: Alpine 2.11 (LFD 23 2013-08-11) MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - astoria.ccjclearline.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - crashcourse.ca X-Source: X-Source-Args: X-Source-Dir: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify some of the PCI-related Kconfig files by replacing numerous explicit dependencies with "if" wrappers" * PCI * PCIEPORTBUS * PCIEASPM and fix some "help" typoes and formatting. None of this should cause any functional change. Signed-off-by: Robert P. J. Day --- Not compile-tested, but "make menuconfig" tested. diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 893503f..cc48eb4 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -1,24 +1,26 @@ # # PCI configuration # + +if PCI + config PCI_MSI bool "Message Signaled Interrupts (MSI and MSI-X)" - depends on PCI help - This allows device drivers to enable MSI (Message Signaled - Interrupts). Message Signaled Interrupts enable a device to - generate an interrupt using an inbound Memory Write on its - PCI bus instead of asserting a device IRQ pin. + This allows device drivers to enable MSI (Message Signaled + Interrupts). Message Signaled Interrupts enable a device to + generate an interrupt using an inbound Memory Write on its + PCI bus instead of asserting a device IRQ pin. - Use of PCI MSI interrupts can be disabled at kernel boot time - by using the 'pci=nomsi' option. This disables MSI for the - entire system. + Use of PCI MSI interrupts can be disabled at kernel boot time + by using the 'pci=nomsi' option. This disables MSI for the + entire system. - If you don't know what to do here, say Y. + If you don't know what to do here, say Y. config PCI_DEBUG bool "PCI Debugging" - depends on PCI && DEBUG_KERNEL + depends on DEBUG_KERNEL help Say Y here if you want the PCI core to produce a bunch of debug messages to the system log. Select this if you are having a @@ -28,7 +30,6 @@ config PCI_DEBUG config PCI_REALLOC_ENABLE_AUTO bool "Enable PCI resource re-allocation detection" - depends on PCI help Say Y here if you want the PCI core to detect if PCI resource re-allocation needs to be enabled. You can always use pci=realloc=on @@ -41,7 +42,6 @@ config PCI_REALLOC_ENABLE_AUTO config PCI_STUB tristate "PCI Stub driver" - depends on PCI help Say Y or M here if you want be able to reserve a PCI device when it is going to be assigned to a guest operating system. @@ -50,7 +50,7 @@ config PCI_STUB config XEN_PCIDEV_FRONTEND tristate "Xen PCI Frontend" - depends on PCI && X86 && XEN + depends on X86 && XEN select PCI_XEN select XEN_XENBUS_FRONTEND default y @@ -61,18 +61,17 @@ config XEN_PCIDEV_FRONTEND config HT_IRQ bool "Interrupts on hypertransport devices" default y - depends on PCI && X86_LOCAL_APIC && X86_IO_APIC + depends on X86_LOCAL_APIC && X86_IO_APIC help - This allows native hypertransport devices to use interrupts. + This allows native hypertransport devices to use interrupts. - If unsure say Y. + If unsure say Y. config PCI_ATS bool config PCI_IOV bool "PCI IOV support" - depends on PCI select PCI_ATS help I/O Virtualization is a PCI feature supported by some devices @@ -83,7 +82,6 @@ config PCI_IOV config PCI_PRI bool "PCI PRI support" - depends on PCI select PCI_ATS help PRI is the PCI Page Request Interface. It allows PCI devices that are @@ -93,7 +91,6 @@ config PCI_PRI config PCI_PASID bool "PCI PASID support" - depends on PCI select PCI_ATS help Process Address Space Identifiers (PASIDs) can be used by PCI devices @@ -106,7 +103,6 @@ config PCI_PASID config PCI_IOAPIC bool "PCI IO-APIC hotplug support" if X86 - depends on PCI depends on ACPI depends on X86_IO_APIC default !X86 @@ -116,3 +112,5 @@ config PCI_LABEL select NLS source "drivers/pci/host/Kconfig" + +endif # PCI diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index df8caec..334d50d 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -81,7 +81,7 @@ config HOTPLUG_PCI_CPCI_ZT5550 tristate "Ziatech ZT5550 CompactPCI Hotplug driver" depends on HOTPLUG_PCI_CPCI && X86 help - Say Y here if you have an Performance Technologies (formerly Intel, + Say Y here if you have a Performance Technologies (formerly Intel, formerly just Ziatech) Ziatech ZT5550 CompactPCI system card. To compile this driver as a module, choose M here: the diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index 7958e59..4a404f3 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig @@ -10,12 +10,14 @@ config PCIEPORTBUS Power Management Event support and Virtual Channel support to run on PCI Express Ports (Root or Switch). +if PCIEPORTBUS + # # Include service Kconfig here # config HOTPLUG_PCI_PCIE bool "PCI Express Hotplug driver" - depends on HOTPLUG_PCI && PCIEPORTBUS + depends on HOTPLUG_PCI help Say Y here if you have a motherboard that supports PCI Express Native Hotplug @@ -29,7 +31,6 @@ source "drivers/pci/pcie/aer/Kconfig" # config PCIEASPM bool "PCI Express ASPM control" if EXPERT - depends on PCI && PCIEPORTBUS default y help This enables OS control over PCI Express ASPM (Active State @@ -44,9 +45,11 @@ config PCIEASPM /sys/module/pcie_aspm/parameters/policy When in doubt, say Y. + +if PCIEASPM + 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 @@ -55,28 +58,28 @@ config PCIEASPM_DEBUG choice prompt "Default ASPM policy" default PCIEASPM_DEFAULT - depends on PCIEASPM config PCIEASPM_DEFAULT bool "BIOS default" - depends on PCIEASPM help Use the BIOS defaults for PCI Express ASPM. config PCIEASPM_POWERSAVE bool "Powersave" - depends on PCIEASPM help Enable PCI Express ASPM L0s and L1 where possible, even if the BIOS did not. config PCIEASPM_PERFORMANCE bool "Performance" - depends on PCIEASPM help Disable PCI Express ASPM L0s and L1, even if the BIOS enabled them. endchoice +endif # PCIEASPM + config PCIE_PME def_bool y - depends on PCIEPORTBUS && PM_RUNTIME + depends on PM_RUNTIME + +endif # PCIEPORTBUS