diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-01-30 02:00:00 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-01-30 02:00:00 +0300 |
commit | 5272b7fc3a45466a01d58a3169423218e218bc4c (patch) | |
tree | 9f1dfd2323fa29beb8b5d5f27de2650411e63763 /include/net/ife.h | |
parent | cee538f6a24eefdbdb7820d3e97b120d496bb345 (diff) | |
parent | 7a30ebb9f2a253eae908cc3e1ba7daaa3bfe2bba (diff) | |
download | linux-5272b7fc3a45466a01d58a3169423218e218bc4c.tar.xz |
Merge branch 'pci/switchtec'
- Support 64-bit addressing for both streaming and coherent DMA (Wesley
Sheng)
- Read vep_vector_number with 16-bit, not 32-bit read (Logan Gunthorpe)
- Add Intercomm Notify and Upstream Error Containment support (Logan
Gunthorpe)
- Remove redundant valid PFF number count (Wesley Sheng)
- Avoid unnecessary CSR read in ISR (Wesley Sheng)
- Rename Gen3-specific constants (Logan Gunthorpe)
- Rework infrastructure to support Gen3- and Gen4-specific code (Logan
Gunthorpe)
- Add Gen4 system info register support (Logan Gunthorpe)
- Add Gen4 flash information interface support (Kelvin Cao)
- Add Gen4 MRPC GAS access permission check (Kelvin Cao)
* pci/switchtec:
PCI/switchtec: Add Gen4 device IDs
PCI/switchtec: Add Gen4 MRPC GAS access permission check
PCI/switchtec: Add Gen4 flash information interface support
PCI/switchtec: Add Gen4 system info register support
PCI/switchtec: Separate Gen3 register structures into unions
PCI/switchtec: Factor out Gen3 ioctl_flash_part_info()
PCI/switchtec: Add 'generation' variable
PCI/switchtec: Rename generation-specific constants
PCI/switchtec: Move check event ID from mask_event() to switchtec_event_isr()
PCI/switchtec: Remove redundant valid PFF number count
PCI/switchtec: Add support for Intercomm Notify and Upstream Error Containment
PCI/switchtec: Fix vep_vector_number ioread width
PCI/switchtec: Use dma_set_mask_and_coherent()
Diffstat (limited to 'include/net/ife.h')
0 files changed, 0 insertions, 0 deletions