diff mbox series

[1/2] usb: usb-acpi: Set port connect type of not connectable ports correctly

Message ID 20240222133819.4149388-1-mathias.nyman@linux.intel.com
State Superseded
Headers show
Series [1/2] usb: usb-acpi: Set port connect type of not connectable ports correctly | expand

Commit Message

Mathias Nyman Feb. 22, 2024, 1:38 p.m. UTC 
Ports with  _UPC (USB Port Capability) ACPI objects stating they are
"not connectable" are not wired to any connector or internal device.
They only exist inside the host controller.

These ports may not have an ACPI _PLD (Physical Location of Device)
object.

Rework the code so that _UPC is read even if _PLD does not exist, and
make sure the port->connect_type is set to "USB_PORT_NOT_USED" instead
of "USB_PORT_CONNECT_TYPE_UNKNOWN".

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
 drivers/usb/core/usb-acpi.c | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

Comments

Greg Kroah-Hartman Feb. 22, 2024, 2:06 p.m. UTC | #1 
On Thu, Feb 22, 2024 at 03:38:18PM +0200, Mathias Nyman wrote:
> Ports with  _UPC (USB Port Capability) ACPI objects stating they are
> "not connectable" are not wired to any connector or internal device.
> They only exist inside the host controller.
> 
> These ports may not have an ACPI _PLD (Physical Location of Device)
> object.
> 
> Rework the code so that _UPC is read even if _PLD does not exist, and
> make sure the port->connect_type is set to "USB_PORT_NOT_USED" instead
> of "USB_PORT_CONNECT_TYPE_UNKNOWN".
> 
> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>

Does patch 2/2 need this?  If so, why isn't it marked for stable?

thanks,

greg k-h
Greg Kroah-Hartman Feb. 22, 2024, 3:50 p.m. UTC | #2 
On Thu, Feb 22, 2024 at 04:46:16PM +0200, Mathias Nyman wrote:
> On 22.2.2024 16.06, Greg KH wrote:
> > On Thu, Feb 22, 2024 at 03:38:18PM +0200, Mathias Nyman wrote:
> > > Ports with  _UPC (USB Port Capability) ACPI objects stating they are
> > > "not connectable" are not wired to any connector or internal device.
> > > They only exist inside the host controller.
> > > 
> > > These ports may not have an ACPI _PLD (Physical Location of Device)
> > > object.
> > > 
> > > Rework the code so that _UPC is read even if _PLD does not exist, and
> > > make sure the port->connect_type is set to "USB_PORT_NOT_USED" instead
> > > of "USB_PORT_CONNECT_TYPE_UNKNOWN".
> > > 
> > > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
> > 
> > Does patch 2/2 need this?  If so, why isn't it marked for stable?
> 
> 2/2 alone fixes the real world port peering problem seen.
> 
> This is something I stumbled upon while debugging that issue.
> This patch just makes sure we don't skip marking some unused ports as
> unused due to how we parse ACPI tables.

Ok, so should patch 1/2 go to usb-next and patch 2/2 go to usb-linus?

confused,

greg k-h
Mathias Nyman Feb. 22, 2024, 10:43 p.m. UTC | #3 
>>
>> Ok, so should patch 1/2 go to usb-next and patch 2/2 go to usb-linus?
> 
> That works as well.

I'll tune up those tags, split the patches, and resend

-Mathias
diff mbox series

Patch

diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index a34b22537d7c..f250dfc3b14d 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -142,12 +142,19 @@  int usb_acpi_set_power_state(struct usb_device *hdev, int index, bool enable)
 }
 EXPORT_SYMBOL_GPL(usb_acpi_set_power_state);
 
-static enum usb_port_connect_type usb_acpi_get_connect_type(acpi_handle handle,
-		struct acpi_pld_info *pld)
+/*
+ * Private to usb-acpi, all the core needs to know is that
+ * port_dev->location is non-zero when it has been set by the firmware.
+ */
+#define USB_ACPI_LOCATION_VALID (1 << 31)
+
+static void
+usb_acpi_get_connect_type(struct usb_port *port_dev, acpi_handle *handle)
 {
 	enum usb_port_connect_type connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN;
 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 	union acpi_object *upc = NULL;
+	struct acpi_pld_info *pld;
 	acpi_status status;
 
 	/*
@@ -158,6 +165,12 @@  static enum usb_port_connect_type usb_acpi_get_connect_type(acpi_handle handle,
 	 * a usb device is directly hard-wired to the port. If no visible and
 	 * no connectable, the port would be not used.
 	 */
+
+	status = acpi_get_physical_device_location(handle, &pld);
+	if (ACPI_SUCCESS(status) && pld)
+		port_dev->location = USB_ACPI_LOCATION_VALID |
+			pld->group_token << 8 | pld->group_position;
+
 	status = acpi_evaluate_object(handle, "_UPC", NULL, &buffer);
 	if (ACPI_FAILURE(status))
 		goto out;
@@ -166,25 +179,22 @@  static enum usb_port_connect_type usb_acpi_get_connect_type(acpi_handle handle,
 	if (!upc || (upc->type != ACPI_TYPE_PACKAGE) || upc->package.count != 4)
 		goto out;
 
+	/* UPC states port is connectable */
 	if (upc->package.elements[0].integer.value)
-		if (pld->user_visible)
+		if (!pld)
+			; /* keep connect_type as unknown */
+		else if (pld->user_visible)
 			connect_type = USB_PORT_CONNECT_TYPE_HOT_PLUG;
 		else
 			connect_type = USB_PORT_CONNECT_TYPE_HARD_WIRED;
-	else if (!pld->user_visible)
+	else
 		connect_type = USB_PORT_NOT_USED;
 out:
+	port_dev->connect_type = connect_type;
 	kfree(upc);
-	return connect_type;
+	ACPI_FREE(pld);
 }
 
-
-/*
- * Private to usb-acpi, all the core needs to know is that
- * port_dev->location is non-zero when it has been set by the firmware.
- */
-#define USB_ACPI_LOCATION_VALID (1 << 31)
-
 static struct acpi_device *
 usb_acpi_get_companion_for_port(struct usb_port *port_dev)
 {
@@ -222,22 +232,12 @@  static struct acpi_device *
 usb_acpi_find_companion_for_port(struct usb_port *port_dev)
 {
 	struct acpi_device *adev;
-	struct acpi_pld_info *pld;
-	acpi_handle *handle;
-	acpi_status status;
 
 	adev = usb_acpi_get_companion_for_port(port_dev);
 	if (!adev)
 		return NULL;
 
-	handle = adev->handle;
-	status = acpi_get_physical_device_location(handle, &pld);
-	if (ACPI_SUCCESS(status) && pld) {
-		port_dev->location = USB_ACPI_LOCATION_VALID
-			| pld->group_token << 8 | pld->group_position;
-		port_dev->connect_type = usb_acpi_get_connect_type(handle, pld);
-		ACPI_FREE(pld);
-	}
+	usb_acpi_get_connect_type(port_dev, adev->handle);
 
 	return adev;
 }