History

Merge tag 'tty-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty / serial driver updates from Greg KH: "Here is the big set of serial and tty driver updates for 6.3-rc1. Once again, Jiri and Ilpo have done a number of core vt and tty/serial layer cleanups that were much needed and appreciated. Other than that, it's just a bunch of little tty/serial driver updates: - qcom-geni-serial driver updates - liteuart driver updates - hvcs driver cleanups - n_gsm updates and additions for new features - more 8250 device support added - fpga/dfl update and additions - imx serial driver updates - fsl_lpuart updates - other tiny fixes and updates for serial drivers All of these have been in linux-next for a while with no reported problems" * tag 'tty-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (143 commits) tty: n_gsm: add keep alive support serial: imx: remove a redundant check dt-bindings: serial: snps-dw-apb-uart: add dma & dma-names properties soc: qcom: geni-se: Move qcom-geni-se.h to linux/soc/qcom/geni-se.h tty: n_gsm: add TIOCMIWAIT support tty: n_gsm: add RING/CD control support tty: n_gsm: mark unusable ioctl structure fields accordingly serial: imx: get rid of registers shadowing serial: imx: refine local variables in rxint() serial: imx: stop using USR2 in FIFO reading loop serial: imx: remove redundant USR2 read from FIFO reading loop serial: imx: do not break from FIFO reading loop prematurely serial: imx: do not sysrq broken chars serial: imx: work-around for hardware RX flood serial: imx: factor-out common code to imx_uart_soft_reset() serial: 8250_pci1xxxx: Add power management functions to quad-uart driver serial: 8250_pci1xxxx: Add RS485 support to quad-uart driver serial: 8250_pci1xxxx: Add driver for quad-uart support serial: 8250_pci: Add serial8250_pci_setup_port definition in 8250_pcilib.c tty: pcn_uart: fix memory leak with using debugfs_lookup() ...

Linus Torvalds committed 3 years ago

Commit 17cd4d62 parents 72bffe7 72206cc104 files · +2908 −1283Browse files

Showing the changes to include/uapi/linux (4 of 104 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/gsmmux.h +13 −4
  2. include/uapi/linux/kd.h +8 −2
  3. include/uapi/linux/serial_core.h +3 −0
  4. include/uapi/linux/serial_reg.h +5 −0
include/uapi/linux/gsmmux.h+13−4
@@ -19,8 +19,7 @@ struct gsm_config · 18 unmodified lines
1919 unsigned int mtu;
2020 unsigned int k;
2121 unsigned int i;
22− unsigned int unused[8]; /* Padding for expansion without
23− breaking stuff */
22+ unsigned int unused[8]; /* Can not be used */
2423 };
2524
2625 #define GSMIOC_GETCONF _IOR('G', 0, struct gsm_config)
@@ -29,9 +28,9 @@ struct gsm_config · 2 unmodified lines
2928 struct gsm_netconfig {
3029 unsigned int adaption; /* Adaption to use in network mode */
3130 unsigned short protocol;/* Protocol to use - only ETH_P_IP supported */
32− unsigned short unused2;
31+ unsigned short unused2; /* Can not be used */
3332 char if_name[IFNAMSIZ]; /* interface name format string */
34− __u8 unused[28]; /* For future use */
33+ __u8 unused[28]; /* Can not be used */
3534 };
3635
3736 #define GSMIOC_ENABLE_NET _IOW('G', 2, struct gsm_netconfig)
@@ -40,4 +39,14 @@ struct gsm_netconfig { · 2 unmodified lines
4039 /* get the base tty number for a configured gsmmux tty */
4140 #define GSMIOC_GETFIRST _IOR('G', 4, __u32)
4241
42+struct gsm_config_ext {
43+ __u32 keep_alive; /* Control channel keep-alive in 1/100th of a
44+ * second (0 to disable)
45+ */
46+ __u32 reserved[7]; /* For future use, must be initialized to zero */
47+};
48+
49+#define GSMIOC_GETCONF_EXT _IOR('G', 5, struct gsm_config_ext)
50+#define GSMIOC_SETCONF_EXT _IOW('G', 6, struct gsm_config_ext)
51+
4352 #endif
include/uapi/linux/kd.h+8−2
@@ -161,19 +161,25 @@ struct console_font_op { · 160 unmodified lines
161161 unsigned int flags; /* KD_FONT_FLAG_* */
162162 unsigned int width, height; /* font size */
163163 unsigned int charcount;
164− unsigned char __user *data; /* font data with height fixed to 32 */
164+ unsigned char __user *data; /* font data with vpitch fixed to 32 for
165+ * KD_FONT_OP_SET/GET
166+ */
165167 };
166168
167169 struct console_font {
168170 unsigned int width, height; /* font size */
169171 unsigned int charcount;
170− unsigned char *data; /* font data with height fixed to 32 */
172+ unsigned char *data; /* font data with vpitch fixed to 32 for
173+ * KD_FONT_OP_SET/GET
174+ */
171175 };
172176
173177 #define KD_FONT_OP_SET 0 /* Set font */
174178 #define KD_FONT_OP_GET 1 /* Get font */
175179 #define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default, data points to name / NULL */
176180 #define KD_FONT_OP_COPY 3 /* Obsolete, do not use */
181+#define KD_FONT_OP_SET_TALL 4 /* Set font with vpitch = height */
182+#define KD_FONT_OP_GET_TALL 5 /* Get font with vpitch = height */
177183
178184 #define KD_FONT_FLAG_DONT_RECALC 1 /* Don't recalculate hw charcell size [compat] */
179185
include/uapi/linux/serial_core.h+3−0
@@ -207,6 +207,9 @@ · 206 unmodified lines
207207 /* Atheros AR933X SoC */
208208 #define PORT_AR933X 99
209209
210+/* MCHP 16550A UART with 256 byte FIFOs */
211+#define PORT_MCHP16550A 100
212+
210213 /* ARC (Synopsys) on-chip UART */
211214 #define PORT_ARC 101
212215
include/uapi/linux/serial_reg.h+5−0
@@ -44,6 +44,11 @@ · 43 unmodified lines
4444 #define UART_IIR_RX_TIMEOUT 0x0c /* OMAP RX Timeout interrupt */
4545 #define UART_IIR_XOFF 0x10 /* OMAP XOFF/Special Character */
4646 #define UART_IIR_CTS_RTS_DSR 0x20 /* OMAP CTS/RTS/DSR Change */
47+#define UART_IIR_64BYTE_FIFO 0x20 /* 16750 64 bytes FIFO */
48+#define UART_IIR_FIFO_ENABLED 0xc0 /* FIFOs enabled / port type identification */
49+#define UART_IIR_FIFO_ENABLED_8250 0x00 /* 8250: no FIFO */
50+#define UART_IIR_FIFO_ENABLED_16550 0x80 /* 16550: (broken/unusable) FIFO */
51+#define UART_IIR_FIFO_ENABLED_16550A 0xc0 /* 16550A: FIFO enabled */
4752
4853 #define UART_FCR 2 /* Out: FIFO Control Register */
4954 #define UART_FCR_ENABLE_FIFO 0x01 /* Enable the FIFO */