[coreboot-gerrit] [XS] Change in coreboot[master]: soc/amd/phoenix: Hook up xhci ops in chipset.cb

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75659?usp=email )

Change subject: soc/amd/phoenix: Hook up xhci ops in chipset.cb
......................................................................

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 
---
M src/drivers/usb/pci_xhci/pci_xhci.c
M src/soc/amd/phoenix/chipset.cb
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved
  Fred Reitberger: Looks good to me, but someone else must approve

diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c
index 63a98c7..ca51278 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 @@
    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 6525936..12bb2fe 100644
--- a/src/soc/amd/phoenix/chipset.cb
+++ b/src/soc/amd/phoenix/chipset.cb
@@ -38,6 +38,7 @@
    		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 @@
    			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 @@
    		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 @@
    			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