summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/drivers/intel/wifi/Kconfig8
-rw-r--r--src/drivers/intel/wifi/Makefile.inc3
-rw-r--r--src/drivers/intel/wifi/chip.h10
-rw-r--r--src/drivers/intel/wifi/wifi.c146
-rw-r--r--src/drivers/wifi/generic/Kconfig9
-rw-r--r--src/drivers/wifi/generic/generic.c64
6 files changed, 73 insertions, 167 deletions
diff --git a/src/drivers/intel/wifi/Kconfig b/src/drivers/intel/wifi/Kconfig
deleted file mode 100644
index 5454e9768e..0000000000
--- a/src/drivers/intel/wifi/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-config DRIVERS_INTEL_WIFI
- bool "Support Intel PCI-e WiFi adapters"
- depends on PCI
- default y if PCIEXP_PLUGIN_SUPPORT
- select DRIVERS_WIFI_GENERIC
- help
- When enabled, add identifiers in ACPI and SMBIOS tables to
- make OS drivers work with certain Intel PCI-e WiFi chipsets.
diff --git a/src/drivers/intel/wifi/Makefile.inc b/src/drivers/intel/wifi/Makefile.inc
deleted file mode 100644
index 9bfdd79376..0000000000
--- a/src/drivers/intel/wifi/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-ramstage-$(CONFIG_DRIVERS_INTEL_WIFI) += wifi.c
diff --git a/src/drivers/intel/wifi/chip.h b/src/drivers/intel/wifi/chip.h
deleted file mode 100644
index 966573f2f4..0000000000
--- a/src/drivers/intel/wifi/chip.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _INTEL_WIFI_CHIP_H_
-#define _INTEL_WIFI_CHIP_H_
-
-struct drivers_intel_wifi_config {
- unsigned int wake; /* Wake pin for ACPI _PRW */
-};
-
-#endif /* _INTEL_WIFI_CHIP_H_ */
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
deleted file mode 100644
index 3c90dde5d3..0000000000
--- a/src/drivers/intel/wifi/wifi.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ops.h>
-#include <device/pci_ids.h>
-#include <elog.h>
-#include <smbios.h>
-#include <string.h>
-#include "chip.h"
-#include "drivers/wifi/generic/chip.h"
-
-#if CONFIG(GENERATE_SMBIOS_TABLES)
-static int smbios_write_wifi(struct device *dev, int *handle,
- unsigned long *current)
-{
- struct smbios_type_intel_wifi {
- u8 type;
- u8 length;
- u16 handle;
- u8 str;
- u8 eos[2];
- } __packed;
-
- struct smbios_type_intel_wifi *t =
- (struct smbios_type_intel_wifi *)*current;
- int len = sizeof(struct smbios_type_intel_wifi);
-
- memset(t, 0, sizeof(struct smbios_type_intel_wifi));
- t->type = 0x85;
- t->length = len - 2;
- t->handle = *handle;
- /*
- * Intel wifi driver expects this string to be in the table 0x85
- * with PCI IDs enumerated below.
- */
- t->str = smbios_add_string(t->eos, "KHOIHGIUCCHHII");
-
- len = t->length + smbios_string_table_len(t->eos);
- *current += len;
- *handle += 1;
- return len;
-}
-#endif
-
-#if CONFIG(HAVE_ACPI_TABLES)
-static void intel_wifi_fill_ssdt(const struct device *dev)
-{
- struct drivers_intel_wifi_config *config = dev->chip_info;
- struct drivers_wifi_generic_config generic_config;
-
- if (config)
- generic_config.wake = config->wake;
-
- wifi_generic_fill_ssdt(dev, config ? &generic_config : NULL);
-}
-#endif
-
-static void wifi_pci_dev_init(struct device *dev)
-{
- if (pci_dev_is_wake_source(dev))
- elog_add_event_wake(ELOG_WAKE_SOURCE_PME_WIFI, 0);
-}
-
-struct device_operations device_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = wifi_pci_dev_init,
-#if CONFIG(GENERATE_SMBIOS_TABLES)
- .get_smbios_data = smbios_write_wifi,
-#endif
- .ops_pci = &pci_dev_ops_pci,
-#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = wifi_generic_acpi_name,
- .acpi_fill_ssdt = intel_wifi_fill_ssdt,
-#endif
-};
-
-static const unsigned short pci_device_ids[] = {
- PCI_DEVICE_ID_1000_SERIES_WIFI,
- PCI_DEVICE_ID_6005_SERIES_WIFI,
- PCI_DEVICE_ID_6005_I_SERIES_WIFI,
- PCI_DEVICE_ID_1030_SERIES_WIFI,
- PCI_DEVICE_ID_6030_I_SERIES_WIFI,
- PCI_DEVICE_ID_6030_SERIES_WIFI,
- PCI_DEVICE_ID_6150_SERIES_WIFI,
- PCI_DEVICE_ID_2030_SERIES_WIFI,
- PCI_DEVICE_ID_2000_SERIES_WIFI,
- PCI_DEVICE_ID_0135_SERIES_WIFI,
- PCI_DEVICE_ID_0105_SERIES_WIFI,
- PCI_DEVICE_ID_6035_SERIES_WIFI,
- PCI_DEVICE_ID_5300_SERIES_WIFI,
- PCI_DEVICE_ID_5100_SERIES_WIFI,
- PCI_DEVICE_ID_6000_SERIES_WIFI,
- PCI_DEVICE_ID_6000_I_SERIES_WIFI,
- PCI_DEVICE_ID_5350_SERIES_WIFI,
- PCI_DEVICE_ID_5150_SERIES_WIFI,
- /* Wilkins Peak 2 */
- PCI_DEVICE_ID_WP_7260_SERIES_1_WIFI,
- PCI_DEVICE_ID_WP_7260_SERIES_2_WIFI,
- /* Stone Peak 2 */
- PCI_DEVICE_ID_SP_7265_SERIES_1_WIFI,
- PCI_DEVICE_ID_SP_7265_SERIES_2_WIFI,
- /* Stone Field Peak */
- PCI_DEVICE_ID_SFP_8260_SERIES_1_WIFI,
- PCI_DEVICE_ID_SFP_8260_SERIES_2_WIFI,
- /* Windstorm Peak */
- PCI_DEVICE_ID_WSP_8275_SERIES_1_WIFI,
- /* Jefferson Peak */
- PCI_DEVICE_ID_JP_9000_SERIES_1_WIFI,
- PCI_DEVICE_ID_JP_9000_SERIES_2_WIFI,
- PCI_DEVICE_ID_JP_9000_SERIES_3_WIFI,
- /* Thunder Peak 2 */
- PCI_DEVICE_ID_TP_9260_SERIES_WIFI,
- /* Harrison Peak */
- PCI_DEVICE_ID_HrP_9560_SERIES_1_WIFI,
- PCI_DEVICE_ID_HrP_9560_SERIES_2_WIFI,
- PCI_DEVICE_ID_HrP_9560_SERIES_3_WIFI,
- PCI_DEVICE_ID_HrP_9560_SERIES_4_WIFI,
- PCI_DEVICE_ID_HrP_6SERIES_WIFI,
- /* Cyclone Peak */
- PCI_DEVICE_ID_CyP_6SERIES_WIFI,
- /* Typhoon Peak */
- PCI_DEVICE_ID_TyP_6SERIES_WIFI,
- /* Garfiled Peak */
- PCI_DEVICE_ID_GrP_6SERIES_1_WIFI,
- PCI_DEVICE_ID_GrP_6SERIES_2_WIFI,
- 0
-};
-
-static const struct pci_driver pch_intel_wifi __pci_driver = {
- .ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .devices = pci_device_ids,
-};
-
-static void intel_wifi_enable(struct device *dev)
-{
- dev->ops = &device_ops;
-}
-
-struct chip_operations drivers_intel_wifi_ops = {
- CHIP_NAME("Intel WiFi")
- .enable_dev = intel_wifi_enable
-};
diff --git a/src/drivers/wifi/generic/Kconfig b/src/drivers/wifi/generic/Kconfig
index ddd2be9504..43c7d9ee1b 100644
--- a/src/drivers/wifi/generic/Kconfig
+++ b/src/drivers/wifi/generic/Kconfig
@@ -5,6 +5,15 @@ config DRIVERS_WIFI_GENERIC
When enabled, add identifiers in ACPI tables that are common
to WiFi chipsets from multiple vendors.
+config DRIVERS_INTEL_WIFI
+ bool "Support Intel PCI-e WiFi adapters"
+ depends on PCI
+ default y if PCIEXP_PLUGIN_SUPPORT
+ select DRIVERS_WIFI_GENERIC
+ help
+ When enabled, add identifiers in ACPI and SMBIOS tables to
+ make OS drivers work with certain Intel PCI-e WiFi chipsets.
+
if DRIVERS_WIFI_GENERIC
config USE_SAR
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c
index bb36861cba..ba061d0e8e 100644
--- a/src/drivers/wifi/generic/generic.c
+++ b/src/drivers/wifi/generic/generic.c
@@ -313,3 +313,67 @@ struct chip_operations drivers_wifi_generic_ops = {
CHIP_NAME("WIFI Device")
.enable_dev = wifi_generic_enable
};
+
+static const unsigned short intel_pci_device_ids[] = {
+ PCI_DEVICE_ID_1000_SERIES_WIFI,
+ PCI_DEVICE_ID_6005_SERIES_WIFI,
+ PCI_DEVICE_ID_6005_I_SERIES_WIFI,
+ PCI_DEVICE_ID_1030_SERIES_WIFI,
+ PCI_DEVICE_ID_6030_I_SERIES_WIFI,
+ PCI_DEVICE_ID_6030_SERIES_WIFI,
+ PCI_DEVICE_ID_6150_SERIES_WIFI,
+ PCI_DEVICE_ID_2030_SERIES_WIFI,
+ PCI_DEVICE_ID_2000_SERIES_WIFI,
+ PCI_DEVICE_ID_0135_SERIES_WIFI,
+ PCI_DEVICE_ID_0105_SERIES_WIFI,
+ PCI_DEVICE_ID_6035_SERIES_WIFI,
+ PCI_DEVICE_ID_5300_SERIES_WIFI,
+ PCI_DEVICE_ID_5100_SERIES_WIFI,
+ PCI_DEVICE_ID_6000_SERIES_WIFI,
+ PCI_DEVICE_ID_6000_I_SERIES_WIFI,
+ PCI_DEVICE_ID_5350_SERIES_WIFI,
+ PCI_DEVICE_ID_5150_SERIES_WIFI,
+ /* Wilkins Peak 2 */
+ PCI_DEVICE_ID_WP_7260_SERIES_1_WIFI,
+ PCI_DEVICE_ID_WP_7260_SERIES_2_WIFI,
+ /* Stone Peak 2 */
+ PCI_DEVICE_ID_SP_7265_SERIES_1_WIFI,
+ PCI_DEVICE_ID_SP_7265_SERIES_2_WIFI,
+ /* Stone Field Peak */
+ PCI_DEVICE_ID_SFP_8260_SERIES_1_WIFI,
+ PCI_DEVICE_ID_SFP_8260_SERIES_2_WIFI,
+ /* Windstorm Peak */
+ PCI_DEVICE_ID_WSP_8275_SERIES_1_WIFI,
+ /* Jefferson Peak */
+ PCI_DEVICE_ID_JP_9000_SERIES_1_WIFI,
+ PCI_DEVICE_ID_JP_9000_SERIES_2_WIFI,
+ PCI_DEVICE_ID_JP_9000_SERIES_3_WIFI,
+ /* Thunder Peak 2 */
+ PCI_DEVICE_ID_TP_9260_SERIES_WIFI,
+ /* Harrison Peak */
+ PCI_DEVICE_ID_HrP_9560_SERIES_1_WIFI,
+ PCI_DEVICE_ID_HrP_9560_SERIES_2_WIFI,
+ PCI_DEVICE_ID_HrP_9560_SERIES_3_WIFI,
+ PCI_DEVICE_ID_HrP_9560_SERIES_4_WIFI,
+ PCI_DEVICE_ID_HrP_6SERIES_WIFI,
+ /* Cyclone Peak */
+ PCI_DEVICE_ID_CyP_6SERIES_WIFI,
+ /* Typhoon Peak */
+ PCI_DEVICE_ID_TyP_6SERIES_WIFI,
+ /* Garfield Peak */
+ PCI_DEVICE_ID_GrP_6SERIES_1_WIFI,
+ PCI_DEVICE_ID_GrP_6SERIES_2_WIFI,
+ 0
+};
+
+/*
+ * The PCI driver is retained for backward compatibility with boards that never utilized the
+ * chip driver to support Intel WiFi device. For these devices, the PCI driver helps perform the
+ * same operations as above (except exposing the wake property) by utilizing the same
+ * `wifi_generic_ops`.
+ */
+static const struct pci_driver intel_wifi_pci_driver __pci_driver = {
+ .ops = &wifi_generic_ops,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .devices = intel_pci_device_ids,
+};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 13:48:01 +0000