History

Merge tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH: "Here is the large set of char and misc and other driver subsystem patches for 5.9-rc1. Lots of new driver submissions in here, and cleanups and features for existing drivers. Highlights are: - habanalabs driver updates - coresight driver updates - nvmem driver updates - huge number of "W=1" build warning cleanups from Lee Jones - dyndbg updates - virtbox driver fixes and updates - soundwire driver updates - mei driver updates - phy driver updates - fpga driver updates - lots of smaller individual misc/char driver cleanups and fixes Full details are in the shortlog. All of these have been in linux-next with no reported issues" * tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (322 commits) habanalabs: remove unused but set variable 'ctx_asid' nvmem: qcom-spmi-sdam: Enable multiple devices dt-bindings: nvmem: SID: add binding for A100's SID controller nvmem: update Kconfig description nvmem: qfprom: Add fuse blowing support dt-bindings: nvmem: Add properties needed for blowing fuses dt-bindings: nvmem: qfprom: Convert to yaml nvmem: qfprom: use NVMEM_DEVID_AUTO for multiple instances nvmem: core: add support to auto devid nvmem: core: Add nvmem_cell_read_u8() nvmem: core: Grammar fixes for help text nvmem: sc27xx: add sc2730 efuse support nvmem: Enforce nvmem stride in the sysfs interface MAINTAINERS: Add git tree for NVMEM FRAMEWORK nvmem: sprd: Fix return value of sprd_efuse_probe() drivers: android: Fix the SPDX comment style drivers: android: Fix a variable declaration coding style issue drivers: android: Remove braces for a single statement if-else block drivers: android: Remove the use of else after return drivers: android: Fix a variable declaration coding style issue ...

Linus Torvalds committed 6 years ago

Commit 1785d112 parents 060a72a 22362aa291 files · +10369 −4128Browse files

