From 9a070dc7468cce530a70eb58e7a12426a9aa741e Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Tue, 6 Jun 2023 15:01:02 +0800 Subject: soc/amd/phoenix: Hook up xhci ops in chipset.cb Hook up xhci ops for Phoenix xHCI device. Benefit is we don't have to bother by adding xhci DID. BUG=b:285981912 TEST=check coreboot log shows below. [INFO ] \_SB.PCI0.GP41.XHC0.RHUB.SS01: USB3 Type-A Port A0 (MLB) Signed-off-by: Eric Lai Change-Id: Ib59874948725966b04b54def3f6de463afeda709 Reviewed-on: https://review.coreboot.org/c/coreboot/+/75659 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Fred Reitberger --- src/drivers/usb/pci_xhci/pci_xhci.c | 4 ++-- src/soc/amd/phoenix/chipset.cb | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c index 63a98c7cd5..ca51278e39 100644 --- a/src/drivers/usb/pci_xhci/pci_xhci.c +++ b/src/drivers/usb/pci_xhci/pci_xhci.c @@ -12,7 +12,7 @@ #define PCI_XHCI_CLASSCODE 0x0c0330 /* USB3.0 xHCI controller */ static unsigned int controller_count; -static const struct device_operations xhci_pci_ops; +const struct device_operations xhci_pci_ops; struct port_counts { unsigned int high_speed; @@ -240,7 +240,7 @@ static void xhci_enable(struct device *dev) dev->name = name; } -static const struct device_operations xhci_pci_ops = { +const struct device_operations xhci_pci_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, diff --git a/src/soc/amd/phoenix/chipset.cb b/src/soc/amd/phoenix/chipset.cb index 65259363d4..12bb2fe659 100644 --- a/src/soc/amd/phoenix/chipset.cb +++ b/src/soc/amd/phoenix/chipset.cb @@ -38,6 +38,7 @@ chip soc/amd/phoenix device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ) device pci 0.2 alias crypto off end # Crypto Coprocessor device pci 0.3 alias xhci_0 off + ops xhci_pci_ops chip drivers/usb/acpi register "type" = "UPC_TYPE_HUB" device usb 0.0 alias xhci_0_root_hub off @@ -66,6 +67,7 @@ chip soc/amd/phoenix end end device pci 0.4 alias xhci_1 off + ops xhci_pci_ops chip drivers/usb/acpi register "type" = "UPC_TYPE_HUB" device usb 0.0 alias xhci_1_root_hub off @@ -92,6 +94,7 @@ chip soc/amd/phoenix ops amd_internal_pcie_gpp_ops device pci 0.0 on end # dummy, do not disable device pci 0.3 alias usb4_xhci_0 off + ops xhci_pci_ops chip drivers/usb/acpi register "type" = "UPC_TYPE_HUB" device usb 0.0 alias usb4_xhci_0_root_hub off @@ -105,6 +108,7 @@ chip soc/amd/phoenix end end device pci 0.4 alias usb4_xhci_1 off + ops xhci_pci_ops chip drivers/usb/acpi register "type" = "UPC_TYPE_HUB" device usb 0.0 alias usb4_xhci_1_root_hub off -- cgit v1.2.3