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

8e1e4955 · Linus Torvalds <[email protected]> · 2023-09-01 09:38:00 -07:00

Pull tty/serial driver updates from Greg KH:
 "Here is the big set of tty and serial driver changes for 6.6-rc1.

  Lots of cleanups in here this cycle, and some driver updates. Short
  summary is:

   - Jiri's continued work to make the tty code and apis be a bit more
     sane with regards to modern kernel coding style and types

   - cpm_uart driver updates

   - n_gsm updates and fixes

   - meson driver updates

   - sc16is7xx driver updates

   - 8250 driver updates for different hardware types

   - qcom-geni driver fixes

   - tegra serial driver change

   - stm32 driver updates

   - synclink_gt driver cleanups

   - tty structure size reduction

  All of these have been in linux-next this week with no reported
  issues. The last bit of cleanups from Jiri and the tty structure size
  reduction came in last week, a bit late but as they were just style
  changes and size reductions, I figured they should get into this merge
  cycle so that others can work on top of them with no merge conflicts"

* tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (199 commits)
  tty: shrink the size of struct tty_struct by 40 bytes
  tty: n_tty: deduplicate copy code in n_tty_receive_buf_real_raw()
  tty: n_tty: extract ECHO_OP processing to a separate function
  tty: n_tty: unify counts to size_t
  tty: n_tty: use u8 for chars and flags
  tty: n_tty: simplify chars_in_buffer()
  tty: n_tty: remove unsigned char casts from character constants
  tty: n_tty: move newline handling to a separate function
  tty: n_tty: move canon handling to a separate function
  tty: n_tty: use MASK() for masking out size bits
  tty: n_tty: make n_tty_data::num_overrun unsigned
  tty: n_tty: use time_is_before_jiffies() in n_tty_receive_overrun()
  tty: n_tty: use 'num' for writes' counts
  tty: n_tty: use output character directly
  tty: n_tty: make flow of n_tty_receive_buf_common() a bool
  Revert "tty: serial: meson: Add a earlycon for the T7 SoC"
  Documentation: devices.txt: Fix minors for ttyCPM*
  Documentation: devices.txt: Remove ttySIOC*
  Documentation: devices.txt: Remove ttyIOC*
  serial: 8250_bcm7271: improve bcm7271 8250 port
  ...

Commit: 8e1e49550dc85694abd04d86a8ee36bc98bd8b9e
Parents: e9259926 · ebf05c7d

Merge commit. Changes below are compared with the first parent: e9259926.

Changes

185 files changed · +2106 −2175

