diff options
| author | Subrata Banik <subratabanik@google.com> | 2022-09-14 18:15:20 -0700 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2022-09-16 05:37:05 +0000 |
| commit | a3acac15eea01ef82b9fddb68d8df5b606185610 (patch) | |
| tree | bdb38acceb4824c11120d418779476865c2dc538 | |
| parent | 00b682e6a4166e01520f38728b6f31b79cb06c99 (diff) | |
Revert "drivers/wifi: Move MTL Magnetar CNVi DIDs from SoC to generic driver"
This reverts commit 510a55d4eeaeb32047c17328ef238b55b89e7296.
Reason for revert: Observed `missing read resource` issue for
cnvi device
BUG=b:244687646
TEST=No error seen in AP log while booting Google/rex
Without this patch:
[SPEW ] PCI: 00:14.3 read_resources bus 0 link: 0
[ERROR] GENERIC: 0.0 missing read_resources
[SPEW ] PCI: 00:14.3 read_resources bus 0 link: 0 done
With this patch:
[SPEW ] PCI: 00:14.3 read_resources bus 0 link: 0
[SPEW ] PCI: 00:14.3 read_resources bus 0 link: 0 done
Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I1e881313729f1088cffa7c161722ee79bb9acc49
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67566
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Tarun Tuli <taruntuli@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Ivy Jian <ivy.jian@quanta.corp-partner.google.com>
| -rw-r--r-- | src/drivers/wifi/generic/generic.c | 5 | ||||
| -rw-r--r-- | src/include/device/pci_ids.h | 8 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cnvi/cnvi.c | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c index 62a543032f..6d369ce3f7 100644 --- a/src/drivers/wifi/generic/generic.c +++ b/src/drivers/wifi/generic/generic.c @@ -112,11 +112,6 @@ static const unsigned short intel_pci_device_ids[] = { PCI_DID_GrP_6SERIES_1_WIFI, PCI_DID_GrP_6SERIES_2_WIFI, PCI_DID_GrP_6SERIES_3_WIFI, - /* Typhoon Peak 2 */ - PCI_DID_TyP2_6SERIES_1_WIFI, - PCI_DID_TyP2_6SERIES_2_WIFI, - PCI_DID_TyP2_6SERIES_3_WIFI, - PCI_DID_TyP2_6SERIES_4_WIFI, 0 }; diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 146d749b3f..434449ccba 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -4431,10 +4431,6 @@ #define PCI_DID_GrP_6SERIES_1_WIFI 0x51f0 #define PCI_DID_GrP_6SERIES_2_WIFI 0x7af0 #define PCI_DID_GrP_6SERIES_3_WIFI 0x51f1 -#define PCI_DID_TyP2_6SERIES_1_WIFI 0x7e40 -#define PCI_DID_TyP2_6SERIES_2_WIFI 0x7e41 -#define PCI_DID_TyP2_6SERIES_3_WIFI 0x7e42 -#define PCI_DID_TyP2_6SERIES_4_WIFI 0x7e43 #define PCI_DID_INTEL_TGL_IPU 0x9a19 #define PCI_DID_INTEL_TGL_H_IPU 0x9a39 @@ -4482,6 +4478,10 @@ #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_1 0x54f1 #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_2 0x54f2 #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_3 0x54f3 +#define PCI_DID_INTEL_MTL_CNVI_WIFI_0 0x7e40 +#define PCI_DID_INTEL_MTL_CNVI_WIFI_1 0x7e41 +#define PCI_DID_INTEL_MTL_CNVI_WIFI_2 0x7e42 +#define PCI_DID_INTEL_MTL_CNVI_WIFI_3 0x7e43 /* Intel Crashlog */ #define PCI_DID_INTEL_TGL_CPU_CRASHLOG_SRAM 0x9a0d diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c index fd0c33de4a..f4fa019702 100644 --- a/src/soc/intel/common/block/cnvi/cnvi.c +++ b/src/soc/intel/common/block/cnvi/cnvi.c @@ -21,6 +21,10 @@ static struct device_operations cnvi_wifi_ops = { }; static const unsigned short wifi_pci_device_ids[] = { + PCI_DID_INTEL_MTL_CNVI_WIFI_0, + PCI_DID_INTEL_MTL_CNVI_WIFI_1, + PCI_DID_INTEL_MTL_CNVI_WIFI_2, + PCI_DID_INTEL_MTL_CNVI_WIFI_3, PCI_DID_INTEL_CML_LP_CNVI_WIFI, PCI_DID_INTEL_CML_H_CNVI_WIFI, PCI_DID_INTEL_CNL_LP_CNVI_WIFI, |