summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Savery <asavery@chromium.org>2023-08-22 20:15:27 +0000
committerMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-09-06 13:17:11 +0000
commit0d3745b67c9e457ad1401f3f1c322c1161231df3 (patch)
tree58c90acbc3fb7f7ad74d0ef324f053c7ffe7e133
parent184329c77a7750d86cfe1d848000dae0e72a3889 (diff)
google/puff: remove workaround that toggled the #ISOLATE pin
A workaround was added for puff to assert/deassert the #ISOLATE pin during suspend/resume to resolve the situation where the realtek ethernet device cannot enter L1.2 mode when its ASPM is disabled. The realtek driver has since been fixed and ASPM of realtek devices have been enabled on kernel 5.10 and 5.15 and this original workaround is now causing suspend/resume errors on kernel 5.15: r8169 0000:01:00.0: Unable to change power state from D3cold to D0, device inaccessible Puff devices were originally shipped with kernel 4.19, and applying this change to the firmware on a device running 4.19 causes suspend/resume failures, basically reversing the problem. We are upreving the puff kernel to 5.15 so we need this patch, but since it is incompatible with 4.19 we will have to take that into consideration when pushing new firmware and potentially will need to backport the necessary fixes to 4.19. BUG=b:268859220 TEST=suspend_stress_test -c 500 on wyvern Change-Id: I5eead2d70cd9528b3ca3fadd11f98c0330601324 Signed-off-by: Alexis Savery <asavery@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77378 Reviewed-by: Karthik Ramasubramanian <kramasub@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Sam McNally <sammc@google.com>
-rw-r--r--src/mainboard/google/puff/variants/ambassador/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/duffy/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/faffy/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/genesis/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/kaisa/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/moonbuggy/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/noibat/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/puff/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/scout/overridetree.cb4
-rw-r--r--src/mainboard/google/puff/variants/wyvern/overridetree.cb4
10 files changed, 0 insertions, 40 deletions
diff --git a/src/mainboard/google/puff/variants/ambassador/overridetree.cb b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
index b4f3609ba0..1d574b8306 100644
--- a/src/mainboard/google/puff/variants/ambassador/overridetree.cb
+++ b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
@@ -394,10 +394,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/duffy/overridetree.cb b/src/mainboard/google/puff/variants/duffy/overridetree.cb
index 25778f92cb..f6be7a3193 100644
--- a/src/mainboard/google/puff/variants/duffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/duffy/overridetree.cb
@@ -453,10 +453,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/faffy/overridetree.cb b/src/mainboard/google/puff/variants/faffy/overridetree.cb
index 1ac9414c6a..f4b1a8b951 100644
--- a/src/mainboard/google/puff/variants/faffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/faffy/overridetree.cb
@@ -427,10 +427,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/genesis/overridetree.cb b/src/mainboard/google/puff/variants/genesis/overridetree.cb
index b42ca911bc..b16bbfb2e1 100644
--- a/src/mainboard/google/puff/variants/genesis/overridetree.cb
+++ b/src/mainboard/google/puff/variants/genesis/overridetree.cb
@@ -424,10 +424,6 @@ chip soc/intel/cannonlake
chip drivers/net # RTL8111H Ethernet NIC
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/kaisa/overridetree.cb b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
index 50c6d0b1b1..1e531b210f 100644
--- a/src/mainboard/google/puff/variants/kaisa/overridetree.cb
+++ b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
@@ -453,10 +453,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
index 1049805700..4896bd8998 100644
--- a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
@@ -426,10 +426,6 @@ chip soc/intel/cannonlake
chip drivers/net # RTL8111H Ethernet NIC
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/noibat/overridetree.cb b/src/mainboard/google/puff/variants/noibat/overridetree.cb
index cf6046224c..c6768a43d8 100644
--- a/src/mainboard/google/puff/variants/noibat/overridetree.cb
+++ b/src/mainboard/google/puff/variants/noibat/overridetree.cb
@@ -364,10 +364,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/puff/overridetree.cb b/src/mainboard/google/puff/variants/puff/overridetree.cb
index 0d9bf7237e..52ebf3aa49 100644
--- a/src/mainboard/google/puff/variants/puff/overridetree.cb
+++ b/src/mainboard/google/puff/variants/puff/overridetree.cb
@@ -388,10 +388,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/scout/overridetree.cb b/src/mainboard/google/puff/variants/scout/overridetree.cb
index 78a77dd4f9..533d0fc100 100644
--- a/src/mainboard/google/puff/variants/scout/overridetree.cb
+++ b/src/mainboard/google/puff/variants/scout/overridetree.cb
@@ -404,10 +404,6 @@ chip soc/intel/cannonlake
chip drivers/net # RTL8111H Ethernet NIC
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end
diff --git a/src/mainboard/google/puff/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
index b9dd489cf2..93cd6c9117 100644
--- a/src/mainboard/google/puff/variants/wyvern/overridetree.cb
+++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
@@ -389,10 +389,6 @@ chip soc/intel/cannonlake
chip drivers/net
register "customized_leds" = "0x05af"
register "wake" = "GPE0_DW1_07" # GPP_C7
- register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A18)"
- register "stop_delay_ms" = "12" # NIC needs time to quiesce
- register "stop_off_delay_ms" = "1"
- register "has_power_resource" = "1"
register "device_index" = "0"
device pci 00.0 on end
end