Skip to content

Commit 9edb1ac

Browse files
Michal Peciogregkh
authored andcommitted
usb: xhci: Restore xhci_pci support for Renesas HCs
commit c81d9fc upstream. Some Renesas HCs require firmware upload to work, this is handled by the xhci_pci_renesas driver. Other variants of those chips load firmware from a SPI flash and are ready to work with xhci_pci alone. A refactor merged in v6.12 broke the latter configuration so that users are finding their hardware ignored by the normal driver and are forced to enable the firmware loader which isn't really necessary on their systems. Let xhci_pci work with those chips as before when the firmware loader is disabled by kernel configuration. Fixes: 25f51b7 ("xhci-pci: Make xhci-pci-renesas a proper modular driver") Cc: stable <stable@kernel.org> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219616 Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219726 Signed-off-by: Michal Pecio <michal.pecio@gmail.com> Tested-by: Nicolai Buchwitz <nb@tipi-net.de> Link: https://lore.kernel.org/r/20250128104529.58a79bfc@foxbook Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0d40d7c commit 9edb1ac

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/usb/host/xhci-pci.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,16 +653,17 @@ int xhci_pci_common_probe(struct pci_dev *dev, const struct pci_device_id *id)
653653
}
654654
EXPORT_SYMBOL_NS_GPL(xhci_pci_common_probe, "xhci");
655655

656-
static const struct pci_device_id pci_ids_reject[] = {
657-
/* handled by xhci-pci-renesas */
656+
/* handled by xhci-pci-renesas if enabled */
657+
static const struct pci_device_id pci_ids_renesas[] = {
658658
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, 0x0014) },
659659
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, 0x0015) },
660660
{ /* end: all zeroes */ }
661661
};
662662

663663
static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
664664
{
665-
if (pci_match_id(pci_ids_reject, dev))
665+
if (IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS) &&
666+
pci_match_id(pci_ids_renesas, dev))
666667
return -ENODEV;
667668

668669
return xhci_pci_common_probe(dev, id);

0 commit comments

Comments
 (0)