mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
894020fdd8
The AER interfaces to clear error status registers were a confusing mess:
- pci_cleanup_aer_uncorrect_error_status() cleared non-fatal errors
from the Uncorrectable Error Status register.
- pci_aer_clear_fatal_status() cleared fatal errors from the
Uncorrectable Error Status register.
- pci_cleanup_aer_error_status_regs() cleared the Root Error Status
register (for Root Ports), the Uncorrectable Error Status register,
and the Correctable Error Status register.
Rename them to make them consistent:
From To
---------------------------------------- -------------------------------
pci_cleanup_aer_uncorrect_error_status() pci_aer_clear_nonfatal_status()
pci_aer_clear_fatal_status() pci_aer_clear_fatal_status()
pci_cleanup_aer_error_status_regs() pci_aer_clear_status()
Since pci_cleanup_aer_error_status_regs() (renamed to
pci_aer_clear_status()) is only used within drivers/pci/, move the
declaration from <linux/aer.h> to drivers/pci/pci.h.
[bhelgaas: commit log, add renames]
Link: https://lore.kernel.org/r/d1310a75dc3d28f7e8da4e99c45fbd3e60fe238e.1585000084.git.sathyanarayanan.kuppuswamy@linux.intel.com
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
73 lines
1.8 KiB
C
73 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) 2006 Intel Corp.
|
|
* Tom Long Nguyen (tom.l.nguyen@intel.com)
|
|
* Zhang Yanmin (yanmin.zhang@intel.com)
|
|
*/
|
|
|
|
#ifndef _AER_H_
|
|
#define _AER_H_
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
|
|
#define AER_NONFATAL 0
|
|
#define AER_FATAL 1
|
|
#define AER_CORRECTABLE 2
|
|
#define DPC_FATAL 3
|
|
|
|
struct pci_dev;
|
|
|
|
struct aer_header_log_regs {
|
|
unsigned int dw0;
|
|
unsigned int dw1;
|
|
unsigned int dw2;
|
|
unsigned int dw3;
|
|
};
|
|
|
|
struct aer_capability_regs {
|
|
u32 header;
|
|
u32 uncor_status;
|
|
u32 uncor_mask;
|
|
u32 uncor_severity;
|
|
u32 cor_status;
|
|
u32 cor_mask;
|
|
u32 cap_control;
|
|
struct aer_header_log_regs header_log;
|
|
u32 root_command;
|
|
u32 root_status;
|
|
u16 cor_err_source;
|
|
u16 uncor_err_source;
|
|
};
|
|
|
|
#if defined(CONFIG_PCIEAER)
|
|
/* PCIe port driver needs this function to enable AER */
|
|
int pci_enable_pcie_error_reporting(struct pci_dev *dev);
|
|
int pci_disable_pcie_error_reporting(struct pci_dev *dev);
|
|
int pci_aer_clear_nonfatal_status(struct pci_dev *dev);
|
|
void pci_save_aer_state(struct pci_dev *dev);
|
|
void pci_restore_aer_state(struct pci_dev *dev);
|
|
#else
|
|
static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
static inline void pci_save_aer_state(struct pci_dev *dev) {}
|
|
static inline void pci_restore_aer_state(struct pci_dev *dev) {}
|
|
#endif
|
|
|
|
void cper_print_aer(struct pci_dev *dev, int aer_severity,
|
|
struct aer_capability_regs *aer);
|
|
int cper_severity_to_aer(int cper_severity);
|
|
void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
|
|
int severity, struct aer_capability_regs *aer_regs);
|
|
#endif //_AER_H_
|
|
|