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

drivers/{wifi/generic,intel/wifi}: Drop dependency on HAVE_ACPI_TABLES 

This change drops the dependency of DRIVERS_WIFI_GENERIC on
HAVE_ACPI_TABLES as the driver provides operations other than the ACPI
support for WiFi devices. Since the dependency is now dropped, ACPI
operations in generic.c are guarded by CONFIG(HAVE_ACPI_TABLES).

BUG=b:169802515
BRANCH=zork

Change-Id: I16444a9d842a6742e3c97ef04c4f18e93e6cdaa9
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46037
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Furquan Shaikh 2020-10-04 17:34:04 -07:00
parent a266d1e63a
commit 5e0033987e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/intel/wifi/Kconfig
View File

@ -2,7 +2,7 @@ config DRIVERS_INTEL_WIFI
bool "Support Intel PCI-e WiFi adapters" bool "Support Intel PCI-e WiFi adapters"
depends on PCI depends on PCI
default y if PCIEXP_PLUGIN_SUPPORT default y if PCIEXP_PLUGIN_SUPPORT
select DRIVERS_WIFI_GENERIC if HAVE_ACPI_TABLES select DRIVERS_WIFI_GENERIC
help help
When enabled, add identifiers in ACPI and SMBIOS tables to When enabled, add identifiers in ACPI and SMBIOS tables to
make OS drivers work with certain Intel PCI-e WiFi chipsets. make OS drivers work with certain Intel PCI-e WiFi chipsets.

1
src/drivers/wifi/generic/Kconfig
View File

@ -1,7 +1,6 @@
config DRIVERS_WIFI_GENERIC config DRIVERS_WIFI_GENERIC
bool bool
default n default n
depends on HAVE_ACPI_TABLES
help help
When enabled, add identifiers in ACPI tables that are common When enabled, add identifiers in ACPI tables that are common
to WiFi chipsets from multiple vendors. to WiFi chipsets from multiple vendors.

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

@ -37,6 +37,7 @@
*/ */
#define WIFI_ACPI_NAME_MAX_LEN 5 #define WIFI_ACPI_NAME_MAX_LEN 5
#if CONFIG(HAVE_ACPI_TABLES)
__weak __weak
int get_wifi_sar_limits(struct wifi_sar_limits *sar_limits) int get_wifi_sar_limits(struct wifi_sar_limits *sar_limits)
{ {
@ -239,6 +240,7 @@ static void wifi_generic_fill_ssdt_generator(const struct device *dev)
{ {
wifi_generic_fill_ssdt(dev, dev->chip_info); wifi_generic_fill_ssdt(dev, dev->chip_info);
} }
#endif
static void wifi_pci_dev_init(struct device *dev) static void wifi_pci_dev_init(struct device *dev)
{ {
@ -288,8 +290,10 @@ struct device_operations wifi_generic_ops = {
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = wifi_pci_dev_init, .init = wifi_pci_dev_init,
.ops_pci = &pci_dev_ops_pci, .ops_pci = &pci_dev_ops_pci,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_name = wifi_generic_acpi_name, .acpi_name = wifi_generic_acpi_name,
.acpi_fill_ssdt = wifi_generic_fill_ssdt_generator, .acpi_fill_ssdt = wifi_generic_fill_ssdt_generator,
#endif
#if CONFIG(GENERATE_SMBIOS_TABLES) #if CONFIG(GENERATE_SMBIOS_TABLES)
.get_smbios_data = smbios_write_wifi, .get_smbios_data = smbios_write_wifi,
#endif #endif