Commit ce4c7b24 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/aer-squash' 

  - squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)

* pci/aer-squash:
  PCI/AER: Use "PCI Express" consistently in Kconfig text
  PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
  PCI/AER: Squash Kconfig.debug into Kconfig
  PCI/AER: Move private AER things to aerdrv.c
  PCI/AER: Move aer_irq() declaration to portdrv.h
  PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h
  PCI/AER: Remove duplicate pcie_port_bus_type declaration
  PCI/AER: Squash ecrc.c into aerdrv.c
  PCI/AER: Squash aerdrv_acpi.c into aerdrv.c
  PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
  PCI/AER: Squash aerdrv_core.c into aerdrv.c
  PCI/AER: Reorder code to group probe/remove stuff together
  PCI/AER: Remove forward declarations
parents 3b3191df 0b15f1e3

drivers/pci/pcie/Kconfig

+38 −3
Original line number Diff line number Diff line
@@ -23,7 +23,42 @@ config HOTPLUG_PCI_PCIE 


	  When in doubt, say N.



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

config PCIEAER

	bool "PCI Express Advanced Error Reporting support"

	depends on PCIEPORTBUS

	select RAS

	default y

	help

	  This enables PCI Express Root Port Advanced Error Reporting

	  (AER) driver support. Error reporting messages sent to Root

	  Port will be handled by PCI Express AER driver.



config PCIEAER_INJECT

	tristate "PCI Express error injection support"

	depends on PCIEAER

	default n

	help

	  This enables PCI Express Root Port Advanced Error Reporting

	  (AER) software error injector.



	  Debugging AER code is quite difficult because it is hard

	  to trigger various real hardware errors. Software-based

	  error injection can fake almost all kinds of errors with the

	  help of a user space helper tool aer-inject, which can be

	  gotten from:

	     http://www.kernel.org/pub/linux/utils/pci/aer-inject/



#

# PCI Express ECRC

#

config PCIE_ECRC

	bool "PCI Express ECRC settings control"

	depends on PCIEAER

	help

	  Used to override firmware/bios settings for PCI Express ECRC

	  (transaction layer end-to-end CRC checking).



	  When in doubt, say N.



#

# PCI Express ASPM
@@ -92,7 +127,7 @@ config PCIE_PME 
	depends on PCIEPORTBUS && PM



config PCIE_DPC

	bool "PCIe Downstream Port Containment support"

	bool "PCI Express Downstream Port Containment support"

	depends on PCIEPORTBUS && PCIEAER

	default n

	help
@@ -103,7 +138,7 @@ config PCIE_DPC 
	  it is safe to answer N.



config PCIE_PTM

	bool "PCIe Precision Time Measurement support"

	bool "PCI Express Precision Time Measurement support"

	default n

	depends on PCIEPORTBUS

	help

drivers/pci/pcie/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ pcieportdrv-y := portdrv_core.o portdrv_pci.o err.o 
obj-$(CONFIG_PCIEPORTBUS)	+= pcieportdrv.o



obj-$(CONFIG_PCIEASPM)		+= aspm.o

obj-$(CONFIG_PCIEAER)		+= aer/

obj-$(CONFIG_PCIEAER)		+= aer.o

obj-$(CONFIG_PCIEAER_INJECT)	+= aer_inject.o

obj-$(CONFIG_PCIE_PME)		+= pme.o

obj-$(CONFIG_PCIE_DPC)		+= dpc.o

obj-$(CONFIG_PCIE_PTM)		+= ptm.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE