Change in coreboot[master]: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configurati...

[Stanley Wu (Code Review)]

Stanley Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
---
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
1 file changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/1

diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
index 87ca0a3..182077c 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -71,6 +71,35 @@
    			device i2c 15 on end
    		end
    	end
+		device ref pch_espi on
+			chip ec/google/chromeec
+				use conn0 as mux_conn[0]
+				use conn1 as mux_conn[1]
+				device pnp 0c09.0 on end
+			end
+		end
+		device ref pmc hidden
+			# The pmc_mux chip driver is a placeholder for the
+			# PMC.MUX device in the ACPI hierarchy.
+			chip drivers/intel/pmc_mux
+				device generic 0 on
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "9"
+						register "usb3_port_number" = "1"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 0 alias conn0 on end
+					end
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "4"
+						register "usb3_port_number" = "2"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 1 alias conn1 on end
+					end
+				end
+			end
+		end
    	device ref north_xhci on
    		chip drivers/usb/acpi
    			device ref tcss_root_hub on

[Stanley Wu (Code Review)]

Stanley Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Set Ready For Review

[Stanley Wu (Code Review)]

Hello build bot (Jenkins), Raymond Chung, Zhuohao Lee,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47434

to look at the new patch set (#2).

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
---
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
1 file changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/2

[Rasheed Hsueh (Code Review)]

Rasheed Hsueh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 2:

Hi, 
I notice the jenkins build unstable with this BOARD, 
"HP_FOLIO_9480M"
could you help to check below information.

-----------------------------------------------
Building board HP_2760P (using default config)
Building HP_2760P
  Creating config file for HP_2760P...
Building board HP_8460P (using default config)
Building HP_8460P
    HP_2760P (blobs, clean-somewhat, ccache)
  Creating config file for HP_8460P...
    HP_8460P (blobs, clean-somewhat, ccache)
HP_FOLIO_9480M build FAILED after 1s!
Log excerpt:
make[1]: Entering directory '/home/coreboot/node-root/workspace/coreboot-gerrit'
    SCONFIG    mainboard/hp/folio_9480m/devicetree.cb
    CC         bootblock/mainboard/hp/folio_9480m/static.o
/cb-build/coreboot-gerrit.0/default/HP_FOLIO_9480M/mainboard/hp/folio_9480m/static.c:104:3: error: 'const struct southbridge_intel_lynxpoint_config' has no member named 'sata_ahci'
  .sata_ahci = 1,
   ^~~~~~~~~
cc1: error: unrecognized command line option '-Wno-address-of-packed-member' [-Werror]
cc1: all warnings being treated as errors

[Kevin Chang (Code Review)]

Kevin Chang has uploaded a new patch set (#3) to the change originally created by Stanley Wu. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
Signed-off-by: kevin.chang 
---
M src/mainboard/google/volteer/variants/lindar/gpio.c
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
2 files changed, 35 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/3

[Kevin Chang (Code Review)]

Kevin Chang has uploaded a new patch set (#4) to the change originally created by Stanley Wu. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
Signed-off-by: Kevin Chang 
---
M src/mainboard/google/volteer/variants/lindar/gpio.c
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
2 files changed, 35 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/4

[Zhuohao Lee (Code Review)]

Zhuohao Lee has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47434/4/src/mainboard/google/voltee... 
File src/mainboard/google/volteer/variants/lindar/gpio.c:

https://review.coreboot.org/c/coreboot/+/47434/4/src/mainboard/google/voltee... 
PS4, Line 19: 	/* A19 : DDSP_HPD1 ==> NOT USED */
            : 	PAD_NC(GPP_A19, NONE),
            : 	/* A20 : DDSP_HPD2 ==> NOT USED */
            : 	PAD_NC(GPP_A20, NONE),
You can remove this and use the baseboard gpio.c setting instead.

[Caveh Jalali (Code Review)]

Caveh Jalali has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 4: Code-Review+1

[Kevin Chang (Code Review)]

Kevin Chang has uploaded a new patch set (#5) to the change originally created by Stanley Wu. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
Signed-off-by: Kevin Chang 
---
M src/mainboard/google/volteer/variants/lindar/gpio.c
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
2 files changed, 32 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/5

[Kevin Chang (Code Review)]

Kevin Chang has uploaded a new patch set (#6) to the change originally created by Stanley Wu. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
Signed-off-by: Kevin Chang 
---
M src/mainboard/google/volteer/variants/lindar/gpio.c
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
2 files changed, 31 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/6

[Kevin Chang (Code Review)]

Kevin Chang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 6:

done

[Zhuohao Lee (Code Review)]

Zhuohao Lee has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47434/5/src/mainboard/google/voltee... 
File src/mainboard/google/volteer/variants/lindar/gpio.c:

https://review.coreboot.org/c/coreboot/+/47434/5/src/mainboard/google/voltee... 
PS5, Line 76: PAD_CFG_GPO(GPP_H3, 0, DEEP),
This is unrelated to the mux config.

[Kevin Chang (Code Review)]

Kevin Chang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 6:

Hi Zhuohao

Fix this in patch "6".

[Kevin Chang (Code Review)]

Kevin Chang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 6:

(2 comments)

https://review.coreboot.org/c/coreboot/+/47434/4/src/mainboard/google/voltee... 
File src/mainboard/google/volteer/variants/lindar/gpio.c:

https://review.coreboot.org/c/coreboot/+/47434/4/src/mainboard/google/voltee... 
PS4, Line 19: 	/* A19 : DDSP_HPD1 ==> NOT USED */
            : 	PAD_NC(GPP_A19, NONE),
            : 	/* A20 : DDSP_HPD2 ==> NOT USED */
            : 	PAD_NC(GPP_A20, NONE),
> You can remove this and use the baseboard gpio.c setting instead.

Done

https://review.coreboot.org/c/coreboot/+/47434/5/src/mainboard/google/voltee... 
File src/mainboard/google/volteer/variants/lindar/gpio.c:

https://review.coreboot.org/c/coreboot/+/47434/5/src/mainboard/google/voltee... 
PS5, Line 76: PAD_CFG_GPO(GPP_H3, 0, DEEP),
> This is unrelated to the mux config.

Done

[Zhuohao Lee (Code Review)]

Zhuohao Lee has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 6: Code-Review+1

[Caveh Jalali (Code Review)]

Caveh Jalali has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 6: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 8:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG@7 
PS8, Line 7: for lindar
Please remove, as it’s in the prefix.

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration for lindar
......................................................................

Patch Set 8:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG@8 
PS8, Line 8: 
Please also mention disabling HPDs

[Kevin Chang (Code Review)]

Kevin Chang has uploaded a new patch set (#9) to the change originally created by Stanley Wu. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration and disabling DDI port 1 and 2 HPD.
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration and disabling DDI port 1 and 2 HPD.

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
Signed-off-by: Kevin Chang 
---
M src/mainboard/google/volteer/variants/lindar/gpio.c
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
2 files changed, 31 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/47434/9

[Kevin Chang (Code Review)]

Kevin Chang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration and disabling DDI port 1 and 2 HPD.
......................................................................

Patch Set 9:

(2 comments)

Hi Paul and Tim

Commit updated.

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG@7 
PS8, Line 7: for lindar
> Please remove, as it’s in the prefix.

Done

https://review.coreboot.org/c/coreboot/+/47434/8//COMMIT_MSG@8 
PS8, Line 8:
> Please also mention disabling HPDs

Done

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47434 )

Change subject: mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration and disabling DDI port 1 and 2 HPD.
......................................................................

mb/google/volteer/variant/lindar: Add PMC.MUX.CONx device configuration and disabling DDI port 1 and 2 HPD.

This patch adds the PMC MUX and CONx devices for lindar. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:172533907
BRANCH=firmware-volteer-13521.B
TEST=Built and booted into OS.

Signed-off-by: Stanley Wu 
Change-Id: Id5ee78b7ece8421144086af9b95f5f0d849be56c
Signed-off-by: Kevin Chang 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47434
Tested-by: build bot (Jenkins) 
Reviewed-by: Zhuohao Lee 
Reviewed-by: Caveh Jalali 
---
M src/mainboard/google/volteer/variants/lindar/gpio.c
M src/mainboard/google/volteer/variants/lindar/overridetree.cb
2 files changed, 31 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Caveh Jalali: Looks good to me, approved
  Zhuohao Lee: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/volteer/variants/lindar/gpio.c b/src/mainboard/google/volteer/variants/lindar/gpio.c
index 8b56e0d..7b5184d 100644
--- a/src/mainboard/google/volteer/variants/lindar/gpio.c
+++ b/src/mainboard/google/volteer/variants/lindar/gpio.c
@@ -16,10 +16,6 @@
    PAD_CFG_GPO(GPP_A13, 1, DEEP),
    /* A16 : USB_OC3# ==> USB_C0_OC_ODL */
    PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1),
-	/* A19 : DDSP_HPD1 ==> USB_C0_DP_HPD */
-	PAD_CFG_NF(GPP_A19, NONE, DEEP, NF1),
-	/* A20 : DDSP_HPD2 ==> USB_C1_DP_HPD */
-	PAD_CFG_NF(GPP_A20, NONE, DEEP, NF1),
    /* A22 : DDPC_CTRLDATA ==> EN_PP3300_SSD */
    PAD_CFG_GPO(GPP_A22, 1, DEEP),
    /* A23 : I2S1_SCLK ==> I2S1_SPKR_SCLK */
diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
index 277ba60..2e0c93b 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -1,4 +1,6 @@
 chip soc/intel/tigerlake
+	register "DdiPort1Hpd" = "0"
+	register "DdiPort2Hpd" = "0"
    # USB Port Config
    register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A Port A0
    register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)"	# Type-A / Type-C C1
@@ -145,6 +147,35 @@
    			device i2c 0x2c on end
    		end
    	end
+		device ref pch_espi on
+			chip ec/google/chromeec
+				use conn0 as mux_conn[0]
+				use conn1 as mux_conn[1]
+				device pnp 0c09.0 on end
+			end
+		end
+		device ref pmc hidden
+			# The pmc_mux chip driver is a placeholder for the
+			# PMC.MUX device in the ACPI hierarchy.
+			chip drivers/intel/pmc_mux
+				device generic 0 on
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "9"
+						register "usb3_port_number" = "1"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 0 alias conn0 on end
+					end
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "4"
+						register "usb3_port_number" = "2"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 1 alias conn1 on end
+					end
+				end
+			end
+		end
    	device ref north_xhci on
    		chip drivers/usb/acpi
    			device ref tcss_root_hub on