Commit 3b184057 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

usb: acpi: fix device link removal 



The device link to the USB4 host interface has to be removed
manually since it's no longer auto removed.

Fixes: 623dae3e ("usb: acpi: fix boot hang due to early incorrect 'tunneled' USB3 device links")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20250611111415.2707865-1-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f5b7e2b

drivers/usb/core/hub.c

+3 −0
Original line number Diff line number Diff line
@@ -2368,6 +2368,9 @@ void usb_disconnect(struct usb_device **pdev) 
	usb_remove_ep_devs(&udev->ep0);

	usb_unlock_device(udev);



	if (udev->usb4_link)

		device_link_del(udev->usb4_link);



	/* Unregister the device.  The device driver is responsible

	 * for de-configuring the device and invoking the remove-device

	 * notifier chain (used by usbfs and possibly others).

drivers/usb/core/usb-acpi.c

+3 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ EXPORT_SYMBOL_GPL(usb_acpi_set_power_state); 
 */

static int usb_acpi_add_usb4_devlink(struct usb_device *udev)

{

	const struct device_link *link;

	struct device_link *link;

	struct usb_port *port_dev;

	struct usb_hub *hub;
@@ -188,6 +188,8 @@ static int usb_acpi_add_usb4_devlink(struct usb_device *udev) 
	dev_dbg(&port_dev->dev, "Created device link from %s to %s\n",

		dev_name(&port_dev->child->dev), dev_name(nhi_fwnode->dev));



	udev->usb4_link = link;



	return 0;

}

include/linux/usb.h

+2 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ struct usb3_lpm_parameters { 
 *	FIXME -- complete doc

 * @authenticated: Crypto authentication passed

 * @tunnel_mode: Connection native or tunneled over USB4

 * @usb4_link: device link to the USB4 host interface

 * @lpm_capable: device supports LPM

 * @lpm_devinit_allow: Allow USB3 device initiated LPM, exit latency is in range

 * @usb2_hw_lpm_capable: device can perform USB2 hardware LPM
@@ -724,6 +725,7 @@ struct usb_device { 
	unsigned reset_resume:1;

	unsigned port_is_suspended:1;

	enum usb_link_tunnel_mode tunnel_mode;

	struct device_link *usb4_link;



	int slot_id;

	struct usb2_lpm_parameters l1_params;