File	Status	Add	Del	Content
Documentation/admin-guide/devices.txt	modified	+2	−14	View file
Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml	modified	+6	−0	View file
Documentation/devicetree/bindings/serial/fsl-lpuart.yaml	modified	+5	−1	View file
Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt	modified	+46	−0	View file
Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml	modified	+0	−1	View file
Documentation/driver-api/tty/tty_buffer.rst	modified	+5	−2	View file
arch/alpha/kernel/setup.c	modified	+1	−1	View file
arch/alpha/kernel/srmcons.c	modified	+2	−3	View file
arch/arm64/boot/dts/amlogic/meson-a1.dtsi	modified	+2	−2	View file
arch/loongarch/kernel/sysrq.c	modified	+1	−1	View file
arch/m68k/emu/nfcon.c	modified	+4	−4	View file
arch/mips/kernel/sysrq.c	modified	+1	−1	View file
arch/powerpc/include/asm/fs_pd.h	deleted	+0	−27	View before deletion
arch/powerpc/platforms/8xx/mpc885ads_setup.c	modified	+0	−1	View file
arch/powerpc/platforms/8xx/tqm8xx_setup.c	modified	+0	−1	View file
arch/powerpc/sysdev/fsl_soc.c	modified	+0	−2	View file
arch/powerpc/xmon/xmon.c	modified	+1	−1	View file
arch/sparc/include/asm/vio.h	modified	+1	−1	View file
arch/sparc/kernel/process_64.c	modified	+2	−2	View file
arch/um/drivers/line.c	modified	+1	−1	View file
arch/um/drivers/line.h	modified	+1	−2	View file
arch/xtensa/platforms/iss/console.c	modified	+1	−26	View file
drivers/accessibility/speakup/spk_ttyio.c	modified	+3	−4	View file
drivers/bluetooth/hci_ldisc.c	modified	+4	−11	View file
drivers/char/ttyprintk.c	modified	+2	−3	View file
drivers/gpu/drm/drm_fb_helper.c	modified	+1	−1	View file
drivers/input/serio/serport.c	modified	+9	−9	View file
drivers/ipack/devices/ipoctal.c	modified	+3	−4	View file
drivers/isdn/capi/capi.c	modified	+4	−4	View file
drivers/misc/bcm-vk/bcm_vk_tty.c	modified	+2	−3	View file
drivers/misc/ti-st/st_core.c	modified	+6	−12	View file
drivers/misc/ti-st/st_kim.c	modified	+3	−10	View file
drivers/mmc/core/sdio_uart.c	modified	+2	−2	View file
drivers/net/caif/caif_serial.c	modified	+1	−1	View file
drivers/net/can/can327.c	modified	+20	−27	View file
drivers/net/can/sja1000/ems_pci.c	modified	+1	−6	View file
drivers/net/can/slcan/slcan-core.c	modified	+6	−7	View file
drivers/net/hamradio/6pack.c	modified	+2	−2	View file
drivers/net/hamradio/mkiss.c	modified	+2	−2	View file
drivers/net/mctp/mctp-serial.c	modified	+2	−3	View file
drivers/net/ppp/ppp_async.c	modified	+8	−18	View file
drivers/net/ppp/ppp_synctty.c	modified	+8	−18	View file
drivers/net/slip/slip.c	modified	+2	−2	View file
drivers/net/usb/hso.c	modified	+7	−13	View file
drivers/parport/parport_pc.c	modified	+5	−0	View file
drivers/s390/char/con3215.c	modified	+3	−3	View file
drivers/s390/char/con3270.c	modified	+3	−3	View file
drivers/s390/char/sclp_tty.c	modified	+5	−5	View file
drivers/s390/char/sclp_vt220.c	modified	+3	−3	View file
drivers/staging/gdm724x/gdm_tty.c	modified	+5	−12	View file
drivers/staging/greybus/uart.c	modified	+1	−2	View file
drivers/tty/Kconfig	modified	+1	−0	View file
drivers/tty/amiserial.c	modified	+2	−2	View file
drivers/tty/ehv_bytechan.c	modified	+2	−2	View file
drivers/tty/goldfish.c	modified	+3	−4	View file
drivers/tty/hvc/hvc_console.c	modified	+2	−2	View file
drivers/tty/hvc/hvc_opal.c	modified	+1	−1	View file
drivers/tty/hvc/hvcs.c	modified	+5	−5	View file
drivers/tty/hvc/hvsi.c	modified	+7	−8	View file
drivers/tty/ipwireless/hardware.c	modified	+1	−1	View file
drivers/tty/ipwireless/tty.c	modified	+2	−2	View file
drivers/tty/mips_ejtag_fdc.c	modified	+3	−3	View file
drivers/tty/moxa.c	modified	+3	−5	View file
drivers/tty/mxser.c	modified	+2	−2	View file
drivers/tty/n_gsm.c	modified	+69	−20	View file
drivers/tty/n_hdlc.c	modified	+6	−6	View file
drivers/tty/n_null.c	modified	+3	−22	View file
drivers/tty/n_tty.c	modified	+315	−298	View file
drivers/tty/nozomi.c	modified	+3	−3	View file
drivers/tty/pty.c	modified	+1	−1	View file
drivers/tty/rpmsg_tty.c	modified	+3	−2	View file
drivers/tty/serdev/serdev-ttyport.c	modified	+2	−2	View file
drivers/tty/serial/21285.c	modified	+2	−1	View file
drivers/tty/serial/8250/8250_bcm7271.c	modified	+1	−3	View file
drivers/tty/serial/8250/8250_dw.c	modified	+4	−1	View file
drivers/tty/serial/8250/8250_early.c	modified	+0	−1	View file
drivers/tty/serial/8250/8250_ingenic.c	modified	+0	−1	View file
drivers/tty/serial/8250/8250_men_mcb.c	modified	+155	−57	View file
drivers/tty/serial/8250/8250_omap.c	modified	+0	−1	View file
drivers/tty/serial/8250/8250_pci.c	modified	+10	−0	View file
drivers/tty/serial/8250/8250_port.c	modified	+9	−2	View file
drivers/tty/serial/8250/8250_pxa.c	modified	+1	−0	View file
drivers/tty/serial/Makefile	modified	+1	−1	View file
drivers/tty/serial/altera_jtaguart.c	modified	+2	−2	View file
drivers/tty/serial/altera_uart.c	modified	+1	−1	View file
drivers/tty/serial/amba-pl010.c	modified	+2	−1	View file
drivers/tty/serial/amba-pl011.c	modified	+3	−2	View file
drivers/tty/serial/apbuart.c	modified	+2	−4	View file
drivers/tty/serial/ar933x_uart.c	modified	+1	−2	View file
drivers/tty/serial/arc_uart.c	modified	+13	−16	View file
drivers/tty/serial/atmel_serial.c	modified	+1	−2	View file
drivers/tty/serial/bcm63xx_uart.c	modified	+2	−6	View file
drivers/tty/serial/clps711x.c	modified	+3	−3	View file
drivers/tty/serial/cpm_uart/cpm_uart_core.c → drivers/tty/serial/cpm_uart.c	renamed	+139	−18	View file
drivers/tty/serial/cpm_uart/cpm_uart.h → drivers/tty/serial/cpm_uart.h	renamed	+5	−33	View file
drivers/tty/serial/cpm_uart/Makefile	deleted	+0	−12	View before deletion
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c	deleted	+0	−122	View before deletion
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h	deleted	+0	−33	View before deletion
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c	deleted	+0	−156	View before deletion
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h	deleted	+0	−33	View before deletion
drivers/tty/serial/digicolor-usart.c	modified	+1	−2	View file
drivers/tty/serial/dz.c	modified	+1	−1	View file
drivers/tty/serial/fsl_linflexuart.c	modified	+3	−7	View file
drivers/tty/serial/fsl_lpuart.c	modified	+63	−25	View file
drivers/tty/serial/imx.c	modified	+1	−3	View file
drivers/tty/serial/ip22zilog.c	modified	+1	−1	View file
drivers/tty/serial/kgdb_nmi.c	modified	+2	−1	View file
drivers/tty/serial/lantiq.c	modified	+2	−1	View file
drivers/tty/serial/liteuart.c	modified	+1	−2	View file
drivers/tty/serial/ma35d1_serial.c	modified	+1	−2	View file
drivers/tty/serial/max3100.c	modified	+2	−1	View file
drivers/tty/serial/max310x.c	modified	+8	−2	View file
drivers/tty/serial/mcf.c	modified	+1	−1	View file
drivers/tty/serial/meson_uart.c	modified	+77	−61	View file
drivers/tty/serial/milbeaut_usio.c	modified	+1	−2	View file
drivers/tty/serial/mpc52xx_uart.c	modified	+1	−1	View file
drivers/tty/serial/mps2-uart.c	modified	+1	−3	View file
drivers/tty/serial/mvebu-uart.c	modified	+3	−8	View file
drivers/tty/serial/mxs-auart.c	modified	+2	−3	View file
drivers/tty/serial/omap-serial.c	modified	+4	−7	View file
drivers/tty/serial/pic32_uart.c	modified	+0	−1	View file
drivers/tty/serial/pxa.c	modified	+1	−1	View file
drivers/tty/serial/qcom_geni_serial.c	modified	+9	−8	View file
drivers/tty/serial/rp2.c	modified	+2	−2	View file
drivers/tty/serial/sa1100.c	modified	+2	−1	View file
drivers/tty/serial/samsung_tty.c	modified	+4	−4	View file
drivers/tty/serial/sb1250-duart.c	modified	+2	−1	View file
drivers/tty/serial/sc16is7xx.c	modified	+131	−39	View file
drivers/tty/serial/sccnxp.c	modified	+3	−4	View file
drivers/tty/serial/serial-tegra.c	modified	+12	−17	View file
drivers/tty/serial/serial_core.c	modified	+11	−17	View file
drivers/tty/serial/serial_txx9.c	modified	+1	−2	View file
drivers/tty/serial/sh-sci.c	modified	+0	−1	View file
drivers/tty/serial/sifive.c	modified	+22	−7	View file
drivers/tty/serial/sprd_serial.c	modified	+24	−14	View file
drivers/tty/serial/st-asc.c	modified	+5	−4	View file
drivers/tty/serial/stm32-usart.c	modified	+186	−126	View file
drivers/tty/serial/stm32-usart.h	modified	+1	−0	View file
drivers/tty/serial/sunhv.c	modified	+2	−2	View file
drivers/tty/serial/sunplus-uart.c	modified	+1	−1	View file
drivers/tty/serial/sunsab.c	modified	+2	−1	View file
drivers/tty/serial/sunsu.c	modified	+2	−2	View file
drivers/tty/serial/sunzilog.c	modified	+2	−2	View file
drivers/tty/serial/tegra-tcu.c	modified	+0	−1	View file
drivers/tty/serial/uartlite.c	modified	+0	−3	View file
drivers/tty/serial/ucc_uart.c	modified	+2	−2	View file
drivers/tty/serial/vt8500_serial.c	modified	+2	−6	View file
drivers/tty/serial/xilinx_uartps.c	modified	+2	−2	View file
drivers/tty/serial/zs.c	modified	+2	−1	View file
drivers/tty/synclink_gt.c	modified	+36	−47	View file
drivers/tty/sysrq.c	modified	+41	−43	View file
drivers/tty/tty.h	modified	+4	−4	View file
drivers/tty/tty_audit.c	modified	+3	−3	View file
drivers/tty/tty_buffer.c	modified	+61	−131	View file
drivers/tty/tty_io.c	modified	+20	−30	View file
drivers/tty/tty_ioctl.c	modified	+4	−14	View file
drivers/tty/tty_port.c	modified	+16	−18	View file
drivers/tty/ttynull.c	modified	+2	−2	View file
drivers/tty/vcc.c	modified	+9	−9	View file
drivers/tty/vt/selection.c	modified	+1	−1	View file
drivers/tty/vt/vt.c	modified	+7	−15	View file
drivers/usb/class/cdc-acm.c	modified	+4	−4	View file
drivers/usb/gadget/function/u_serial.c	modified	+3	−3	View file
drivers/usb/host/xhci-dbgtty.c	modified	+3	−4	View file
drivers/usb/serial/usb-serial.c	modified	+2	−3	View file
include/linux/fs_uart_pd.h	deleted	+0	−71	View before deletion
include/linux/pci_ids.h	modified	+4	−0	View file
include/linux/serial_core.h	modified	+9	−9	View file
include/linux/sysrq.h	modified	+9	−9	View file
include/linux/ti_wilink_st.h	modified	+1	−1	View file
include/linux/tty.h	modified	+9	−9	View file
include/linux/tty_buffer.h	modified	+10	−10	View file
include/linux/tty_driver.h	modified	+4	−5	View file
include/linux/tty_flip.h	modified	+56	−14	View file
include/linux/tty_ldisc.h	modified	+43	−24	View file
include/linux/tty_port.h	modified	+4	−3	View file
include/uapi/linux/gsmmux.h	modified	+99	−19	View file
include/uapi/linux/serial_core.h	modified	+5	−39	View file
kernel/debug/debug_core.c	modified	+1	−1	View file
kernel/power/poweroff.c	modified	+1	−1	View file
kernel/rcu/tree_stall.h	modified	+1	−1	View file
net/bluetooth/rfcomm/tty.c	modified	+16	−15	View file
net/nfc/nci/uart.c	modified	+8	−15	View file
sound/soc/codecs/cx20442.c	modified	+2	−2	View file
sound/soc/ti/ams-delta.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/admin-guide/devices.txt

