PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/ so they're next to other PCIe service drivers. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Keith Busch <keith.busch@intel.com>
This commit is contained in:
parent
adc1f22f5a
commit
4696b828ca
|
@ -23,7 +23,42 @@ config HOTPLUG_PCI_PCIE
|
|||
|
||||
When in doubt, say N.
|
||||
|
||||
source "drivers/pci/pcie/aer/Kconfig"
|
||||
config PCIEAER
|
||||
bool "Root Port 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 "PCIe AER error injector support"
|
||||
depends on PCIEAER
|
||||
default n
|
||||
help
|
||||
This enables PCI Express Root Port Advanced Error Reporting
|
||||
(AER) software error injector.
|
||||
|
||||
Debugging PCIe 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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
#include <acpi/apei.h>
|
||||
#include <ras/ras_event.h>
|
||||
|
||||
#include "../../pci.h"
|
||||
#include "../portdrv.h"
|
||||
#include "../pci.h"
|
||||
#include "portdrv.h"
|
||||
|
||||
#define AER_ERROR_SOURCES_MAX 100
|
||||
#define AER_MAX_MULTI_ERR_DEVICES 5 /* Not likely to have more */
|
|
@ -1,41 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# PCI Express Root Port Device AER Configuration
|
||||
#
|
||||
|
||||
config PCIEAER
|
||||
bool "Root Port 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 "PCIe AER error injector support"
|
||||
depends on PCIEAER
|
||||
default n
|
||||
help
|
||||
This enables PCI Express Root Port Advanced Error Reporting
|
||||
(AER) software error injector.
|
||||
|
||||
Debugging PCIe 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.
|
|
@ -1,10 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for PCI-Express Root Port Advanced Error Reporting Driver
|
||||
#
|
||||
|
||||
obj-$(CONFIG_PCIEAER) += aerdriver.o
|
||||
|
||||
aerdriver-objs := aerdrv.o
|
||||
|
||||
obj-$(CONFIG_PCIEAER_INJECT) += aer_inject.o
|
|
@ -22,7 +22,7 @@
|
|||
#include <linux/stddef.h>
|
||||
#include <linux/device.h>
|
||||
|
||||
#include "../portdrv.h"
|
||||
#include "portdrv.h"
|
||||
|
||||
/* Override the existing corrected and uncorrected error masks */
|
||||
static bool aer_mask_override;
|
Loading…
Reference in a new issue