Attention is currently required from: Alexander Couzens, Nicholas Chin.
Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85924?usp=email )
Change subject: mb/*: Drop xhci_overcurrent_map II ......................................................................
mb/*: Drop xhci_overcurrent_map II
This is now copied from USBOCM1 built with main USB port config.
Boards to be patched here have mismatched xhci_overcurrent_map and needs manual review and/or testing.
Change-Id: Ie60d34cae5ae94d148854b42f77ab4c02e8f49ef Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/dell/snb_ivb_latitude/variants/e5530/overridetree.cb M src/mainboard/dell/snb_ivb_latitude/variants/e6230/overridetree.cb M src/mainboard/dell/snb_ivb_latitude/variants/e6330/overridetree.cb M src/mainboard/dell/snb_ivb_latitude/variants/e6430/overridetree.cb M src/mainboard/dell/snb_ivb_latitude/variants/e6530/overridetree.cb M src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb M src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/overridetree.cb M src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/overridetree.cb M src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb M src/mainboard/lenovo/t430s/devicetree.cb M src/mainboard/lenovo/t530/devicetree.cb M src/mainboard/lenovo/x131e/devicetree.cb M src/mainboard/lenovo/x230/devicetree.cb 13 files changed, 4 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/85924/1
diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e5530/overridetree.cb b/src/mainboard/dell/snb_ivb_latitude/variants/e5530/overridetree.cb index 85c448d..0fd59a3 100644 --- a/src/mainboard/dell/snb_ivb_latitude/variants/e5530/overridetree.cb +++ b/src/mainboard/dell/snb_ivb_latitude/variants/e5530/overridetree.cb @@ -29,7 +29,6 @@
device ref xhci on register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" end device ref gbe off end diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6230/overridetree.cb b/src/mainboard/dell/snb_ivb_latitude/variants/e6230/overridetree.cb index 3a0fa72..0f4f924 100644 --- a/src/mainboard/dell/snb_ivb_latitude/variants/e6230/overridetree.cb +++ b/src/mainboard/dell/snb_ivb_latitude/variants/e6230/overridetree.cb @@ -29,7 +29,6 @@
device ref xhci on register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" end device ref sata1 on diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6330/overridetree.cb b/src/mainboard/dell/snb_ivb_latitude/variants/e6330/overridetree.cb index 4125159..5866828 100644 --- a/src/mainboard/dell/snb_ivb_latitude/variants/e6330/overridetree.cb +++ b/src/mainboard/dell/snb_ivb_latitude/variants/e6330/overridetree.cb @@ -29,7 +29,6 @@
device ref xhci on register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" end end diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6430/overridetree.cb b/src/mainboard/dell/snb_ivb_latitude/variants/e6430/overridetree.cb index 631f404..3248dad 100644 --- a/src/mainboard/dell/snb_ivb_latitude/variants/e6430/overridetree.cb +++ b/src/mainboard/dell/snb_ivb_latitude/variants/e6430/overridetree.cb @@ -28,7 +28,6 @@ }" device ref xhci on register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" end end diff --git a/src/mainboard/dell/snb_ivb_latitude/variants/e6530/overridetree.cb b/src/mainboard/dell/snb_ivb_latitude/variants/e6530/overridetree.cb index 8b9c82f..025b399 100644 --- a/src/mainboard/dell/snb_ivb_latitude/variants/e6530/overridetree.cb +++ b/src/mainboard/dell/snb_ivb_latitude/variants/e6530/overridetree.cb @@ -29,7 +29,7 @@
device ref xhci on register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" + register "xhci_switchable_ports" = "0x0000000f" end end diff --git a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb index 2ba11b4..b9f5bff 100644 --- a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb +++ b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb @@ -28,7 +28,6 @@ register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005" register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x08040201" register "xhci_switchable_ports" = "0x0000000f" register "usb_port_config" = "{ { 1, 6, 0 }, diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/overridetree.cb index eb296f3..8f13725 100644 --- a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/overridetree.cb +++ b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/overridetree.cb @@ -8,7 +8,6 @@ register "sata_port_map" = "0xf" register "superspeed_capable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x0000000f" register "usb_port_config" = "{ { 1, 0, 0 }, { 1, 0, 0 }, diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/overridetree.cb index 3511bbd..b4ab82f 100644 --- a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/overridetree.cb +++ b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/overridetree.cb @@ -14,7 +14,6 @@ # 0x1: 2.5", 0x2: DVD, 0x4: mSATA register "sata_port_map" = "0x7" register "superspeed_capable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" register "usb_port_config" = "{ { 1, 0, 0 }, diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb index a8dcb17..1701159 100644 --- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb +++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb @@ -8,7 +8,6 @@ register "sata_port_map" = "0x3f" register "superspeed_capable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f" - register "xhci_overcurrent_mapping" = "0x0000000f" register "usb_port_config" = "{ { 1, 0, 0 }, { 1, 0, 0 }, diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb index 10a388a..8670ad9 100644 --- a/src/mainboard/lenovo/t430s/devicetree.cb +++ b/src/mainboard/lenovo/t430s/devicetree.cb @@ -43,7 +43,7 @@ # Wire port 4 (wwan usb) to ehci for it lacks superspeed components register "xhci_switchable_ports" = "0x7" register "superspeed_capable_ports" = "0xf" - register "xhci_overcurrent_mapping" = "0x4000201" +
# Enable zero-based linear PCIe root port functions register "pcie_port_coalesce" = "true" diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb index b8dcfd0..9fa81f0 100644 --- a/src/mainboard/lenovo/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/devicetree.cb @@ -46,7 +46,7 @@
register "xhci_switchable_ports" = "0xf" register "superspeed_capable_ports" = "0xf" - register "xhci_overcurrent_mapping" = "0x04000201" +
register "docking_supported" = "1"
diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb index b74e78f..6bdc87c 100644 --- a/src/mainboard/lenovo/x131e/devicetree.cb +++ b/src/mainboard/lenovo/x131e/devicetree.cb @@ -42,7 +42,7 @@
register "xhci_switchable_ports" = "0xf" register "superspeed_capable_ports" = "0xf" - register "xhci_overcurrent_mapping" = "0x00000c03" + register "usb_port_config" = "{ {1, 1, 0}, /* P0: USB 3.0 1 (OC0) */ {1, 1, 0}, /* P1: USB 3.0 2 (OC0) */ diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb index f47e3b7..3067096 100644 --- a/src/mainboard/lenovo/x230/devicetree.cb +++ b/src/mainboard/lenovo/x230/devicetree.cb @@ -44,7 +44,6 @@ # Do not enable xHCI Port 4 since WWAN USB is EHCI-only register "xhci_switchable_ports" = "0x7" register "superspeed_capable_ports" = "0x7" - register "xhci_overcurrent_mapping" = "0x4000201"
# Enable zero-based linear PCIe root port functions register "pcie_port_coalesce" = "true"