View file

diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index b1b57f6..8390549 100644
--- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt
@@ -2691,18 +2691,9 @@
 		 45 = /dev/ttyMM1		Marvell MPSC - port 1 (obsolete unused)
 		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0
 		    ...
-		 49 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 3
-		 50 = /dev/ttyIOC0		Altix serial card
-		    ...
-		 81 = /dev/ttyIOC31		Altix serial card
+		 51 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5
 		 82 = /dev/ttyVR0		NEC VR4100 series SIU
 		 83 = /dev/ttyVR1		NEC VR4100 series DSIU
-		 84 = /dev/ttyIOC84		Altix ioc4 serial card
-		    ...
-		 115 = /dev/ttyIOC115		Altix ioc4 serial card
-		 116 = /dev/ttySIOC0		Altix ioc3 serial card
-		    ...
-		 147 = /dev/ttySIOC31		Altix ioc3 serial card
 		 148 = /dev/ttyPSC0		PPC PSC - port 0
 		    ...
 		 153 = /dev/ttyPSC5		PPC PSC - port 5
@@ -2761,10 +2752,7 @@
 		 43 = /dev/ttycusmx2		Callout device for ttySMX2
 		 46 = /dev/cucpm0		Callout device for ttyCPM0
 		    ...
-		 49 = /dev/cucpm5		Callout device for ttyCPM5
-		 50 = /dev/cuioc40		Callout device for ttyIOC40
-		    ...
-		 81 = /dev/cuioc431		Callout device for ttyIOC431
+		 51 = /dev/cucpm5		Callout device for ttyCPM5
 		 82 = /dev/cuvr0		Callout device for ttyVR0
 		 83 = /dev/cuvr1		Callout device for ttyVR1
 

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

