summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Bao <fishbaozi@gmail.com>2023-11-20 14:52:43 +0800
committerFelix Held <felix-coreboot@felixheld.de>2023-12-08 16:33:02 +0000
commitc7a5c50760dfd1d98f4324f7455c566791422fc8 (patch)
treee0dc51f882d8af11cdd1945fb6a94d96b97e5551
parent87837df807eeea39c08033a0f5b9a055926f6ae4 (diff)
Revert "nipperkin: Fix WLAN to GEN2 speed" & "Disable PSPP for WLAN"
Updated Linux FW works with PCI gen3 speed and PSPP. This reverts commit 05c9a850fd21 ("mb/google/nipperkin: Fix WLAN to GEN2 speed") https://review.coreboot.org/c/coreboot/+/63593 and commit 76fddd963925 ("mb/google/nipperkin: Disable PSPP for WLAN") https://review.coreboot.org/c/coreboot/+/63722 The changes are overlapped and are reverted together. BUG=b:240426142 & b:228830362 The system is able to ran over 2500 cycles on Nipperkin with command suspend_stress_test -c 10000 --wake_min 10 --suspend_min 10 \ --nofw_errors_fatal The whole variant_update_dxio_descriptors is empty and is pushed back to weak function. Change-Id: Id207076542edc8ea0cabc6e02e29856c2b6803c7 Signed-off-by: Zheng Bao <fishbaozi@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79172 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Van Patten <timvp@google.com>
-rw-r--r--src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc4
-rw-r--r--src/mainboard/google/guybrush/variants/nipperkin/variant.c15
2 files changed, 0 insertions, 19 deletions
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
index 14ecf5ecbb..e166093f7c 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
@@ -9,10 +9,6 @@ romstage-y += tpm_tis.c
ramstage-y += tpm_tis.c
verstage-y += tpm_tis.c
-bootblock-y += variant.c
-romstage-y += variant.c
-ramstage-y += variant.c
-
ramstage-y += ramstage.c
subdirs-y += ./memory
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/variant.c b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
deleted file mode 100644
index bd6c48ca86..0000000000
--- a/src/mainboard/google/guybrush/variants/nipperkin/variant.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <baseboard/variants.h>
-
-void variant_update_dxio_descriptors(fsp_dxio_descriptor *dxio_descriptors)
-{
- /* Fix link speed to GEN2 - b/228830362 */
- dxio_descriptors[WLAN].link_speed_capability = GEN2;
- dxio_descriptors[WLAN].port_params[0] = PP_PSPP_AC;
- /* AC_DirectIndirect[11:8], AC_MaxPreferredSpeed[7:4], AC_MinPreferredSpeed[3:0] */
- dxio_descriptors[WLAN].port_params[1] = 0x122;
- dxio_descriptors[WLAN].port_params[2] = PP_PSPP_DC;
- /* DC_DirectIndirect[11:8], DC_MaxPreferredSpeed[7:4], DC_MinPreferredSpeed[3:0] */
- dxio_descriptors[WLAN].port_params[3] = 0x122;
-}