Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver patch pull request for 5.1-rc1. The largest thing by far is the new habanalabs driver for their AI accelerator chip. For now it is in the drivers/misc directory but will probably move to a new directory soon along with other drivers of this type. Other than that, just the usual set of individual driver updates and fixes. There's an "odd" merge in here from the DRM tree that they asked me to do as the MEI driver is starting to interact with the i915 driver, and it needed some coordination. All of those patches have been properly acked by the relevant subsystem maintainers. All of these have been in linux-next with no reported issues, most for quite some time" * tag 'char-misc-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (219 commits) habanalabs: adjust Kconfig to fix build errors habanalabs: use %px instead of %p in error print habanalabs: use do_div for 64-bit divisions intel_th: gth: Fix an off-by-one in output unassigning habanalabs: fix little-endian<->cpu conversion warnings habanalabs: use NULL to initialize array of pointers habanalabs: fix little-endian<->cpu conversion warnings habanalabs: soft-reset device if context-switch fails habanalabs: print pointer using %p habanalabs: fix memory leak with CBs with unaligned size habanalabs: return correct error code on MMU mapping failure habanalabs: add comments in uapi/misc/habanalabs.h habanalabs: extend QMAN0 job timeout habanalabs: set DMA0 completion to SOB 1007 habanalabs: fix validation of WREG32 to DMA completion habanalabs: fix mmu cache registers init habanalabs: disable CPU access on timeouts habanalabs: add MMU DRAM default page mapping habanalabs: Dissociate RAZWI info from event types misc/habanalabs: adjust Kconfig to fix build errors ...
Showing the changes to include/uapi/linux (2 of 315 files). Show all
Unified · Split
| @@ -41,6 +41,14 @@ enum { · 40 unmodified lines | ||
| 41 | 41 | enum { |
| 42 | 42 | FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff, |
| 43 | 43 | FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100, |
| 44 | + | |
| 45 | + /** | |
| 46 | + * @FLAT_BINDER_FLAG_TXN_SECURITY_CTX: request security contexts | |
| 47 | + * | |
| 48 | + * Only when set, causes senders to include their security | |
| 49 | + * context | |
| 50 | + */ | |
| 51 | + FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000, | |
| 44 | 52 | }; |
| 45 | 53 | |
| 46 | 54 | #ifdef BINDER_IPC_32BIT |
| @@ -218,6 +226,7 @@ struct binder_node_info_for_ref { · 171 unmodified lines | ||
| 218 | 226 | #define BINDER_VERSION _IOWR('b', 9, struct binder_version) |
| 219 | 227 | #define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info) |
| 220 | 228 | #define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref) |
| 229 | +#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object) | |
| 221 | 230 | |
| 222 | 231 | /* |
| 223 | 232 | * NOTE: Two special error codes you should check for when calling |
| @@ -276,6 +285,11 @@ struct binder_transaction_data { · 52 unmodified lines | ||
| 276 | 285 | } data; |
| 277 | 286 | }; |
| 278 | 287 | |
| 288 | +struct binder_transaction_data_secctx { | |
| 289 | + struct binder_transaction_data transaction_data; | |
| 290 | + binder_uintptr_t secctx; | |
| 291 | +}; | |
| 292 | + | |
| 279 | 293 | struct binder_transaction_data_sg { |
| 280 | 294 | struct binder_transaction_data transaction_data; |
| 281 | 295 | binder_size_t buffers_size; |
| @@ -311,6 +325,11 @@ enum binder_driver_return_protocol { · 29 unmodified lines | ||
| 311 | 325 | BR_OK = _IO('r', 1), |
| 312 | 326 | /* No parameters! */ |
| 313 | 327 | |
| 328 | + BR_TRANSACTION_SEC_CTX = _IOR('r', 2, | |
| 329 | + struct binder_transaction_data_secctx), | |
| 330 | + /* | |
| 331 | + * binder_transaction_data_secctx: the received command. | |
| 332 | + */ | |
| 314 | 333 | BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data), |
| 315 | 334 | BR_REPLY = _IOR('r', 3, struct binder_transaction_data), |
| 316 | 335 | /* |
| @@ -19,7 +19,9 @@ · 18 unmodified lines | ||
| 19 | 19 | #define PMU_POWER_CTRL 0x11 /* control power of some devices */ |
| 20 | 20 | #define PMU_ADB_CMD 0x20 /* send ADB packet */ |
| 21 | 21 | #define PMU_ADB_POLL_OFF 0x21 /* disable ADB auto-poll */ |
| 22 | +#define PMU_WRITE_XPRAM 0x32 /* write eXtended Parameter RAM */ | |
| 22 | 23 | #define PMU_WRITE_NVRAM 0x33 /* write non-volatile RAM */ |
| 24 | +#define PMU_READ_XPRAM 0x3a /* read eXtended Parameter RAM */ | |
| 23 | 25 | #define PMU_READ_NVRAM 0x3b /* read non-volatile RAM */ |
| 24 | 26 | #define PMU_SET_RTC 0x30 /* set real-time clock */ |
| 25 | 27 | #define PMU_READ_RTC 0x38 /* read real-time clock */ |