forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'linus/master' into rdma.git for-next
rdma.git merge resolution for the 4.19 merge window
Conflicts:
drivers/infiniband/core/rdma_core.c
- Use the rdma code and revise with the new spelling for
atomic_fetch_add_unless
drivers/nvme/host/rdma.c
- Replace max_sge with max_send_sge in new blk code
drivers/nvme/target/rdma.c
- Use the blk code and revise to use NULL for ib_post_recv when
appropriate
- Replace max_sge with max_recv_sge in new blk code
net/rds/ib_send.c
- Use the net code and revise to use NULL for ib_post_recv when
appropriate
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>- Loading branch information
Showing
7,051 changed files
with
339,349 additions
and
128,882 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| ========================== | ||
| PCIe Device AER statistics | ||
| ========================== | ||
| These attributes show up under all the devices that are AER capable. These | ||
| statistical counters indicate the errors "as seen/reported by the device". | ||
| Note that this may mean that if an endpoint is causing problems, the AER | ||
| counters may increment at its link partner (e.g. root port) because the | ||
| errors may be "seen" / reported by the link partner and not the | ||
| problematic endpoint itself (which may report all counters as 0 as it never | ||
| saw any problems). | ||
|
|
||
| Where: /sys/bus/pci/devices/<dev>/aer_dev_correctable | ||
| Date: July 2018 | ||
| Kernel Version: 4.19.0 | ||
| Contact: linux-pci@vger.kernel.org, rajatja@google.com | ||
| Description: List of correctable errors seen and reported by this | ||
| PCI device using ERR_COR. Note that since multiple errors may | ||
| be reported using a single ERR_COR message, thus | ||
| TOTAL_ERR_COR at the end of the file may not match the actual | ||
| total of all the errors in the file. Sample output: | ||
| ------------------------------------------------------------------------- | ||
| localhost /sys/devices/pci0000:00/0000:00:1c.0 # cat aer_dev_correctable | ||
| Receiver Error 2 | ||
| Bad TLP 0 | ||
| Bad DLLP 0 | ||
| RELAY_NUM Rollover 0 | ||
| Replay Timer Timeout 0 | ||
| Advisory Non-Fatal 0 | ||
| Corrected Internal Error 0 | ||
| Header Log Overflow 0 | ||
| TOTAL_ERR_COR 2 | ||
| ------------------------------------------------------------------------- | ||
|
|
||
| Where: /sys/bus/pci/devices/<dev>/aer_dev_fatal | ||
| Date: July 2018 | ||
| Kernel Version: 4.19.0 | ||
| Contact: linux-pci@vger.kernel.org, rajatja@google.com | ||
| Description: List of uncorrectable fatal errors seen and reported by this | ||
| PCI device using ERR_FATAL. Note that since multiple errors may | ||
| be reported using a single ERR_FATAL message, thus | ||
| TOTAL_ERR_FATAL at the end of the file may not match the actual | ||
| total of all the errors in the file. Sample output: | ||
| ------------------------------------------------------------------------- | ||
| localhost /sys/devices/pci0000:00/0000:00:1c.0 # cat aer_dev_fatal | ||
| Undefined 0 | ||
| Data Link Protocol 0 | ||
| Surprise Down Error 0 | ||
| Poisoned TLP 0 | ||
| Flow Control Protocol 0 | ||
| Completion Timeout 0 | ||
| Completer Abort 0 | ||
| Unexpected Completion 0 | ||
| Receiver Overflow 0 | ||
| Malformed TLP 0 | ||
| ECRC 0 | ||
| Unsupported Request 0 | ||
| ACS Violation 0 | ||
| Uncorrectable Internal Error 0 | ||
| MC Blocked TLP 0 | ||
| AtomicOp Egress Blocked 0 | ||
| TLP Prefix Blocked Error 0 | ||
| TOTAL_ERR_FATAL 0 | ||
| ------------------------------------------------------------------------- | ||
|
|
||
| Where: /sys/bus/pci/devices/<dev>/aer_dev_nonfatal | ||
| Date: July 2018 | ||
| Kernel Version: 4.19.0 | ||
| Contact: linux-pci@vger.kernel.org, rajatja@google.com | ||
| Description: List of uncorrectable nonfatal errors seen and reported by this | ||
| PCI device using ERR_NONFATAL. Note that since multiple errors | ||
| may be reported using a single ERR_FATAL message, thus | ||
| TOTAL_ERR_NONFATAL at the end of the file may not match the | ||
| actual total of all the errors in the file. Sample output: | ||
| ------------------------------------------------------------------------- | ||
| localhost /sys/devices/pci0000:00/0000:00:1c.0 # cat aer_dev_nonfatal | ||
| Undefined 0 | ||
| Data Link Protocol 0 | ||
| Surprise Down Error 0 | ||
| Poisoned TLP 0 | ||
| Flow Control Protocol 0 | ||
| Completion Timeout 0 | ||
| Completer Abort 0 | ||
| Unexpected Completion 0 | ||
| Receiver Overflow 0 | ||
| Malformed TLP 0 | ||
| ECRC 0 | ||
| Unsupported Request 0 | ||
| ACS Violation 0 | ||
| Uncorrectable Internal Error 0 | ||
| MC Blocked TLP 0 | ||
| AtomicOp Egress Blocked 0 | ||
| TLP Prefix Blocked Error 0 | ||
| TOTAL_ERR_NONFATAL 0 | ||
| ------------------------------------------------------------------------- | ||
|
|
||
| ============================ | ||
| PCIe Rootport AER statistics | ||
| ============================ | ||
| These attributes show up under only the rootports (or root complex event | ||
| collectors) that are AER capable. These indicate the number of error messages as | ||
| "reported to" the rootport. Please note that the rootports also transmit | ||
| (internally) the ERR_* messages for errors seen by the internal rootport PCI | ||
| device, so these counters include them and are thus cumulative of all the error | ||
| messages on the PCI hierarchy originating at that root port. | ||
|
|
||
| Where: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_cor | ||
| Date: July 2018 | ||
| Kernel Version: 4.19.0 | ||
| Contact: linux-pci@vger.kernel.org, rajatja@google.com | ||
| Description: Total number of ERR_COR messages reported to rootport. | ||
|
|
||
| Where: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_fatal | ||
| Date: July 2018 | ||
| Kernel Version: 4.19.0 | ||
| Contact: linux-pci@vger.kernel.org, rajatja@google.com | ||
| Description: Total number of ERR_FATAL messages reported to rootport. | ||
|
|
||
| Where: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_nonfatal | ||
| Date: July 2018 | ||
| Kernel Version: 4.19.0 | ||
| Contact: linux-pci@vger.kernel.org, rajatja@google.com | ||
| Description: Total number of ERR_NONFATAL messages reported to rootport. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
Documentation/ABI/testing/sysfs-driver-bd9571mwv-regulator
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| What: /sys/bus/i2c/devices/.../bd9571mwv-regulator.*.auto/backup_mode | ||
| Date: Jul 2018 | ||
| KernelVersion: 4.19 | ||
| Contact: Geert Uytterhoeven <geert+renesas@glider.be> | ||
| Description: Read/write the current state of DDR Backup Mode, which controls | ||
| if DDR power rails will be kept powered during system suspend. | ||
| ("on"/"1" = enabled, "off"/"0" = disabled). | ||
| Two types of power switches (or control signals) can be used: | ||
| A. With a momentary power switch (or pulse signal), DDR | ||
| Backup Mode is enabled by default when available, as the | ||
| PMIC will be configured only during system suspend. | ||
| B. With a toggle power switch (or level signal), the | ||
| following steps must be followed exactly: | ||
| 1. Configure PMIC for backup mode, to change the role of | ||
| the accessory power switch from a power switch to a | ||
| wake-up switch, | ||
| 2. Switch accessory power switch off, to prepare for | ||
| system suspend, which is a manual step not controlled | ||
| by software, | ||
| 3. Suspend system, | ||
| 4. Switch accessory power switch on, to resume the | ||
| system. | ||
| DDR Backup Mode must be explicitly enabled by the user, | ||
| to invoke step 1. | ||
| See also Documentation/devicetree/bindings/mfd/bd9571mwv.txt. | ||
| Users: User space applications for embedded boards equipped with a | ||
| BD9571MWV PMIC. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.