Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc3a1378 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "PCI: PCIE ASPM support" 



This reverts commit 6c723d5b.

It caused build errors on non-x86 platforms, config file confusion, and
even some boot errors on some x86-64 boxes.  All around, not quite ready
for prime-time :(

Cc: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ae9458d6

drivers/pci/pci-sysfs.c

+0 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/topology.h>

#include <linux/mm.h>

#include <linux/capability.h>

#include <linux/aspm.h>

#include "pci.h"



static int sysfs_initialized;	/* = 0 */
@@ -651,8 +650,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) 
	if (pcibios_add_platform_entries(pdev))

		goto err_rom_file;



	pcie_aspm_create_sysfs_dev_files(pdev);



	return 0;



err_rom_file:
@@ -682,8 +679,6 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) 
	if (!sysfs_initialized)

		return;



	pcie_aspm_remove_sysfs_dev_files(pdev);



	if (pdev->cfg_size < 4096)

		sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr);

	else

drivers/pci/pci.c

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/spinlock.h>

#include <linux/string.h>

#include <linux/log2.h>

#include <linux/aspm.h>

#include <asm/dma.h>	/* isa_dma_bridge_buggy */

#include "pci.h"
@@ -520,9 +519,6 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
	if (need_restore)

		pci_restore_bars(dev);



	if (dev->bus->self)

		pcie_aspm_pm_state_change(dev->bus->self);



	return 0;

}

drivers/pci/pcie/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -26,23 +26,3 @@ config HOTPLUG_PCI_PCIE 
	  When in doubt, say N.



source "drivers/pci/pcie/aer/Kconfig"
 


#

# PCI Express ASPM

#

config PCIEASPM

	bool "PCI Express ASPM support(Experimental)"

	depends on PCI && EXPERIMENTAL

	default y

	help

	  This enables PCI Express ASPM (Active State Power Management) and

	  Clock Power Management. ASPM supports state L0/L0s/L1.



	  When in doubt, say N.

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.

drivers/pci/pcie/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
# Makefile for PCI-Express PORT Driver

#



# Build PCI Express ASPM if needed

obj-$(CONFIG_PCIEASPM)		+= aspm.o



pcieportdrv-y			:= portdrv_core.o portdrv_pci.o portdrv_bus.o



obj-$(CONFIG_PCIEPORTBUS)	+= pcieportdrv.o

drivers/pci/pcie/aspm.c

deleted100644 → 0
+0 −802

File deleted.

Preview size limit exceeded, changes collapsed.