• Bjorn Helgaas's avatar
    Merge branch 'pci/aer' · 3c3ab37f
    Bjorn Helgaas authored
      - Decode AER errors with names similar to "lspci" (Tyler Baicar)
    
      - Expose AER statistics in sysfs (Rajat Jain)
    
      - Clear AER status bits selectively based on the type of recovery (Oza
        Pawandeep)
    
      - Honor "pcie_ports=native" even if HEST sets FIRMWARE_FIRST (Alexandru
        Gagniuc)
    
      - Don't clear AER status bits if we're using the "Firmware-First"
        strategy where firmware owns the registers (Alexandru Gagniuc)
    
    * pci/aer:
      PCI/AER: Don't clear AER bits if error handling is Firmware-First
      PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition
      PCI/portdrv: Remove pcie_portdrv_err_handler.slot_reset
      PCI/AER: Clear device status bits during ERR_COR handling
      PCI/AER: Clear device status bits during ERR_FATAL and ERR_NONFATAL
      PCI/AER: Remove ERR_FATAL code from ERR_NONFATAL path
      PCI/AER: Factor out ERR_NONFATAL status bit clearing
      PCI/AER: Clear only ERR_NONFATAL bits during non-fatal recovery
      PCI/AER: Clear only ERR_FATAL status bits during fatal recovery
      PCI/AER: Honor "pcie_ports=native" even if HEST sets FIRMWARE_FIRST
      PCI/AER: Add sysfs attributes for rootport cumulative stats
      PCI/AER: Add sysfs attributes to provide AER stats and breakdown
      PCI/AER: Define aer_stats structure for AER capable devices
      PCI/AER: Move internal declarations to drivers/pci/pci.h
      PCI/AER: Adopt lspci names for AER error decoding
      PCI/AER: Expose internal API for obtaining AER information
    
    # Conflicts:
    #	drivers/pci/pci.h
    3c3ab37f
err.c 10.4 KB