View file

diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
index 01ec45b..2e189e5 100644
--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
@@ -33,6 +33,7 @@ properties:
               - amlogic,meson8b-uart
               - amlogic,meson-gx-uart
               - amlogic,meson-s4-uart
+              - amlogic,meson-a1-uart
           - const: amlogic,meson-ao-uart
       - description: Always-on power domain UART controller on G12A SoCs
         items:
@@ -46,10 +47,15 @@ properties:
           - amlogic,meson8b-uart
           - amlogic,meson-gx-uart
           - amlogic,meson-s4-uart
+          - amlogic,meson-a1-uart
       - description: Everything-Else power domain UART controller on G12A SoCs
         items:
           - const: amlogic,meson-g12a-uart
           - const: amlogic,meson-gx-uart
+      - description: UART controller on S4 compatible SoCs
+        items:
+          - const: amlogic,t7-uart
+          - const: amlogic,meson-s4-uart
 
   reg:
     maxItems: 1

Documentation/devicetree/bindings/serial/fsl-lpuart.yaml

View file

diff --git a/Documentation/devicetree/bindings/serial/fsl-lpuart.yaml b/Documentation/devicetree/bindings/serial/fsl-lpuart.yaml
index 9306240..3a5b59f 100644
--- a/Documentation/devicetree/bindings/serial/fsl-lpuart.yaml
+++ b/Documentation/devicetree/bindings/serial/fsl-lpuart.yaml
@@ -25,11 +25,15 @@ properties:
           - fsl,imxrt1050-lpuart
       - items:
           - enum:
