Save and restore the AER mask, severity, capability and root command registers through the per-device saved capability store instead of a private pci_cap_saved_state buffer.
Describe the registers in aer_saved_regs[] and drive the reservation, save, and restore loops from it. Previously the three had to be kept in the same order by hand, and pci_aer_init() encoded the register count as a bare 4 or 5. Reserve the registers in pci_reserve_aer_state(), called from pci_aer_init(), and report a refused reservation. pci_aer_init() ignored the return value of pci_add_ext_cap_save_buffer(), so a failed allocation left AER state unsaved without any message. An allocation failure is now reported once by pci_saved_caps_finalize(). No other functional change intended. Signed-off-by: David Matlack <[email protected]> --- drivers/pci/pcie/aer.c | 85 +++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index d8dcd238fda1..25436bcf9fb9 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -352,54 +352,68 @@ int pci_aer_clear_status(struct pci_dev *dev) return pci_aer_raw_clear_status(dev); } -void pci_save_aer_state(struct pci_dev *dev) +/* + * AER registers saved and restored by the PCI core. PCI_ERR_ROOT_COMMAND is + * only implemented by Root Ports and Root Complex Event Collectors (PCIe + * r6.0, sec 7.8.4.9) and so must come last. + */ +static const u16 aer_saved_regs[] = { + PCI_ERR_UNCOR_MASK, + PCI_ERR_UNCOR_SEVER, + PCI_ERR_COR_MASK, + PCI_ERR_CAP, + PCI_ERR_ROOT_COMMAND, +}; + +static unsigned int aer_nr_saved_regs(struct pci_dev *dev) { - int aer = dev->aer_cap; - struct pci_cap_saved_state *save_state; - u32 *cap; + if (pcie_cap_has_rtctl(dev)) + return ARRAY_SIZE(aer_saved_regs); - if (!aer) - return; + return ARRAY_SIZE(aer_saved_regs) - 1; +} - save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_ERR); - if (!save_state) +void pci_save_aer_state(struct pci_dev *dev) +{ + unsigned int i; + + if (!dev->aer_cap) return; - cap = &save_state->cap.data[0]; - pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, cap++); - pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_SEVER, cap++); - pci_read_config_dword(dev, aer + PCI_ERR_COR_MASK, cap++); - pci_read_config_dword(dev, aer + PCI_ERR_CAP, cap++); - if (pcie_cap_has_rtctl(dev)) - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, cap++); + for (i = 0; i < aer_nr_saved_regs(dev); i++) + pci_save_cap_dword(dev, dev->aer_cap + aer_saved_regs[i]); } void pci_restore_aer_state(struct pci_dev *dev) { - int aer = dev->aer_cap; - struct pci_cap_saved_state *save_state; - u32 *cap; + unsigned int i; - if (!aer) + if (!dev->aer_cap) return; - save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_ERR); - if (!save_state) - return; + for (i = 0; i < aer_nr_saved_regs(dev); i++) + pci_restore_cap_dword(dev, dev->aer_cap + aer_saved_regs[i]); +} - cap = &save_state->cap.data[0]; - pci_write_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, *cap++); - pci_write_config_dword(dev, aer + PCI_ERR_UNCOR_SEVER, *cap++); - pci_write_config_dword(dev, aer + PCI_ERR_COR_MASK, *cap++); - pci_write_config_dword(dev, aer + PCI_ERR_CAP, *cap++); - if (pcie_cap_has_rtctl(dev)) - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, *cap++); +static void pci_reserve_aer_state(struct pci_dev *dev) +{ + unsigned int i; + int rc; + + for (i = 0; i < aer_nr_saved_regs(dev); i++) { + unsigned int off = dev->aer_cap + aer_saved_regs[i]; + + rc = pci_reserve_saved_cap(dev, off, sizeof(u32)); + if (rc) { + pci_err(dev, "unable to reserve AER save state (%pe)\n", + ERR_PTR(rc)); + return; + } + } } void pci_aer_init(struct pci_dev *dev) { - int n; - dev->aer_cap = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); if (!dev->aer_cap) return; @@ -415,14 +429,7 @@ void pci_aer_init(struct pci_dev *dev) ratelimit_state_init(&dev->aer_info->nonfatal_ratelimit, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); - /* - * We save/restore PCI_ERR_UNCOR_MASK, PCI_ERR_UNCOR_SEVER, - * PCI_ERR_COR_MASK, and PCI_ERR_CAP. Root and Root Complex Event - * Collectors also implement PCI_ERR_ROOT_COMMAND (PCIe r6.0, sec - * 7.8.4.9). - */ - n = pcie_cap_has_rtctl(dev) ? 5 : 4; - pci_add_ext_cap_save_buffer(dev, PCI_EXT_CAP_ID_ERR, sizeof(u32) * n); + pci_reserve_aer_state(dev); /* * Advisory Non-Fatal Errors are masked by default (PCIe r7.0, sec -- 2.56.0.455.g6c5a503b38-goog
