FAILED: patch "[PATCH] xhci: dbgtty: fix device unregister: fixup" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 74098cc06e753d3ffd8398b040a3a1dfb65260c0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025122918-sagging-divisible-a4a4@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 74098cc06e753d3ffd8398b040a3a1dfb65260c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bartosik?= <[email protected]>
Date: Thu, 27 Nov 2025 11:16:44 +0000
Subject: [PATCH] xhci: dbgtty: fix device unregister: fixup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This fixup replaces tty_vhangup() call with call to tty_port_tty_vhangup(). Both calls hangup tty device synchronously however tty_port_tty_vhangup() increases reference count during the hangup operation using scoped_guard(tty_port_tty).
Cc stable <[email protected]>
Fixes 1f73b8b56cf3 ("xhci: dbgtty: fix device unregister")
Signed-off-by Łukasz Bartosik <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/usb/host/xhci-dbgtty.c +1 -1
@@ -554,7 +554,7 @@ static void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc)* Hang up the TTY. This wakes up any blocked * writers and causes subsequent writes to fail. */ -tty_vhangup (port->port.tty); +tty_port_tty_vhangup (&port->port);tty_unregister_device (dbc_tty_driver, port->minor);xhci_dbc_tty_exit_port (port);
Sasha Levin
maintainerPATCH 1/3 serial: Make uart_remove_one_port() return void
From: Uwe Kleine-König <[email protected]>
[ Upstream commit d5b3d02d0b107345f2a6ecb5b06f98356f5c97ab ]
The return value is only ever used as a return value for remove callbacks of platform drivers. This return value is ignored by the driver core. (The only effect is an error message, but uart_remove_one_port() already emitted one in this case.)
So the return value isn't used at all and uart_remove_one_port() can be changed to return void without any loss. Also this better matches the Linux device model as remove functions are not supposed to fail.
Signed-off-by Uwe Kleine-König <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Stable-dep-of: 74098cc06e75 ("xhci: dbgtty: fix device unregister: fixup")
Signed-off-by Sasha Levin <[email protected]>
--- drivers/tty/serial/atmel_serial.c | 5 ++--- drivers/tty/serial/clps711x.c | 4 +++- drivers/tty/serial/cpm_uart/cpm_uart_core.c | 5 ++++- drivers/tty/serial/imx.c | 4 +++- drivers/tty/serial/lantiq.c | 4 +++- drivers/tty/serial/serial_core.c | 6 +----- drivers/tty/serial/st-asc.c | 4 +++- drivers/tty/serial/uartlite.c | 12 ++++-------- drivers/tty/serial/xilinx_uartps.c | 5 ++--- include/linux/serial_core.h | 2 +- 10 files changed, 26 insertions(+), 25 deletions(-)
drivers/tty/serial/atmel_serial.c +2 -3
@@ -3022,14 +3022,13 @@ static int atmel_serial_remove(struct platform_device *pdev) {struct uart_port *port =platform_get_drvdata (pdev);struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); -int ret =0 ;tasklet_kill (&atmel_port->tasklet_rx);tasklet_kill (&atmel_port->tasklet_tx);device_init_wakeup (&pdev->dev,0 ); - ret =uart_remove_one_port (&atmel_uart, port); +uart_remove_one_port (&atmel_uart, port);kfree (atmel_port->rx_ring.buf);
@@ -3039,7 +3038,7 @@ static int atmel_serial_remove(struct platform_device *pdev) pdev->dev.of_node =NULL ; -return ret; +return 0 ; } static SIMPLE_DEV_PM_OPS(atmel_serial_pm_ops, atmel_serial_suspend,
drivers/tty/serial/clps711x.c +3 -1
@@ -515,7 +515,9 @@ static int uart_clps711x_remove(struct platform_device *pdev) {struct clps711x_port *s =platform_get_drvdata (pdev); -return uart_remove_one_port (&clps711x_uart, &s->port); +uart_remove_one_port (&clps711x_uart, &s->port); + +return 0 ; }static const struct of_device_id __maybe_unused clps711x_uart_dt_ids[] = {
drivers/tty/serial/cpm_uart/cpm_uart_core.c +4 -1
@@ -1428,7 +1428,10 @@ static int cpm_uart_probe(struct platform_device *ofdev)static int cpm_uart_remove (struct platform_device *ofdev) {struct uart_cpm_port *pinfo =platform_get_drvdata (ofdev); -return uart_remove_one_port (&cpm_reg, &pinfo->port); + +uart_remove_one_port (&cpm_reg, &pinfo->port); + +return 0 ; }static const struct of_device_id cpm_uart_match[] = {
drivers/tty/serial/imx.c +3 -1
@@ -2538,7 +2538,9 @@ static int imx_uart_remove(struct platform_device *pdev) {struct imx_port *sport =platform_get_drvdata (pdev); -return uart_remove_one_port (&imx_uart_uart_driver, &sport->port); +uart_remove_one_port (&imx_uart_uart_driver, &sport->port); + +return 0 ; }static void imx_uart_restore_context (struct imx_port *sport)
drivers/tty/serial/lantiq.c +3 -1
@@ -918,7 +918,9 @@ static int lqasc_remove(struct platform_device *pdev) {struct uart_port *port =platform_get_drvdata (pdev); -return uart_remove_one_port (&lqasc_reg, port); +uart_remove_one_port (&lqasc_reg, port); + +return 0 ; }static const struct ltq_soc_data soc_data_lantiq = {
drivers/tty/serial/serial_core.c +1 -5
@@ -3186,13 +3186,12 @@ EXPORT_SYMBOL(uart_add_one_port);* This unhooks (and hangs up) the specified port structure from the core * driver. No further calls will be made to the low-level code for this port. */ -int uart_remove_one_port (struct uart_driver *drv,struct uart_port *uport) +void uart_remove_one_port (struct uart_driver *drv,struct uart_port *uport) {struct uart_state *state = drv->state + uport->line;struct tty_port *port = &state->port;struct uart_port *uart_port;struct tty_struct *tty; -int ret =0 ;mutex_lock (&port_mutex);
@@ -3208,7 +3207,6 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)if (!uart_port) {mutex_unlock (&port->mutex); - ret = -EINVAL ; goto out; } uport->flags |=UPF_DEAD ;
@@ -3251,8 +3249,6 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)mutex_unlock (&port->mutex); out:mutex_unlock (&port_mutex); - -return ret; }EXPORT_SYMBOL (uart_remove_one_port);
drivers/tty/serial/st-asc.c +3 -1
@@ -834,7 +834,9 @@ static int asc_serial_remove(struct platform_device *pdev) {struct uart_port *port =platform_get_drvdata (pdev); -return uart_remove_one_port (&asc_uart_driver, port); +uart_remove_one_port (&asc_uart_driver, port); + +return 0 ; }#ifdef CONFIG_PM_SLEEP
drivers/tty/serial/uartlite.c +4 -8
@@ -686,18 +686,15 @@ static int ulite_assign(struct device *dev, int id, phys_addr_t base, int irq,* * @dev: pointer to device structure */ -static int ulite_release (struct device *dev) +static void ulite_release (struct device *dev) {struct uart_port *port =dev_get_drvdata (dev); -int rc =0 ;if (port) { - rc =uart_remove_one_port (&ulite_uart_driver, port); +uart_remove_one_port (&ulite_uart_driver, port);dev_set_drvdata (dev,NULL ); port->mapbase =0 ; } - -return rc; }/**
@@ -891,14 +888,13 @@ static int ulite_remove(struct platform_device *pdev) {struct uart_port *port =dev_get_drvdata (&pdev->dev);struct uartlite_data *pdata = port->private_data; -int rc;clk_disable_unprepare (pdata->clk); - rc =ulite_release (&pdev->dev); +ulite_release (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_runtime_set_suspended (&pdev->dev);pm_runtime_dont_use_autosuspend (&pdev->dev); -return rc; +return 0 ; }/* work with hotplug and coldplug */
drivers/tty/serial/xilinx_uartps.c +2 -3
@@ -1670,14 +1670,13 @@ static int cdns_uart_remove(struct platform_device *pdev) {struct uart_port *port =platform_get_drvdata (pdev);struct cdns_uart *cdns_uart_data = port->private_data; -int rc;/* Remove the cdns_uart port from the serial core */ #ifdef CONFIG_COMMON_CLK clk_notifier_unregister (cdns_uart_data->uartclk, &cdns_uart_data->clk_rate_change_nb);#endif - rc =uart_remove_one_port (cdns_uart_data->cdns_uart_driver, port); +uart_remove_one_port (cdns_uart_data->cdns_uart_driver, port); port->mapbase =0 ;clk_disable_unprepare (cdns_uart_data->uartclk);clk_disable_unprepare (cdns_uart_data->pclk);
@@ -1693,7 +1692,7 @@ static int cdns_uart_remove(struct platform_device *pdev)if (!--instances)uart_unregister_driver (cdns_uart_data->cdns_uart_driver); -return rc; +return 0 ; }static struct platform_driver cdns_uart_platform_driver = {
include/linux/serial_core.h +1 -1
@@ -847,7 +847,7 @@ void uart_console_write(struct uart_port *port, const char *s,int uart_register_driver (struct uart_driver *uart);void uart_unregister_driver (struct uart_driver *uart);int uart_add_one_port (struct uart_driver *reg,struct uart_port *port); -int uart_remove_one_port (struct uart_driver *reg,struct uart_port *port); +void uart_remove_one_port (struct uart_driver *reg,struct uart_port *port);bool uart_match_port (const struct uart_port *port1,const struct uart_port *port2);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/3 tty: introduce and use tty_port_tty_vhangup() helper
From: "Jiri Slaby (SUSE)" <[email protected]>
[ Upstream commit 2b5eac0f8c6e79bc152c8804f9f88d16717013ab ]
This code (tty_get -> vhangup -> tty_put) is repeated on few places. Introduce a helper similar to tty_port_tty_hangup() (asynchronous) to handle even vhangup (synchronous).
And use it on those places.
In fact, reuse the tty_port_tty_hangup()'s code and call tty_vhangup() depending on a new bool parameter.
Signed-off-by "Jiri Slaby (SUSE)" <[email protected]>
Cc Karsten Keil <[email protected]>
Cc David Lin <[email protected]>
Cc Johan Hovold <[email protected]>
Cc Alex Elder <[email protected]>
Cc Oliver Neukum <[email protected]>
Cc Marcel Holtmann <[email protected]>
Cc Johan Hedberg <[email protected]>
Cc Luiz Augusto von Dentz <[email protected]>
Reviewed-by Ilpo Järvinen <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Stable-dep-of: 74098cc06e75 ("xhci: dbgtty: fix device unregister: fixup")
Signed-off-by Sasha Levin <[email protected]>
--- drivers/isdn/capi/capi.c | 8 +------- drivers/staging/greybus/uart.c | 7 +------ drivers/tty/serial/serial_core.c | 7 +------ drivers/tty/tty_port.c | 12 ++++++++---- drivers/usb/class/cdc-acm.c | 7 +------ drivers/usb/serial/usb-serial.c | 7 +------ include/linux/tty_port.h | 12 +++++++++++- net/bluetooth/rfcomm/tty.c | 7 +------ 8 files changed, 25 insertions(+), 42 deletions(-)
drivers/isdn/capi/capi.c +1 -7
@@ -304,15 +304,9 @@ static void capincci_alloc_minor(struct capidev *cdev, struct capincci *np)static void capincci_free_minor (struct capincci *np) {struct capiminor *mp = np->minorp; -struct tty_struct *tty;if (mp) { - tty =tty_port_tty_get (&mp->port); -if (tty) { -tty_vhangup (tty); -tty_kref_put (tty); - } - +tty_port_tty_vhangup (&mp->port);capiminor_free (mp); } }
drivers/staging/greybus/uart.c +1 -6
@@ -915,7 +915,6 @@ static void gb_uart_remove(struct gbphy_device *gbphy_dev) {struct gb_tty *gb_tty =gb_gbphy_get_data (gbphy_dev);struct gb_connection *connection = gb_tty->connection; -struct tty_struct *tty;int ret; ret =gbphy_runtime_get_sync (gbphy_dev);
@@ -928,11 +927,7 @@ static void gb_uart_remove(struct gbphy_device *gbphy_dev)wake_up_all (&gb_tty->wioctl);mutex_unlock (&gb_tty->mutex); - tty =tty_port_tty_get (&gb_tty->port); -if (tty) { -tty_vhangup (tty); -tty_kref_put (tty); - } +tty_port_tty_vhangup (&gb_tty->port);gb_connection_disable_rx (connection);tty_unregister_device (gb_tty_driver, gb_tty->minor);
drivers/tty/serial/serial_core.c +1 -6
@@ -3191,7 +3191,6 @@ void uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)struct uart_state *state = drv->state + uport->line;struct tty_port *port = &state->port;struct uart_port *uart_port; -struct tty_struct *tty;mutex_lock (&port_mutex);
@@ -3217,11 +3216,7 @@ void uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)*/ tty_port_unregister_device (port, drv->tty_driver, uport->line); - tty =tty_port_tty_get (port); -if (tty) { -tty_vhangup (port->tty); -tty_kref_put (tty); - } +tty_port_tty_vhangup (port);/* * If the port is used as a console, unregister it
drivers/tty/tty_port.c +8 -4
@@ -416,15 +416,19 @@ EXPORT_SYMBOL(tty_port_hangup);* @port: tty port * @check_clocal: hang only ttys with %CLOCAL unset? */ -void tty_port_tty_hangup (struct tty_port *port,bool check_clocal) +void __tty_port_tty_hangup (struct tty_port *port,bool check_clocal,bool async) {struct tty_struct *tty =tty_port_tty_get (port); -if (tty && (!check_clocal || !C_CLOCAL (tty))) -tty_hangup (tty); +if (tty && (!check_clocal || !C_CLOCAL (tty))) { +if (async) +tty_hangup (tty); +else +tty_vhangup (tty); + }tty_kref_put (tty); } -EXPORT_SYMBOL_GPL (tty_port_tty_hangup); +EXPORT_SYMBOL_GPL (__tty_port_tty_hangup);/** * tty_port_tty_wakeup - helper to wake up a tty
drivers/usb/class/cdc-acm.c +1 -6
@@ -1548,7 +1548,6 @@ static int acm_probe(struct usb_interface *intf,static void acm_disconnect (struct usb_interface *intf) {struct acm *acm =usb_get_intfdata (intf); -struct tty_struct *tty;int i;/* sibling interface is already cleaning up */
@@ -1575,11 +1574,7 @@ static void acm_disconnect(struct usb_interface *intf)usb_set_intfdata (acm->data,NULL );mutex_unlock (&acm->mutex); - tty =tty_port_tty_get (&acm->port); -if (tty) { -tty_vhangup (tty); -tty_kref_put (tty); - } +tty_port_tty_vhangup (&acm->port);cancel_delayed_work_sync (&acm->dwork);
drivers/usb/serial/usb-serial.c +1 -6
@@ -1179,7 +1179,6 @@ static void usb_serial_disconnect(struct usb_interface *interface)struct usb_serial *serial =usb_get_intfdata (interface);struct device *dev = &interface->dev;struct usb_serial_port *port; -struct tty_struct *tty;/* sibling interface is cleaning up */ if (!serial)
@@ -1194,11 +1193,7 @@ static void usb_serial_disconnect(struct usb_interface *interface)for (i =0 ; i < serial->num_ports; ++i) { port = serial->port[i]; - tty =tty_port_tty_get (&port->port); -if (tty) { -tty_vhangup (tty); -tty_kref_put (tty); - } +tty_port_tty_vhangup (&port->port);usb_serial_port_poison_urbs (port);wake_up_interruptible (&port->port.delta_msr_wait);cancel_work_sync (&port->work);
include/linux/tty_port.h +11 -1
@@ -234,7 +234,7 @@ int tty_port_carrier_raised(struct tty_port *port);void tty_port_raise_dtr_rts (struct tty_port *port);void tty_port_lower_dtr_rts (struct tty_port *port);void tty_port_hangup (struct tty_port *port); -void tty_port_tty_hangup (struct tty_port *port,bool check_clocal); +void __tty_port_tty_hangup (struct tty_port *port,bool check_clocal,bool async);void tty_port_tty_wakeup (struct tty_port *port);int tty_port_block_til_ready (struct tty_port *port,struct tty_struct *tty,struct file *filp);
@@ -253,4 +253,14 @@ static inline int tty_port_users(struct tty_port *port) return port->count + port->blocked_open; } +static inline void tty_port_tty_hangup (struct tty_port *port,bool check_clocal) +{ +__tty_port_tty_hangup (port, check_clocal, true); +} + +static inline void tty_port_tty_vhangup (struct tty_port *port) +{ +__tty_port_tty_hangup (port, false, false); +} +#endif
net/bluetooth/rfcomm/tty.c +1 -6
@@ -438,7 +438,6 @@ static int __rfcomm_release_dev(void __user *arg) {struct rfcomm_dev_req req;struct rfcomm_dev *dev; -struct tty_struct *tty;if (copy_from_user (&req, arg,sizeof (req)))return -EFAULT ;
@@ -464,11 +463,7 @@ static int __rfcomm_release_dev(void __user *arg)rfcomm_dlc_close (dev->dlc,0 );/* Shut down TTY synchronously before freeing rfcomm_dev */ - tty =tty_port_tty_get (&dev->port); -if (tty) { -tty_vhangup (tty); -tty_kref_put (tty); - } +tty_port_tty_vhangup (&dev->port);if (!test_bit (RFCOMM_TTY_OWNED , &dev->status))tty_port_put (&dev->port);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 3/3 xhci: dbgtty: fix device unregister: fixup
In reply to Sasha LevinFrom: Łukasz Bartosik <[email protected]>
[ Upstream commit 74098cc06e753d3ffd8398b040a3a1dfb65260c0 ]
This fixup replaces tty_vhangup() call with call to tty_port_tty_vhangup(). Both calls hangup tty device synchronously however tty_port_tty_vhangup() increases reference count during the hangup operation using scoped_guard(tty_port_tty).
Cc stable <[email protected]>
Fixes 1f73b8b56cf3 ("xhci: dbgtty: fix device unregister")
Signed-off-by Łukasz Bartosik <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- drivers/usb/host/xhci-dbgtty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-dbgtty.c +1 -1
@@ -523,7 +523,7 @@ static void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc)* Hang up the TTY. This wakes up any blocked * writers and causes subsequent writes to fail. */ -tty_vhangup (port->port.tty); +tty_port_tty_vhangup (&port->port);tty_unregister_device (dbc_tty_driver, port->minor);xhci_dbc_tty_exit_port (port);
Signature · 1 line
2.51.0
PATCH 1/1 xhci: dbgtty: fix device unregister: fixup
In reply to [email protected]This fixup replaces tty_vhangup() call with call to tty_port_tty_vhangup(). Both calls hangup tty device synchronously however tty_port_tty_vhangup() increases reference count during the hangup operation using scoped_guard(tty_port_tty).
Cc stable <[email protected]>
Fixes 1f73b8b56cf3 ("xhci: dbgtty: fix device unregister")
Signed-off-by Łukasz Bartosik <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/usb/host/xhci-dbgtty.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-dbgtty.c +6 -1
@@ -516,6 +516,7 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc)static void xhci_dbc_tty_unregister_device (struct xhci_dbc *dbc) {struct dbc_port *port =dbc_to_port (dbc); +struct tty_struct *tty;if (!port->registered)return ;
@@ -523,7 +524,11 @@ static void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc)* Hang up the TTY. This wakes up any blocked * writers and causes subsequent writes to fail. */ -tty_vhangup (port->port.tty); + tty =tty_port_tty_get (&port->port); +if (tty) { +tty_vhangup (tty); +tty_kref_put (tty); + }tty_unregister_device (dbc_tty_driver, port->minor);xhci_dbc_tty_exit_port (port);
Signature · 1 line
2.52.0.351.gbe84eed79e-goog
Greg Kroah-Hartman
maintainerRe: [PATCH 6.1.y] xhci: dbgtty: fix device unregister: fixup
Quoted 6 lines · Łukasz Bartosik
This fixup replaces
tty_vhangup()call with call totty_port_tty_vhangup(). Both calls hangup tty device synchronously howevertty_port_tty_vhangup()increases reference count during the hangup operation usingscoped_guard(tty_port_tty).
Quoted 8 lines
Cc stable <[email protected]>Fixes 1f73b8b56cf3 ("xhci: dbgtty: fix device unregister")Signed-off-by Łukasz Bartosik <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/usb/host/xhci-dbgtty.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
No git id?
Re: [PATCH 6.1.y] xhci: dbgtty: fix device unregister: fixup
Quoted 17 lines · Greg Kroah-Hartman
Quoted 6 lines · Łukasz Bartosik
This fixup replaces
tty_vhangup()call with call totty_port_tty_vhangup(). Both calls hangup tty device synchronously howevertty_port_tty_vhangup()increases reference count during the hangup operation usingscoped_guard(tty_port_tty).Quoted 8 lines
Cc stable <[email protected]>Fixes 1f73b8b56cf3 ("xhci: dbgtty: fix device unregister")Signed-off-by Łukasz Bartosik <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/usb/host/xhci-dbgtty.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Quoted 1 line
No git id?
If the new API tty_port_tty_vhangup will be included in 6.1 stable then my patch is not needed.
Sorry for the confusion.
Thanks,
Łukasz