-              - fsl,imx93-lpuart
               - fsl,imx8ulp-lpuart
           - const: fsl,imx7ulp-lpuart
       - items:
           - enum:
+              - fsl,imx93-lpuart
+          - const: fsl,imx8ulp-lpuart
+          - const: fsl,imx7ulp-lpuart
+      - items:
+          - enum:
               - fsl,imx8qm-lpuart
               - fsl,imx8dxl-lpuart
           - const: fsl,imx8qxp-lpuart

Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt

View file

diff --git a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
index 0fa8e3e..1a7e4bf 100644
--- a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
+++ b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
@@ -23,6 +23,9 @@ Optional properties:
     1 = active low.
 - irda-mode-ports: An array that lists the indices of the port that
 		   should operate in IrDA mode.
+- nxp,modem-control-line-ports: An array that lists the indices of the port that
+				should have shared GPIO lines configured as
+				modem control lines.
 
 Example:
         sc16is750: sc16is750@51 {
@@ -35,6 +38,26 @@ Example:
                 #gpio-cells = <2>;
         };
 
+	sc16is752: sc16is752@53 {
+		compatible = "nxp,sc16is752";
+		reg = <0x53>;
+		clocks = <&clk20m>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+		nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */
+		gpio-controller; /* Port 0 as GPIOs */
+		#gpio-cells = <2>;
+	};
+
+	sc16is752: sc16is752@54 {
+		compatible = "nxp,sc16is752";
+		reg = <0x54>;
+		clocks = <&clk20m>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+		nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */
+	};
+
 * spi as bus
 
 Required properties:
@@ -59,6 +82,9 @@ Optional properties:
     1 = active low.
 - irda-mode-ports: An array that lists the indices of the port that
 		   should operate in IrDA mode.
+- nxp,modem-control-line-ports: An array that lists the indices of the port that
+				should have shared GPIO lines configured as
+				modem control lines.
 
 Example:
 	sc16is750: sc16is750@0 {
@@ -70,3 +96,23 @@ Example:
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
+
+	sc16is752: sc16is752@1 {
+		compatible = "nxp,sc16is752";
+		reg = <1>;
+		clocks = <&clk20m>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+		nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */
+		gpio-controller; /* Port 0 as GPIOs */
+		#gpio-cells = <2>;
+	};
+
+	sc16is752: sc16is752@2 {
+		compatible = "nxp,sc16is752";
+		reg = <2>;
+		clocks = <&clk20m>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+		nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */
+	};

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

View file

diff --git a/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml b/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
index 3862411..17c5531 100644
--- a/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
@@ -117,7 +117,6 @@ properties:
 required:
   - compatible
   - reg
-  - interrupts
 
 unevaluatedProperties: false
 

Documentation/driver-api/tty/tty_buffer.rst

View file

diff --git a/Documentation/driver-api/tty/tty_buffer.rst b/Documentation/driver-api/tty/tty_buffer.rst
index a39d478..4b5ca17 100644
--- a/Documentation/driver-api/tty/tty_buffer.rst
+++ b/Documentation/driver-api/tty/tty_buffer.rst
@@ -15,10 +15,13 @@ Flip Buffer Management
 ======================
 
 .. kernel-doc:: drivers/tty/tty_buffer.c
-   :identifiers: tty_prepare_flip_string tty_insert_flip_string_fixed_flag
-           tty_insert_flip_string_flags __tty_insert_flip_char
+   :identifiers: tty_prepare_flip_string
            tty_flip_buffer_push tty_ldisc_receive_buf
 
+.. kernel-doc:: include/linux/tty_flip.h
+   :identifiers: tty_insert_flip_string_fixed_flag tty_insert_flip_string_flags
+           tty_insert_flip_char
+
 ----
 
 Other Functions

arch/alpha/kernel/setup.c

View file

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 3d74735..c80258e 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -421,7 +421,7 @@ register_cpus(void)
 arch_initcall(register_cpus);
 
 #ifdef CONFIG_MAGIC_SYSRQ
-static void sysrq_reboot_handler(int unused)
+static void sysrq_reboot_handler(u8 unused)
 {
 	machine_halt();
 }

arch/alpha/kernel/srmcons.c

View file

diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 6dc952b..d6139db 100644
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -129,9 +129,8 @@ srmcons_do_write(struct tty_port *port, const char *buf, int count)
 	return count;
 }
 
