Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver update for 4.14-rc1. Lots of different stuff in here, it's been an active development cycle for some reason. Highlights are: - updated binder driver, this brings binder up to date with what shipped in the Android O release, plus some more changes that happened since then that are in the Android development trees. - coresight updates and fixes - mux driver file renames to be a bit "nicer" - intel_th driver updates - normal set of hyper-v updates and changes - small fpga subsystem and driver updates - lots of const code changes all over the driver trees - extcon driver updates - fmc driver subsystem upadates - w1 subsystem minor reworks and new features and drivers added - spmi driver updates Plus a smattering of other minor driver updates and fixes. All of these have been in linux-next with no reported issues for a while" * tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (244 commits) ANDROID: binder: don't queue async transactions to thread. ANDROID: binder: don't enqueue death notifications to thread todo. ANDROID: binder: Don't BUG_ON(!spin_is_locked()). ANDROID: binder: Add BINDER_GET_NODE_DEBUG_INFO ioctl ANDROID: binder: push new transactions to waiting threads. ANDROID: binder: remove proc waitqueue android: binder: Add page usage in binder stats android: binder: fixup crash introduced by moving buffer hdr drivers: w1: add hwmon temp support for w1_therm drivers: w1: refactor w1_slave_show to make the temp reading functionality separate drivers: w1: add hwmon support structures eeprom: idt_89hpesx: Support both ACPI and OF probing mcb: Fix an error handling path in 'chameleon_parse_cells()' MCB: add support for SC31 to mcb-lpc mux: make device_type const char: virtio: constify attribute_group structures. Documentation/ABI: document the nvmem sysfs files lkdtm: fix spelling mistake: "incremeted" -> "incremented" perf: cs-etm: Fix ETMv4 CONFIGR entry in perf.data file nvmem: include linux/err.h from header ...
Showing the changes to include/uapi (1 of 175 files). Show all
Unified · Split
| @@ -132,6 +132,7 @@ enum { · 131 unmodified lines | |||
| 132 | 132 | ||
| 133 | /* struct binder_fd_array_object - object describing an array of fds in a buffer | 133 | /* struct binder_fd_array_object - object describing an array of fds in a buffer |
| 134 | * @hdr: common header structure | 134 | * @hdr: common header structure |
| 135 | * @pad: padding to ensure correct alignment | ||
| 135 | * @num_fds: number of file descriptors in the buffer | 136 | * @num_fds: number of file descriptors in the buffer |
| 136 | * @parent: index in offset array to buffer holding the fd array | 137 | * @parent: index in offset array to buffer holding the fd array |
| 137 | * @parent_offset: start offset of fd array in the buffer | 138 | * @parent_offset: start offset of fd array in the buffer |
| @@ -152,6 +153,7 @@ enum { · 14 unmodified lines | |||
| 152 | */ | 153 | */ |
| 153 | struct binder_fd_array_object { | 154 | struct binder_fd_array_object { |
| 154 | struct binder_object_header hdr; | 155 | struct binder_object_header hdr; |
| 156 | __u32 pad; | ||
| 155 | binder_size_t num_fds; | 157 | binder_size_t num_fds; |
| 156 | binder_size_t parent; | 158 | binder_size_t parent; |
| 157 | binder_size_t parent_offset; | 159 | binder_size_t parent_offset; |
| @@ -184,6 +186,19 @@ struct binder_version { · 26 unmodified lines | |||
| 184 | #define BINDER_CURRENT_PROTOCOL_VERSION 8 | 186 | #define BINDER_CURRENT_PROTOCOL_VERSION 8 |
| 185 | #endif | 187 | #endif |
| 186 | 188 | ||
| 189 | /* | ||
| 190 | * Use with BINDER_GET_NODE_DEBUG_INFO, driver reads ptr, writes to all fields. | ||
| 191 | * Set ptr to NULL for the first call to get the info for the first node, and | ||
| 192 | * then repeat the call passing the previously returned value to get the next | ||
| 193 | * nodes. ptr will be 0 when there are no more nodes. | ||
| 194 | */ | ||
| 195 | struct binder_node_debug_info { | ||
| 196 | binder_uintptr_t ptr; | ||
| 197 | binder_uintptr_t cookie; | ||
| 198 | __u32 has_strong_ref; | ||
| 199 | __u32 has_weak_ref; | ||
| 200 | }; | ||
| 201 | |||
| 187 | #define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read) | 202 | #define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read) |
| 188 | #define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64) | 203 | #define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64) |
| 189 | #define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32) | 204 | #define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32) |
| @@ -191,6 +206,7 @@ struct binder_version { · 1 unmodified line | |||
| 191 | #define BINDER_SET_CONTEXT_MGR _IOW('b', 7, __s32) | 206 | #define BINDER_SET_CONTEXT_MGR _IOW('b', 7, __s32) |
| 192 | #define BINDER_THREAD_EXIT _IOW('b', 8, __s32) | 207 | #define BINDER_THREAD_EXIT _IOW('b', 8, __s32) |
| 193 | #define BINDER_VERSION _IOWR('b', 9, struct binder_version) | 208 | #define BINDER_VERSION _IOWR('b', 9, struct binder_version) |
| 209 | #define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info) | ||
| 194 | 210 | ||
| 195 | /* | 211 | /* |
| 196 | * NOTE: Two special error codes you should check for when calling | 212 | * NOTE: Two special error codes you should check for when calling |