Skip to content

Commit 2de2f92

Browse files
committed
Merge branch 'pci/aer'
- Change pcie_aer_disable from int to bool (Hans Zhang) - Add message if AER interrupt occurs and we find more downstream devices with AER errors logged than we can process (Akshay Jindal) * pci/aer: PCI/AER: Add message when AER_MAX_MULTI_ERR_DEVICES limit is hit PCI/AER: Use bool for AER disable state tracking
2 parents 19272b3 + a6f494b commit 2de2f92

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/pci/pcie/aer.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ struct aer_info {
116116
PCI_ERR_ROOT_MULTI_COR_RCV | \
117117
PCI_ERR_ROOT_MULTI_UNCOR_RCV)
118118

119-
static int pcie_aer_disable;
119+
static bool pcie_aer_disable;
120120
static pci_ers_result_t aer_root_reset(struct pci_dev *dev);
121121

122122
void pci_no_aer(void)
123123
{
124-
pcie_aer_disable = 1;
124+
pcie_aer_disable = true;
125125
}
126126

127127
bool pci_aer_available(void)
@@ -1039,7 +1039,8 @@ static int find_device_iter(struct pci_dev *dev, void *data)
10391039
/* List this device */
10401040
if (add_error_device(e_info, dev)) {
10411041
/* We cannot handle more... Stop iteration */
1042-
/* TODO: Should print error message here? */
1042+
pci_err(dev, "Exceeded max supported (%d) devices with errors logged\n",
1043+
AER_MAX_MULTI_ERR_DEVICES);
10431044
return 1;
10441045
}
10451046

0 commit comments

Comments
 (0)