diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-09 09:33:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-09 09:33:48 -0800 |
commit | a525df0558c8684a2425847187164a3f535fd64d (patch) | |
tree | c0a347fc6374eea511dc57dc27244d5e436afb52 /Documentation | |
parent | e67548254b86a4a6e1b493f041bb7fe28ee74249 (diff) | |
parent | b0c41b8b6e43120d7c35e4709508a3d90a09646e (diff) | |
download | linux-a525df0558c8684a2425847187164a3f535fd64d.tar.gz linux-a525df0558c8684a2425847187164a3f535fd64d.tar.bz2 linux-a525df0558c8684a2425847187164a3f535fd64d.zip |
Merge tag 'powerpc-4.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"One notable fix to properly advertise our support for a new firmware
feature, caused by two series conflicting semantically but not
textually.
There's a new ioctl for the new ocxl driver, which is not a fix, but
needed to complete the userspace API and good to have before the
driver is in a released kernel.
Finally three minor selftest fixes, and a fix for intermittent build
failures for some obscure platforms, caused by a missing make
dependency.
Thanks to: Alastair D'Silva, Bharata B Rao, Guenter Roeck"
* tag 'powerpc-4.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/pseries: Fix vector5 in ibm architecture vector table
ocxl: Document the OCXL_IOCTL_GET_METADATA IOCTL
ocxl: Add get_metadata IOCTL to share OCXL information to userspace
selftests/powerpc: Skip the subpage_prot tests if the syscall is unavailable
selftests/powerpc: Fix missing clean of pmu/lib.o
powerpc/boot: Fix random libfdt related build errors
selftests/powerpc: Skip tm-trap if transactional memory is not enabled
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/accelerators/ocxl.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/accelerators/ocxl.rst b/Documentation/accelerators/ocxl.rst index 4f7af841d935..ddcc58d01cfb 100644 --- a/Documentation/accelerators/ocxl.rst +++ b/Documentation/accelerators/ocxl.rst @@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD: Associate an event fd to an AFU interrupt so that the user process can be notified when the AFU sends an interrupt. +OCXL_IOCTL_GET_METADATA: + + Obtains configuration information from the card, such at the size of + MMIO areas, the AFU version, and the PASID for the current context. + mmap ---- |