-static int
-srmcons_write(struct tty_struct *tty,
-	      const unsigned char *buf, int count)
+static ssize_t
+srmcons_write(struct tty_struct *tty, const u8 *buf, size_t count)
 {
 	unsigned long flags;
 

arch/arm64/boot/dts/amlogic/meson-a1.dtsi

View file

diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
index c8f3445..96225c4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
@@ -108,7 +108,7 @@
 			};
 
 			uart_AO: serial@1c00 {
-				compatible = "amlogic,meson-gx-uart",
+				compatible = "amlogic,meson-a1-uart",
 					     "amlogic,meson-ao-uart";
 				reg = <0x0 0x1c00 0x0 0x18>;
 				interrupts = <GIC_SPI 25 IRQ_TYPE_EDGE_RISING>;
@@ -118,7 +118,7 @@
 			};
 
 			uart_AO_B: serial@2000 {
-				compatible = "amlogic,meson-gx-uart",
+				compatible = "amlogic,meson-a1-uart",
 					     "amlogic,meson-ao-uart";
 				reg = <0x0 0x2000 0x0 0x18>;
 				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

arch/loongarch/kernel/sysrq.c

View file

diff --git a/arch/loongarch/kernel/sysrq.c b/arch/loongarch/kernel/sysrq.c
index 366baef..e663c10 100644
--- a/arch/loongarch/kernel/sysrq.c
+++ b/arch/loongarch/kernel/sysrq.c
@@ -43,7 +43,7 @@ static void sysrq_tlbdump_othercpus(struct work_struct *dummy)
 static DECLARE_WORK(sysrq_tlbdump, sysrq_tlbdump_othercpus);
 #endif
 
-static void sysrq_handle_tlbdump(int key)
+static void sysrq_handle_tlbdump(u8 key)
 {
 	sysrq_tlbdump_single(NULL);
 #ifdef CONFIG_SMP

arch/m68k/emu/nfcon.c

View file

diff --git a/arch/m68k/emu/nfcon.c b/arch/m68k/emu/nfcon.c
index 6fdc136..3a74d49 100644
--- a/arch/m68k/emu/nfcon.c
+++ b/arch/m68k/emu/nfcon.c
@@ -70,16 +70,16 @@ static void nfcon_tty_close(struct tty_struct *tty, struct file *filp)
 {
 }
 
-static int nfcon_tty_write(struct tty_struct *tty, const unsigned char *buf,
-			   int count)
+static ssize_t nfcon_tty_write(struct tty_struct *tty, const u8 *buf,
+			       size_t count)
 {
 	nfputs(buf, count);
 	return count;
 }
 
-static int nfcon_tty_put_char(struct tty_struct *tty, unsigned char ch)
+static int nfcon_tty_put_char(struct tty_struct *tty, u8 ch)
 {
-	char temp[2] = { ch, 0 };
+	u8 temp[2] = { ch, 0 };
 
 	nf_call(stderr_id, virt_to_phys(temp));
 	return 1;

arch/mips/kernel/sysrq.c

View file

diff --git a/arch/mips/kernel/sysrq.c b/arch/mips/kernel/sysrq.c
index 9c1a201..2e98049 100644
--- a/arch/mips/kernel/sysrq.c
+++ b/arch/mips/kernel/sysrq.c
@@ -44,7 +44,7 @@ static void sysrq_tlbdump_othercpus(struct work_struct *dummy)
 static DECLARE_WORK(sysrq_tlbdump, sysrq_tlbdump_othercpus);
 #endif
 
-static void sysrq_handle_tlbdump(int key)
+static void sysrq_handle_tlbdump(u8 key)
 {
 	sysrq_tlbdump_single(NULL);
 #ifdef CONFIG_SMP

arch/powerpc/include/asm/fs_pd.h

View before deletion

diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h
deleted file mode 100644
index d530f68..0000000
--- a/arch/powerpc/include/asm/fs_pd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Platform information definitions.
- *
- * 2006 (c) MontaVista Software, Inc.
- * Vitaly Bordug <[email protected]>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#ifndef FS_PD_H
-#define FS_PD_H
-#include <sysdev/fsl_soc.h>
-#include <asm/time.h>
-
-static inline int uart_baudrate(void)
-{
-        return get_baudrate();
-}
-
-static inline int uart_clock(void)
-{
-        return ppc_proc_freq;
-}
-
-#endif

arch/powerpc/platforms/8xx/mpc885ads_setup.c

View file

diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 76c7cd7..2d899be 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -21,7 +21,6 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 
-#include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
 #include <linux/of_address.h>

arch/powerpc/platforms/8xx/tqm8xx_setup.c

View file

diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
index 1670dfd..d97a791 100644
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@ -24,7 +24,6 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 
-#include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
 #include <linux/of_fdt.h>

arch/powerpc/sysdev/fsl_soc.c

View file

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 528506f..3949ceb 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -22,7 +22,6 @@
 #include <linux/phy.h>
 #include <linux/spi/spi.h>
 #include <linux/fsl_devices.h>
-#include <linux/fs_uart_pd.h>
 #include <linux/reboot.h>
 
 #include <linux/atomic.h>
@@ -35,7 +34,6 @@
 #include <asm/cpm2.h>
 #include <asm/fsl_hcalls.h>	/* For the Freescale hypervisor */
 
-extern void init_smc_ioports(struct fs_uart_platform_info*);
 static phys_addr_t immrbase = -1;
 
 phys_addr_t get_immrbase(void)

arch/powerpc/xmon/xmon.c

View file

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 5888fcd..b3b94cd 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -3988,7 +3988,7 @@ static void xmon_init(int enable)
 }
 
 #ifdef CONFIG_MAGIC_SYSRQ
-static void sysrq_handle_xmon(int key)
+static void sysrq_handle_xmon(u8 key)
 {
 	if (xmon_is_locked_down()) {
 		clear_all_bpt();

arch/sparc/include/asm/vio.h

View file

diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 8a0c3c1..587fb78 100644
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -284,7 +284,7 @@ struct vio_dring_state {
 	struct ldc_trans_cookie	cookies[VIO_MAX_RING_COOKIES];
 };
 
-#define VIO_TAG_SIZE		((int)sizeof(struct vio_msg_tag))
+#define VIO_TAG_SIZE		(sizeof(struct vio_msg_tag))
 #define VIO_VCC_MTU_SIZE	(LDC_PACKET_SIZE - VIO_TAG_SIZE)
 
 struct vio_vcc {

arch/sparc/kernel/process_64.c

View file

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 1ea3f37..529adfe 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -295,7 +295,7 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, int exclude_cpu)
 
 #ifdef CONFIG_MAGIC_SYSRQ
 
-static void sysrq_handle_globreg(int key)
+static void sysrq_handle_globreg(u8 key)
 {
 	trigger_all_cpu_backtrace();
 }
@@ -370,7 +370,7 @@ static void pmu_snapshot_all_cpus(void)
 	spin_unlock_irqrestore(&global_cpu_snapshot_lock, flags);
 }
 
-static void sysrq_handle_globpmu(int key)
+static void sysrq_handle_globpmu(u8 key)
 {
 	pmu_snapshot_all_cpus();
 }

arch/um/drivers/line.c

View file

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 02b0bef..b98545f 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -184,7 +184,7 @@ void line_flush_chars(struct tty_struct *tty)
 	line_flush_buffer(tty);
 }
 
-int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
+ssize_t line_write(struct tty_struct *tty, const u8 *buf, size_t len)
 {
 	struct line *line = tty->driver_data;
 	unsigned long flags;

arch/um/drivers/line.h

View file

diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h
index f15be75..e84fb9b 100644
--- a/arch/um/drivers/line.h
+++ b/arch/um/drivers/line.h
@@ -64,8 +64,7 @@ extern void line_cleanup(struct tty_struct *tty);
 extern void line_hangup(struct tty_struct *tty);
 extern int line_setup(char **conf, unsigned nlines, char **def,
 		      char *init, char *name);
-extern int line_write(struct tty_struct *tty, const unsigned char *buf,
-		      int len);
+extern ssize_t line_write(struct tty_struct *tty, const u8 *buf, size_t len);
 extern unsigned int line_chars_in_buffer(struct tty_struct *tty);
 extern void line_flush_buffer(struct tty_struct *tty);
 extern void line_flush_chars(struct tty_struct *tty);

arch/xtensa/platforms/iss/console.c

View file

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 10b79d3..7d1f8b3 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -52,8 +52,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
 }
 
 
-static int rs_write(struct tty_struct * tty,
-		    const unsigned char *buf, int count)
+static ssize_t rs_write(struct tty_struct * tty, const u8 *buf, size_t count)
 {
 	/* see drivers/char/serialX.c to reference original version */
 
@@ -82,32 +81,12 @@ static void rs_poll(struct timer_list *unused)
 		mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
 }
 
-
-static int rs_put_char(struct tty_struct *tty, unsigned char ch)
-{
-	return rs_write(tty, &ch, 1);
-}
-
-static void rs_flush_chars(struct tty_struct *tty)
-{
-}
-
 static unsigned int rs_write_room(struct tty_struct *tty)
 {
 	/* Let's say iss can always accept 2K characters.. */
 	return 2 * 1024;
 }
 
-static void rs_hangup(struct tty_struct *tty)
-{
-	/* Stub, once again.. */
-}
-
-static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-	/* Stub, once again.. */
-}
-
 static int rs_proc_show(struct seq_file *m, void *v)
 {
 	seq_printf(m, "serinfo:1.0 driver:0.1\n");
@@ -118,11 +97,7 @@ static const struct tty_operations serial_ops = {
 	.open = rs_open,
 	.close = rs_close,
 	.write = rs_write,
-	.put_char = rs_put_char,
-	.flush_chars = rs_flush_chars,
 	.write_room = rs_write_room,
-	.hangup = rs_hangup,
-	.wait_until_sent = rs_wait_until_sent,
 	.proc_show = rs_proc_show,
 };
 

drivers/accessibility/speakup/spk_ttyio.c

View file

diff --git a/drivers/accessibility/speakup/spk_ttyio.c b/drivers/accessibility/speakup/spk_ttyio.c
index 07373b3..4c0a6e1 100644
--- a/drivers/accessibility/speakup/spk_ttyio.c
+++ b/drivers/accessibility/speakup/spk_ttyio.c
@@ -71,15 +71,14 @@ static void spk_ttyio_ldisc_close(struct tty_struct *tty)
 	kfree(tty->disc_data);
 }
 
-static int spk_ttyio_receive_buf2(struct tty_struct *tty,
-				  const unsigned char *cp,
-				  const char *fp, int count)
+static size_t spk_ttyio_receive_buf2(struct tty_struct *tty, const u8 *cp,
+				     const u8 *fp, size_t count)
 {
 	struct spk_ldisc_data *ldisc_data = tty->disc_data;
 	struct spk_synth *synth = ldisc_data->synth;
 
 	if (synth->read_buff_add) {
-		int i;
+		unsigned int i;
 
 		for (i = 0; i < count; i++)
 			synth->read_buff_add(cp[i]);

drivers/bluetooth/hci_ldisc.c

View file

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index a76eb98..a26367e 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -599,7 +599,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
  * Return Value:    None
  */
 static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
-				 const char *flags, int count)
+				 const u8 *flags, size_t count)
 {
 	struct hci_uart *hu = tty->disc_data;
 
@@ -807,20 +807,14 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
  * We don't provide read/write/poll interface for user space.
  */
 static ssize_t hci_uart_tty_read(struct tty_struct *tty, struct file *file,
-				 unsigned char *buf, size_t nr,
-				 void **cookie, unsigned long offset)
+				 u8 *buf, size_t nr, void **cookie,
+				 unsigned long offset)
 {
 	return 0;
 }
 
 static ssize_t hci_uart_tty_write(struct tty_struct *tty, struct file *file,
-				  const unsigned char *data, size_t count)
-{
-	return 0;
-}
-
-static __poll_t hci_uart_tty_poll(struct tty_struct *tty,
-				      struct file *filp, poll_table *wait)
+				  const u8 *data, size_t count)
 {
 	return 0;
 }
@@ -835,7 +829,6 @@ static struct tty_ldisc_ops hci_uart_ldisc = {
 	.write		= hci_uart_tty_write,
 	.ioctl		= hci_uart_tty_ioctl,
 	.compat_ioctl	= hci_uart_tty_ioctl,
-	.poll		= hci_uart_tty_poll,
 	.receive_buf	= hci_uart_tty_receive,
 	.write_wakeup	= hci_uart_tty_wakeup,
 };

drivers/char/ttyprintk.c

View file

diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index ed45d04..5af804c 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -51,7 +51,7 @@ static void tpk_flush(void)
 	}
 }
 
-static int tpk_printk(const unsigned char *buf, int count)
+static int tpk_printk(const u8 *buf, int count)
 {
 	int i;
 
@@ -103,8 +103,7 @@ static void tpk_close(struct tty_struct *tty, struct file *filp)
 /*
  * TTY operations write function.
  */
-static int tpk_write(struct tty_struct *tty,
-		const unsigned char *buf, int count)
+static ssize_t tpk_write(struct tty_struct *tty, const u8 *buf, size_t count)
 {
 	struct ttyprintk_port *tpkp = tty->driver_data;
 	unsigned long flags;

drivers/gpu/drm/drm_fb_helper.c

View file

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 61a5d45..d612133 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c

This diff is incomplete. Download the complete patch.