summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Żygowski <michal.zygowski@3mdeb.com>2022-05-12 15:21:08 +0200
committerMichał Żygowski <michal.zygowski@3mdeb.com>2022-07-11 09:01:21 +0000
commit1c3b4435050ee5504f25a1fe145824fc6696d3a1 (patch)
tree93677833f69e28219b80e8dd05617e6389cd5055
parent6db287a5d9cf4124eb3370727f341e69b4bf7197 (diff)
mainboard/msi/ms7d25: Add USB macros and port designation comments
Add the comments about port designation after mapping the root hub ports to board connectors. Add macros reflecting the length of the USB signal traces. Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com> Change-Id: Ib2e842ef240ab25e2a9f7fa2e0766206fde7943d Reviewed-on: https://review.coreboot.org/c/coreboot/+/64295 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Krystian Hebel <krystian.hebel@3mdeb.com>
-rw-r--r--src/mainboard/msi/ms7d25/devicetree.cb49
-rw-r--r--src/mainboard/msi/ms7d25/mainboard.c2
2 files changed, 26 insertions, 25 deletions
diff --git a/src/mainboard/msi/ms7d25/devicetree.cb b/src/mainboard/msi/ms7d25/devicetree.cb
index a8860ae6e1..61e1df27af 100644
--- a/src/mainboard/msi/ms7d25/devicetree.cb
+++ b/src/mainboard/msi/ms7d25/devicetree.cb
@@ -13,32 +13,31 @@ chip soc/intel/alderlake
register "pmc_gpe0_dw2" = "GPD"
# USB Configuration
- # TODO: Verify
- register "usb2_ports[0]" = "USB2_PORT_MID(OC2)"
- register "usb2_ports[1]" = "USB2_PORT_MID(OC1)"
- register "usb2_ports[2]" = "USB2_PORT_MID(OC0)"
- register "usb2_ports[3]" = "USB2_PORT_MID(OC0)"
- register "usb2_ports[4]" = "USB2_PORT_MID(OC3)"
- register "usb2_ports[5]" = "USB2_PORT_MID(OC3)"
- register "usb2_ports[6]" = "USB2_PORT_MID(OC7)"
- register "usb2_ports[7]" = "USB2_PORT_MID(OC0)"
- register "usb2_ports[8]" = "USB2_PORT_MID(OC2)"
- register "usb2_ports[9]" = "USB2_PORT_MID(OC7)"
- register "usb2_ports[10]" = "USB2_PORT_MID(OC0)"
- register "usb2_ports[11]" = "USB2_PORT_MID(OC0)"
- register "usb2_ports[12]" = "USB2_PORT_MID(OC0)"
- register "usb2_ports[13]" = "USB2_PORT_MID(OC6)"
+ register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC2)" # USB-C LAN_USB1
+ register "usb2_ports[1]" = "USB2_PORT_MAX(OC1)" # MSI MYSTIC LIGHT
+ register "usb2_ports[2]" = "USB2_PORT_MAX(OC0)" # USB-A LAN_USB1
+ register "usb2_ports[3]" = "USB2_PORT_TYPE_C(OC0)" # JUSB5
+ register "usb2_ports[4]" = "USB2_PORT_MAX(OC3)" # HUB to rear USB 2.0
+ register "usb2_ports[5]" = "USB2_PORT_LONG(OC3)" # empty?
+ register "usb2_ports[6]" = "USB2_PORT_LONG(OC7)" # JUSB4
+ register "usb2_ports[7]" = "USB2_PORT_LONG(OC0)" # JUSB4
+ register "usb2_ports[8]" = "USB2_PORT_LONG(OC2)" # JUSB3
+ register "usb2_ports[9]" = "USB2_PORT_LONG(OC7)" # JUSB3
+ register "usb2_ports[10]" = "USB2_PORT_MAX(OC0)" # PS2_USB1
+ register "usb2_ports[11]" = "USB2_PORT_MAX(OC0)" # PS2_USB1
+ register "usb2_ports[12]" = "USB2_PORT_MAX(OC0)" # HUB to USB 2.0 headers
+ register "usb2_ports[13]" = "USB2_PORT_MAX(OC6)" # CNVi BT
- register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)"
- register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)"
- register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC0)"
- register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC0)"
- register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC7)"
- register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC7)"
- register "usb3_ports[6]" = "USB3_PORT_DEFAULT(OC2)"
- register "usb3_ports[7]" = "USB3_PORT_DEFAULT(OC2)"
- register "usb3_ports[8]" = "USB3_PORT_DEFAULT(OC0)"
- register "usb3_ports[9]" = "USB3_PORT_DEFAULT(OC0)"
+ register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)" # USB-C LAN_USB1
+ register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)" # USB-A LAN_USB1
+ register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)" # JUSB5
+ register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC0)" # USB-A USB2
+ register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC7)" # USB-A USB2
+ register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC7)" # JUSB4
+ register "usb3_ports[6]" = "USB3_PORT_DEFAULT(OC2)" # JUSB4
+ register "usb3_ports[7]" = "USB3_PORT_DEFAULT(OC2)" # JUSB3
+ register "usb3_ports[8]" = "USB3_PORT_DEFAULT(OC0)" # JUSB3
+ register "usb3_ports[9]" = "USB3_PORT_EMPTY"
# LPC generic I/O ranges
register "gen1_dec" = "0x00fc0201"
diff --git a/src/mainboard/msi/ms7d25/mainboard.c b/src/mainboard/msi/ms7d25/mainboard.c
index fce1ddc2fa..2d468873f8 100644
--- a/src/mainboard/msi/ms7d25/mainboard.c
+++ b/src/mainboard/msi/ms7d25/mainboard.c
@@ -50,6 +50,8 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *params)
memset(params->CpuPcieClockGating, 0, sizeof(params->CpuPcieClockGating));
memset(params->CpuPciePowerGating, 0, sizeof(params->CpuPciePowerGating));
+ params->UsbPdoProgramming = 1;
+
params->CpuPcieFiaProgramming = 1;
params->PcieRpFunctionSwap = 0;