sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/brya: Fix pmc_mux port mapping for mithrax and felwinter

Browse Source 
Fixes a pmc_mux port mapping error introduced in coreboot
commit 4fa8354

Mithrax and felwinter do not have sequential mux_conn[X] to connY
mappings which led to the kernel subsystem linking between Type C
connectors and USB muxes to be incorrect. The previous patch
attempted to fix this by changing the custom_pld layout. However
this broke USB usage except for charging.

This patch reverts the custom_pld layout and instead changes the pmc
hidden and tcss_xhci port mappings to match the hardware layout.

BUG=b:352512335 b:329657774 b:121287022 b:321051330 b:204230406
TEST=emerge-${BOARD} coreboot
TEST=Manually check that usb-role-switches are mapped to the correct
    port.
  Attach USB 3 A to C cable from development machine to left port of
    DUT.
  Attach nothing to right-hand port.
  ectool commands below are only for felwinter as a workaround for
    devices without a firmware patch to connect superspeed lines.
  ectool usbpd 0 none
  ectool usbpd 0 usb
  ectool usbpd 1 none
  ectool usbpd 1 usb
  echo host > /sys/class/typec/port0/usb-role-switch/role (should
    succeed)
  ls -l /sys/class/typec/port0/usb-role-switch (note CONX-role-switch)
  echo host > /sys/class/usb_role/CONX-role-switch/role (should succeed)
  echo host > /sys/class/typec/port1/usb-role-switch/role (should fail
    as no cable attached)
  ls -l /sys/class/typec/port1/usb-role-switch (note CONY-role-switch)
  echo host > /sys/class/usb_role/CONY-role-switch/role (should fail
    as no cable attached)
BRANCH=firmware-brya-14505.B

Change-Id: Iebd259842d3affa259069cd776b46759c1c60712
Signed-off-by: Emilie Roberts <hadrosaur@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83472
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Eric Lai <ericllai@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Emilie Roberts
2024-07-15 15:14:47 +02:00
committed by Eric Lai
parent 494a593d81
commit e638a113fa
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/mainboard/google/brya/variants/felwinter/overridetree.cb
View File

@@ -358,13 +358,13 @@ chip soc/intel/alderlake
chip drivers/intel/pmc_mux chip drivers/intel/pmc_mux
device generic 0 on device generic 0 on
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
use usb2_port3 as usb2_port use usb2_port2 as usb2_port
use tcss_usb3_port3 as usb3_port use tcss_usb3_port2 as usb3_port
device generic 2 alias conn2 on end device generic 2 alias conn2 on end
end end
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
use usb2_port2 as usb2_port use usb2_port3 as usb2_port
use tcss_usb3_port2 as usb3_port use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end device generic 1 alias conn1 on end
end end
end end
@@ -377,16 +377,16 @@ chip soc/intel/alderlake
register "desc" = ""USB3 Type-C Port C1 (DB)"" register "desc" = ""USB3 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 1))"
register "usb_lpm_incapable" = "true" register "usb_lpm_incapable" = "true"
device ref tcss_usb3_port2 on end device ref tcss_usb3_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C2 (MLB)"" register "desc" = ""USB3 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(2, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(2, 1))"
device ref tcss_usb3_port3 on end device ref tcss_usb3_port2 on end
end end
end end
end end
@@ -398,15 +398,15 @@ chip soc/intel/alderlake
register "desc" = ""USB2 Type-C Port C1 (DB)"" register "desc" = ""USB2 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 1))"
device ref usb2_port2 on end device ref usb2_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C2 (MLB)"" register "desc" = ""USB2 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(2, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(2, 1))"
device ref usb2_port3 on end device ref usb2_port2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Camera"" register "desc" = ""USB2 Camera""

28
src/mainboard/google/brya/variants/mithrax/overridetree.cb
View File

@@ -306,13 +306,13 @@ chip soc/intel/alderlake
chip drivers/intel/pmc_mux chip drivers/intel/pmc_mux
device generic 0 on device generic 0 on
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
use usb2_port3 as usb2_port use usb2_port2 as usb2_port
use tcss_usb3_port3 as usb3_port use tcss_usb3_port2 as usb3_port
device generic 2 alias conn2 on end device generic 2 alias conn2 on end
end end
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
use usb2_port2 as usb2_port use usb2_port3 as usb2_port
use tcss_usb3_port2 as usb3_port use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end device generic 1 alias conn1 on end
end end
end end
@@ -325,16 +325,16 @@ chip soc/intel/alderlake
register "desc" = ""USB3 Type-C Port C1 (DB)"" register "desc" = ""USB3 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(1, 1))"
register "usb_lpm_incapable" = "true" register "usb_lpm_incapable" = "true"
device ref tcss_usb3_port2 on end device ref tcss_usb3_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB3 Type-C Port C2 (MLB)"" register "desc" = ""USB3 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(2, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(2, 1))"
device ref tcss_usb3_port3 on end device ref tcss_usb3_port2 on end
end end
end end
end end
@@ -346,15 +346,15 @@ chip soc/intel/alderlake
register "desc" = ""USB2 Type-C Port C1 (DB)"" register "desc" = ""USB2 Type-C Port C1 (DB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(1, 1))"
device ref usb2_port2 on end device ref usb2_port3 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Type-C Port C2 (MLB)"" register "desc" = ""USB2 Type-C Port C2 (MLB)""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, RIGHT, ACPI_PLD_GROUP(2, 1))" register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(2, 1))"
device ref usb2_port3 on end device ref usb2_port2 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
register "desc" = ""USB2 Camera"" register "desc" = ""USB2 Camera""
@@ -365,7 +365,7 @@ chip soc/intel/alderlake
register "desc" = ""USB2 Type-A Port A0 (DB)"" register "desc" = ""USB2 Type-A Port A0 (DB)""
register "type" = "UPC_TYPE_A" register "type" = "UPC_TYPE_A"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, LEFT, ACPI_PLD_GROUP(1, 2))" register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 2))"
device ref usb2_port9 on end device ref usb2_port9 on end
end end
chip drivers/usb/acpi chip drivers/usb/acpi
@@ -379,7 +379,7 @@ chip soc/intel/alderlake
register "desc" = ""USB3 Type-A Port A0 (DB)"" register "desc" = ""USB3 Type-A Port A0 (DB)""
register "type" = "UPC_TYPE_USB3_A" register "type" = "UPC_TYPE_USB3_A"
register "use_custom_pld" = "true" register "use_custom_pld" = "true"
register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, LEFT, ACPI_PLD_GROUP(1, 2))" register "custom_pld" = "ACPI_PLD_TYPE_A(RIGHT, RIGHT, ACPI_PLD_GROUP(1, 2))"
device ref usb3_port1 on end device ref usb3_port1 on end
end end
end end