From cc89a76a1098fe28b7d3ae63c9fe15ff5b352957 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Tue, 14 Jun 2022 11:09:30 +0800 Subject: [PATCH] mb/google/brya/var/agah: Remove stop pin declaration for LAN Currently, the system fails to enter S0ix as the stop pin declation for LAN device will prevent system from entering suspend. So remove the stop pin declaration. Also add device_index=0 for the first NIC to get correct MAC from VPD setting. BUG=b:210970640 TEST=Build and suspend_stress_test -c 20 pass Check LAN works fine after resume Change-Id: I513bf8b4bcb4d6db2eed2790fef7f6000a441274 Signed-off-by: Tony Huang Reviewed-on: https://review.coreboot.org/c/coreboot/+/65123 Reviewed-by: Ivy Jian Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/brya/variants/agah/gpio.c | 4 ++-- src/mainboard/google/brya/variants/agah/overridetree.cb | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mainboard/google/brya/variants/agah/gpio.c b/src/mainboard/google/brya/variants/agah/gpio.c index 2fc9654649..654edb2057 100644 --- a/src/mainboard/google/brya/variants/agah/gpio.c +++ b/src/mainboard/google/brya/variants/agah/gpio.c @@ -58,8 +58,8 @@ static const struct pad_config override_gpio_table[] = { PAD_NC_LOCK(GPP_D0, NONE, LOCK_CONFIG), /* D1 : ISH_GP1 ==> NC */ PAD_NC_LOCK(GPP_D1, NONE, LOCK_CONFIG), - /* D2 : ISH_GP2 ==> LAN_PR_ISOLATE_ODL */ - PAD_CFG_GPO_LOCK(GPP_D2, 1, LOCK_CONFIG), + /* D2 : ISH_GP2 ==> LAN_PE_ISOLATE_ODL */ + PAD_CFG_GPO(GPP_D2, 1, DEEP), /* D3 : ISH_GP3 ==> NC */ PAD_NC_LOCK(GPP_D3, NONE, LOCK_CONFIG), /* D5 : SRCCLKREQ0# ==> GPU_CLKREQ_ODL */ diff --git a/src/mainboard/google/brya/variants/agah/overridetree.cb b/src/mainboard/google/brya/variants/agah/overridetree.cb index 9c0bff9dc4..f693d04796 100644 --- a/src/mainboard/google/brya/variants/agah/overridetree.cb +++ b/src/mainboard/google/brya/variants/agah/overridetree.cb @@ -166,11 +166,8 @@ chip soc/intel/alderlake }" chip drivers/net register "customized_leds" = "0x05af" - register "stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D2)" - register "stop_delay_ms" = "12" # NIC needs time to quiesce - register "stop_off_delay_ms" = "1" - register "has_power_resource" = "1" register "wake" = "GPE0_DW0_07" + register "device_index" = "0" device pci 00.0 on end end end #RTL8111H Ethernet NIC