Pull tty / serial updates from Greg KH: "Here is the big set of tty/serial driver updates for 6.4-rc1. Nothing major, just lots of tiny, constant, forward development. This includes: - obligatory n_gsm updates and feature additions - 8250_em driver updates - sh-sci driver updates - dts cleanups and updates - general cleanups and improvements by Ilpo and Jiri - other small serial driver core fixes and driver updates All of these have been in linux-next for a while with no reported problems" * tag 'tty-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (87 commits) n_gsm: Use array_index_nospec() with index that comes from userspace tty: vt: drop checks for undefined VT_SINGLE_DRIVER tty: vt: distribute EXPORT_SYMBOL() tty: vt: simplify some cases in tioclinux() tty: vt: reformat tioclinux() tty: serial: sh-sci: Fix end of transmission on SCI tty: serial: sh-sci: Add support for tx end interrupt handling tty: serial: sh-sci: Fix TE setting on SCI IP tty: serial: sh-sci: Add RZ/G2L SCIFA DMA rx support tty: serial: sh-sci: Add RZ/G2L SCIFA DMA tx support serial: max310x: fix IO data corruption in batched operations serial: core: Disable uart_start() on uart_remove_one_port() serial: 8250: Reinit port->pm on port specific driver unbind serial: 8250: Add missing wakeup event reporting tty: serial: fsl_lpuart: use UARTMODIR register bits for lpuart32 platform tty: serial: fsl_lpuart: adjust buffer length to the intended size serial: fix TIOCSRS485 locking serial: make SiFive serial drivers depend on ARCH_ symbols tty: synclink_gt: don't allocate and pass dummy flags tty: serial: simplify qcom_geni_serial_send_chunk_fifo() ...
Showing the changes to include/uapi (1 of 57 files). Show all
Unified · Split
| @@ -43,10 +43,25 @@ struct gsm_config_ext { · 42 unmodified lines | |||
| 43 | __u32 keep_alive; /* Control channel keep-alive in 1/100th of a | 43 | __u32 keep_alive; /* Control channel keep-alive in 1/100th of a |
| 44 | * second (0 to disable) | 44 | * second (0 to disable) |
| 45 | */ | 45 | */ |
| 46 | __u32 reserved[7]; /* For future use, must be initialized to zero */ | 46 | __u32 wait_config; /* Wait for DLCI config before opening virtual link? */ |
| 47 | __u32 reserved[6]; /* For future use, must be initialized to zero */ | ||
| 47 | }; | 48 | }; |
| 48 | 49 | ||
| 49 | #define GSMIOC_GETCONF_EXT _IOR('G', 5, struct gsm_config_ext) | 50 | #define GSMIOC_GETCONF_EXT _IOR('G', 5, struct gsm_config_ext) |
| 50 | #define GSMIOC_SETCONF_EXT _IOW('G', 6, struct gsm_config_ext) | 51 | #define GSMIOC_SETCONF_EXT _IOW('G', 6, struct gsm_config_ext) |
| 51 | 52 | ||
| 53 | /* Set channel accordingly before calling GSMIOC_GETCONF_DLCI. */ | ||
| 54 | struct gsm_dlci_config { | ||
| 55 | __u32 channel; /* DLCI (0 for the associated DLCI) */ | ||
| 56 | __u32 adaption; /* Convergence layer type */ | ||
| 57 | __u32 mtu; /* Maximum transfer unit */ | ||
| 58 | __u32 priority; /* Priority (0 for default value) */ | ||
| 59 | __u32 i; /* Frame type (1 = UIH, 2 = UI) */ | ||
| 60 | __u32 k; /* Window size (0 for default value) */ | ||
| 61 | __u32 reserved[8]; /* For future use, must be initialized to zero */ | ||
| 62 | }; | ||
| 63 | |||
| 64 | #define GSMIOC_GETCONF_DLCI _IOWR('G', 7, struct gsm_dlci_config) | ||
| 65 | #define GSMIOC_SETCONF_DLCI _IOW('G', 8, struct gsm_dlci_config) | ||
| 66 | |||
| 52 | #endif | 67 | #endif |