Showing the changes to include/uapi/linux (5 of 291 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/android/binder.h +1 −1
  2. include/uapi/linux/fpga-dfl.h +82 −0
  3. include/uapi/linux/raw.h +0 −2
  4. include/uapi/linux/vbox_vmmdev_types.h +3 −0
  5. include/uapi/linux/vboxguest.h +24 −0
include/uapi/linux/android/binder.h+1−1
@@ -404,7 +404,7 @@ enum binder_driver_return_protocol { · 403 unmodified lines
404404
405405 BR_FAILED_REPLY = _IO('r', 17),
406406 /*
407− * The the last transaction (either a bcTRANSACTION or
407+ * The last transaction (either a bcTRANSACTION or
408408 * a bcATTEMPT_ACQUIRE) failed (e.g. out of memory). No parameters.
409409 */
410410 };
include/uapi/linux/fpga-dfl.h+82−0
@@ -151,6 +151,65 @@ struct dfl_fpga_port_dma_unmap { · 150 unmodified lines
151151
152152 #define DFL_FPGA_PORT_DMA_UNMAP _IO(DFL_FPGA_MAGIC, DFL_PORT_BASE + 4)
153153
154+/**
155+ * struct dfl_fpga_irq_set - the argument for DFL_FPGA_XXX_SET_IRQ ioctl.
156+ *
157+ * @start: Index of the first irq.
158+ * @count: The number of eventfd handler.
159+ * @evtfds: Eventfd handlers.
160+ */
161+struct dfl_fpga_irq_set {
162+ __u32 start;
163+ __u32 count;
164+ __s32 evtfds[];
165+};
166+
167+/**
168+ * DFL_FPGA_PORT_ERR_GET_IRQ_NUM - _IOR(DFL_FPGA_MAGIC, DFL_PORT_BASE + 5,
169+ * __u32 num_irqs)
170+ *
171+ * Get the number of irqs supported by the fpga port error reporting private
172+ * feature. Currently hardware supports up to 1 irq.
173+ * Return: 0 on success, -errno on failure.
174+ */
175+#define DFL_FPGA_PORT_ERR_GET_IRQ_NUM _IOR(DFL_FPGA_MAGIC, \
176+ DFL_PORT_BASE + 5, __u32)
177+
178+/**
179+ * DFL_FPGA_PORT_ERR_SET_IRQ - _IOW(DFL_FPGA_MAGIC, DFL_PORT_BASE + 6,
180+ * struct dfl_fpga_irq_set)
181+ *
182+ * Set fpga port error reporting interrupt trigger if evtfds[n] is valid.
183+ * Unset related interrupt trigger if evtfds[n] is a negative value.
184+ * Return: 0 on success, -errno on failure.
185+ */
186+#define DFL_FPGA_PORT_ERR_SET_IRQ _IOW(DFL_FPGA_MAGIC, \
187+ DFL_PORT_BASE + 6, \
188+ struct dfl_fpga_irq_set)
189+
190+/**
191+ * DFL_FPGA_PORT_UINT_GET_IRQ_NUM - _IOR(DFL_FPGA_MAGIC, DFL_PORT_BASE + 7,
192+ * __u32 num_irqs)
193+ *
194+ * Get the number of irqs supported by the fpga AFU interrupt private
195+ * feature.
196+ * Return: 0 on success, -errno on failure.
197+ */
198+#define DFL_FPGA_PORT_UINT_GET_IRQ_NUM _IOR(DFL_FPGA_MAGIC, \
199+ DFL_PORT_BASE + 7, __u32)
200+
201+/**
202+ * DFL_FPGA_PORT_UINT_SET_IRQ - _IOW(DFL_FPGA_MAGIC, DFL_PORT_BASE + 8,
203+ * struct dfl_fpga_irq_set)
204+ *
205+ * Set fpga AFU interrupt trigger if evtfds[n] is valid.
206+ * Unset related interrupt trigger if evtfds[n] is a negative value.
207+ * Return: 0 on success, -errno on failure.
208+ */
209+#define DFL_FPGA_PORT_UINT_SET_IRQ _IOW(DFL_FPGA_MAGIC, \
210+ DFL_PORT_BASE + 8, \
211+ struct dfl_fpga_irq_set)
212+
154213 /* IOCTLs for FME file descriptor */
155214
156215 /**
@@ -194,4 +253,27 @@ struct dfl_fpga_fme_port_pr { · 37 unmodified lines
194253 */
195254 #define DFL_FPGA_FME_PORT_ASSIGN _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 2, int)
196255
256+/**
257+ * DFL_FPGA_FME_ERR_GET_IRQ_NUM - _IOR(DFL_FPGA_MAGIC, DFL_FME_BASE + 3,
258+ * __u32 num_irqs)
259+ *
260+ * Get the number of irqs supported by the fpga fme error reporting private
261+ * feature. Currently hardware supports up to 1 irq.
262+ * Return: 0 on success, -errno on failure.
263+ */
264+#define DFL_FPGA_FME_ERR_GET_IRQ_NUM _IOR(DFL_FPGA_MAGIC, \
265+ DFL_FME_BASE + 3, __u32)
266+
267+/**
268+ * DFL_FPGA_FME_ERR_SET_IRQ - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 4,
269+ * struct dfl_fpga_irq_set)
270+ *
271+ * Set fpga fme error reporting interrupt trigger if evtfds[n] is valid.
272+ * Unset related interrupt trigger if evtfds[n] is a negative value.
273+ * Return: 0 on success, -errno on failure.
274+ */
275+#define DFL_FPGA_FME_ERR_SET_IRQ _IOW(DFL_FPGA_MAGIC, \
276+ DFL_FME_BASE + 4, \
277+ struct dfl_fpga_irq_set)
278+
197279 #endif /* _UAPI_LINUX_FPGA_DFL_H */
include/uapi/linux/raw.h+0−2
@@ -14,6 +14,4 @@ struct raw_config_request · 13 unmodified lines
1414 __u64 block_minor;
1515 };
1616
17−#define MAX_RAW_MINORS CONFIG_MAX_RAW_DEVS
18−
1917 #endif /* __LINUX_RAW_H */
include/uapi/linux/vbox_vmmdev_types.h+3−0
@@ -63,6 +63,7 @@ enum vmmdev_request_type { · 62 unmodified lines
6363 VMMDEVREQ_SET_GUEST_CAPABILITIES = 56,
6464 VMMDEVREQ_VIDEMODE_SUPPORTED2 = 57, /* since version 3.2.0 */
6565 VMMDEVREQ_GET_DISPLAY_CHANGE_REQEX = 80, /* since version 4.2.4 */
66+ VMMDEVREQ_GET_DISPLAY_CHANGE_REQ_MULTI = 81,
6667 VMMDEVREQ_HGCM_CONNECT = 60,
6768 VMMDEVREQ_HGCM_DISCONNECT = 61,
6869 VMMDEVREQ_HGCM_CALL32 = 62,
@@ -92,6 +93,8 @@ enum vmmdev_request_type { · 23 unmodified lines
9293 VMMDEVREQ_WRITE_COREDUMP = 218,
9394 VMMDEVREQ_GUEST_HEARTBEAT = 219,
9495 VMMDEVREQ_HEARTBEAT_CONFIGURE = 220,
96+ VMMDEVREQ_NT_BUG_CHECK = 221,
97+ VMMDEVREQ_VIDEO_UPDATE_MONITOR_POSITIONS = 222,
9598 /* Ensure the enum is a 32 bit data-type */
9699 VMMDEVREQ_SIZEHACK = 0x7fffffff
97100 };
include/uapi/linux/vboxguest.h+24−0
@@ -257,6 +257,30 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_change_filter, 24 + 8); · 256 unmodified lines
257257 _IOWR('V', 12, struct vbg_ioctl_change_filter)
258258
259259
260+/** VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES data structure. */
261+struct vbg_ioctl_acquire_guest_caps {
262+ /** The header. */
263+ struct vbg_ioctl_hdr hdr;
264+ union {
265+ struct {
266+ /** Flags (VBGL_IOC_AGC_FLAGS_XXX). */
267+ __u32 flags;
268+ /** Capabilities to set (VMMDEV_GUEST_SUPPORTS_XXX). */
269+ __u32 or_mask;
270+ /** Capabilities to drop (VMMDEV_GUEST_SUPPORTS_XXX). */
271+ __u32 not_mask;
272+ } in;
273+ } u;
274+};
275+VMMDEV_ASSERT_SIZE(vbg_ioctl_acquire_guest_caps, 24 + 12);
276+
277+#define VBGL_IOC_AGC_FLAGS_CONFIG_ACQUIRE_MODE 0x00000001
278+#define VBGL_IOC_AGC_FLAGS_VALID_MASK 0x00000001
279+
280+#define VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES \
281+ _IOWR('V', 13, struct vbg_ioctl_acquire_guest_caps)
282+
283+
260284 /** VBG_IOCTL_CHANGE_GUEST_CAPABILITIES data structure. */
261285 struct vbg_ioctl_set_guest_caps {
262286 /** The header. */