GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/wifi: Drop maxsleep parameter from chip config 

This change drops maxsleep parameter from chip config and instead
hardcodes the deepest sleep state from which the WiFi device can wake
the system up from to SLP_TYP_S3. This is similar to how other device
drivers in coreboot report _PRW property in ACPI. It relieves the
users from adding another register attribute to devicetree since all
mainboards configure the same value. If this changes in the future, it
should be easy to bring the maxsleep config parameter back.

BUG=b:169802515
BRANCH=zork

Change-Id: I42131fced008da0d51f0f777b7f2d99deaf68827
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46033
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Furquan Shaikh 2020-10-04 12:13:07 -07:00
parent 54b2716990
commit 0af1926353
6 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/intel/wifi/wifi.c
View File

@ -49,11 +49,9 @@ static void intel_wifi_fill_ssdt(const struct device *dev)
struct drivers_intel_wifi_config *config = dev->chip_info; struct drivers_intel_wifi_config *config = dev->chip_info;
struct drivers_wifi_generic_config generic_config; struct drivers_wifi_generic_config generic_config;
if (config) { if (config)
generic_config.wake = config->wake; generic_config.wake = config->wake;
/* By default, all intel wifi chips wake from S3 */
generic_config.maxsleep = 3;
}
wifi_generic_fill_ssdt(dev, config ? &generic_config : NULL); wifi_generic_fill_ssdt(dev, config ? &generic_config : NULL);
} }
#endif #endif

2
src/drivers/wifi/generic/chip.h
View File

@ -6,11 +6,9 @@
/** /**
* struct drivers_wifi_generic_config - Data structure to contain generic wifi config * struct drivers_wifi_generic_config - Data structure to contain generic wifi config
* @wake: Wake pin for ACPI _PRW * @wake: Wake pin for ACPI _PRW
* @maxsleep: Maximum sleep state to wake from
*/ */
struct drivers_wifi_generic_config { struct drivers_wifi_generic_config {
unsigned int wake; unsigned int wake;
unsigned int maxsleep;
}; };
/** /**

2
src/drivers/wifi/generic/generic.c
View File

@ -189,7 +189,7 @@ void wifi_generic_fill_ssdt(const struct device *dev,
/* Wake capabilities */ /* Wake capabilities */
if (config) if (config)
acpigen_write_PRW(config->wake, config->maxsleep); acpigen_write_PRW(config->wake, ACPI_S3);
/* Fill regulatory domain structure */ /* Fill regulatory domain structure */
if (CONFIG(HAVE_REGULATORY_DOMAIN)) { if (CONFIG(HAVE_REGULATORY_DOMAIN)) {

1
src/mainboard/google/dedede/variants/madoo/overridetree.cb
View File

@ -103,7 +103,6 @@ chip soc/intel/jasperlake
device pci 1c.7 on device pci 1c.7 on
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW2_03" register "wake" = "GPE0_DW2_03"
register "maxsleep" = "3"
device pci 00.0 on end device pci 00.0 on end
end end
end # PCI Express Root Port 8 - WLAN end # PCI Express Root Port 8 - WLAN

1
src/mainboard/google/dedede/variants/magolor/overridetree.cb
View File

@ -287,7 +287,6 @@ chip soc/intel/jasperlake
device pci 1c.7 on device pci 1c.7 on
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW2_03" register "wake" = "GPE0_DW2_03"
register "maxsleep" = "3"
device pci 00.0 on end device pci 00.0 on end
end end
end # PCI Express Root Port 8 - WLAN end # PCI Express Root Port 8 - WLAN

1
src/mainboard/google/dedede/variants/waddledee/overridetree.cb
View File

@ -147,7 +147,6 @@ chip soc/intel/jasperlake
device pci 1c.7 on device pci 1c.7 on
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW2_03" register "wake" = "GPE0_DW2_03"
register "maxsleep" = "3"
device pci 00.0 on end device pci 00.0 on end
end end
end # PCI Express Root Port 8 - WLAN end # PCI Express Root Port 8 - WLAN