From b7b5115360baa1ea0b9e8e554a12e9ac6da8fe87 Mon Sep 17 00:00:00 2001 From: Tim Wawrzynczak Date: Thu, 1 Jul 2021 08:38:30 -0600 Subject: [PATCH] cannonlake mainboards: Set PMC as hidden in devicetree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FSP-S hides the PMC from the PCI bus when it runs, but there are still initialization steps coreboot programs for the PMC. Therefore, change all of the cannonlake mainboards to set the PMC as hidden in the devicetree, which means the device will be skipped during enumeration, but device callbacks are still issued as if the device were enabled. TEST=Ran full patch train on google/dratini, disassembled SSDT and the PEPD device matches what is in pep.asl. Also verified via dmesg that the INT33A1 device is still initialized by the kernel. Signed-off-by: Tim Wawrzynczak Change-Id: Ib4a20ce9075ce7653388a5d3e281fe774bf89355 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56008 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Furquan Shaikh Reviewed-by: Angel Pons Reviewed-by: Nico Huber Reviewed-by: Michael Niewöhner --- src/mainboard/google/drallion/variants/drallion/devicetree.cb | 2 +- src/mainboard/google/hatch/variants/baseboard/devicetree.cb | 2 +- src/mainboard/google/sarien/variants/arcada/devicetree.cb | 2 +- src/mainboard/google/sarien/variants/sarien/devicetree.cb | 2 +- .../intel/coffeelake_rvp/variants/baseboard/devicetree.cb | 2 +- .../purism/librem_cnl/variants/librem_14/devicetree.cb | 2 +- .../purism/librem_cnl/variants/librem_mini/devicetree.cb | 2 +- src/mainboard/system76/gaze15/devicetree.cb | 2 +- src/mainboard/system76/lemp9/devicetree.cb | 2 +- src/mainboard/system76/oryp5/devicetree.cb | 2 +- src/mainboard/system76/oryp6/devicetree.cb | 2 +- src/mainboard/system76/whl-u/devicetree.cb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mainboard/google/drallion/variants/drallion/devicetree.cb b/src/mainboard/google/drallion/variants/drallion/devicetree.cb index 561fe7cc4c..105eddbb1f 100644 --- a/src/mainboard/google/drallion/variants/drallion/devicetree.cb +++ b/src/mainboard/google/drallion/variants/drallion/devicetree.cb @@ -457,7 +457,7 @@ chip soc/intel/cannonlake end end # LPC/eSPI device pci 1f.1 on end # P2SB - device pci 1f.2 on end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on end # Intel HDA device pci 1f.4 on end # SMBus device pci 1f.5 on end # PCH SPI diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb index 0266f713dc..f78d42096d 100644 --- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb @@ -346,7 +346,7 @@ chip soc/intel/cannonlake end end # eSPI Interface device pci 1f.1 on end # P2SB - device pci 1f.2 on end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on end # Intel HDA device pci 1f.4 on end # SMBus device pci 1f.5 on end # PCH SPI diff --git a/src/mainboard/google/sarien/variants/arcada/devicetree.cb b/src/mainboard/google/sarien/variants/arcada/devicetree.cb index a73bb17427..0bbc25fab6 100644 --- a/src/mainboard/google/sarien/variants/arcada/devicetree.cb +++ b/src/mainboard/google/sarien/variants/arcada/devicetree.cb @@ -394,7 +394,7 @@ chip soc/intel/cannonlake end end # LPC/eSPI device pci 1f.1 on end # P2SB - device pci 1f.2 on end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on end # Intel HDA device pci 1f.4 on end # SMBus device pci 1f.5 on end # PCH SPI diff --git a/src/mainboard/google/sarien/variants/sarien/devicetree.cb b/src/mainboard/google/sarien/variants/sarien/devicetree.cb index f13a2af1fd..a447240522 100644 --- a/src/mainboard/google/sarien/variants/sarien/devicetree.cb +++ b/src/mainboard/google/sarien/variants/sarien/devicetree.cb @@ -423,7 +423,7 @@ chip soc/intel/cannonlake end end # LPC/eSPI device pci 1f.1 on end # P2SB - device pci 1f.2 on end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on end # Intel HDA device pci 1f.4 on end # SMBus device pci 1f.5 on end # PCH SPI diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb index 12b1c47f33..e0ea3f20fa 100644 --- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb +++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/devicetree.cb @@ -71,7 +71,7 @@ chip soc/intel/cannonlake end end # LPC Interface device pci 1f.1 on end # P2SB - device pci 1f.2 on end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on end # Intel HDA device pci 1f.4 on end # SMBus device pci 1f.5 on end # PCH SPI diff --git a/src/mainboard/purism/librem_cnl/variants/librem_14/devicetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_14/devicetree.cb index 628885568c..c8d6816958 100644 --- a/src/mainboard/purism/librem_cnl/variants/librem_14/devicetree.cb +++ b/src/mainboard/purism/librem_cnl/variants/librem_14/devicetree.cb @@ -273,7 +273,7 @@ chip soc/intel/cannonlake end end device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA register "PchHdaAudioLinkHda" = "1" end diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb index 6abe6b41e9..08d152c574 100644 --- a/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb +++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb @@ -227,7 +227,7 @@ chip soc/intel/cannonlake device pci 1e.3 off end # GSPI #1 device pci 1f.0 on end # LPC Bridge device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA register "PchHdaAudioLinkHda" = "1" end diff --git a/src/mainboard/system76/gaze15/devicetree.cb b/src/mainboard/system76/gaze15/devicetree.cb index 1aec60f6d0..f8e879db86 100644 --- a/src/mainboard/system76/gaze15/devicetree.cb +++ b/src/mainboard/system76/gaze15/devicetree.cb @@ -201,7 +201,7 @@ chip soc/intel/cannonlake end end device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA register "PchHdaAudioLinkHda" = "1" register "PchHdaAudioLinkDmic0" = "1" diff --git a/src/mainboard/system76/lemp9/devicetree.cb b/src/mainboard/system76/lemp9/devicetree.cb index 536aa7da16..5648ca8bb4 100644 --- a/src/mainboard/system76/lemp9/devicetree.cb +++ b/src/mainboard/system76/lemp9/devicetree.cb @@ -188,7 +188,7 @@ chip soc/intel/cannonlake end end device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA register "PchHdaAudioLinkHda" = "1" end diff --git a/src/mainboard/system76/oryp5/devicetree.cb b/src/mainboard/system76/oryp5/devicetree.cb index 09c08842c3..b55cbbe828 100644 --- a/src/mainboard/system76/oryp5/devicetree.cb +++ b/src/mainboard/system76/oryp5/devicetree.cb @@ -189,7 +189,7 @@ chip soc/intel/cannonlake end end device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA subsystemid 0x1558 0x96e1 register "PchHdaAudioLinkHda" = "1" diff --git a/src/mainboard/system76/oryp6/devicetree.cb b/src/mainboard/system76/oryp6/devicetree.cb index 24d894edbd..56b08fbb66 100644 --- a/src/mainboard/system76/oryp6/devicetree.cb +++ b/src/mainboard/system76/oryp6/devicetree.cb @@ -204,7 +204,7 @@ chip soc/intel/cannonlake end end device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA register "PchHdaAudioLinkHda" = "1" end diff --git a/src/mainboard/system76/whl-u/devicetree.cb b/src/mainboard/system76/whl-u/devicetree.cb index b56ed5ee75..3e28a16c03 100644 --- a/src/mainboard/system76/whl-u/devicetree.cb +++ b/src/mainboard/system76/whl-u/devicetree.cb @@ -167,7 +167,7 @@ chip soc/intel/cannonlake end end device pci 1f.1 off end # P2SB - device pci 1f.2 off end # Power Management Controller + device pci 1f.2 hidden end # Power Management Controller device pci 1f.3 on # Intel HDA register "PchHdaAudioLinkHda" = "1" register "PchHdaAudioLinkDmic0" = "1"