Skip to content

Commit 6b45092

Browse files
matnymangregkh
authored andcommitted
usb: optimize acpi companion search for usb port devices
commit ed18c5fa945768a9bec994e786edbbbc7695acf6 upstream. This optimization significantly reduces xhci driver load time. In ACPI tables the acpi companion port devices are children of the hub device. The port devices are identified by their port number returned by the ACPI _ADR method. _ADR 0 is reserved for the root hub device. The current implementation to find a acpi companion port device loops through all acpi port devices under that parent hub, evaluating their _ADR method each time a new port device is added. for a xHC controller with 25 ports under its roothub it will end up invoking ACPI bytecode 625 times before all ports are ready, making it really slow. The _ADR values are already read and cached earler. So instead of running the bytecode again we can check the cached _ADR value first, and then fall back to the old way. As one of the more significant changes, the xhci load time on Intel kabylake reduced by 70%, (28ms) from initcall xhci_pci_init+0x0/0x49 returned 0 after 39537 usecs to initcall xhci_pci_init+0x0/0x49 returned 0 after 11270 usecs Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ce1b98a commit 6b45092

1 file changed

Lines changed: 23 additions & 3 deletions

File tree

drivers/usb/core/usb-acpi.c

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,22 @@ static enum usb_port_connect_type usb_acpi_get_connect_type(acpi_handle handle,
127127
*/
128128
#define USB_ACPI_LOCATION_VALID (1 << 31)
129129

130+
static struct acpi_device *usb_acpi_find_port(struct acpi_device *parent,
131+
int raw)
132+
{
133+
struct acpi_device *adev;
134+
135+
if (!parent)
136+
return NULL;
137+
138+
list_for_each_entry(adev, &parent->children, node) {
139+
if (acpi_device_adr(adev) == raw)
140+
return adev;
141+
}
142+
143+
return acpi_find_child_device(parent, raw, false);
144+
}
145+
130146
static struct acpi_device *usb_acpi_find_companion(struct device *dev)
131147
{
132148
struct usb_device *udev;
@@ -174,8 +190,10 @@ static struct acpi_device *usb_acpi_find_companion(struct device *dev)
174190
int raw;
175191

176192
raw = usb_hcd_find_raw_port_number(hcd, port1);
177-
adev = acpi_find_child_device(ACPI_COMPANION(&udev->dev),
178-
raw, false);
193+
194+
adev = usb_acpi_find_port(ACPI_COMPANION(&udev->dev),
195+
raw);
196+
179197
if (!adev)
180198
return NULL;
181199
} else {
@@ -186,7 +204,9 @@ static struct acpi_device *usb_acpi_find_companion(struct device *dev)
186204
return NULL;
187205

188206
acpi_bus_get_device(parent_handle, &adev);
189-
adev = acpi_find_child_device(adev, port1, false);
207+
208+
adev = usb_acpi_find_port(adev, port1);
209+
190210
if (!adev)
191211
return NULL;
192212
}

0 commit comments

Comments
 (0)