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

Revert "drivers/wifi: Move MTL Magnetar CNVi DIDs from SoC to generic driver" 

This reverts commit 510a55d4ee.

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>
This commit is contained in:
Subrata Banik 2022-09-14 18:15:20 -07:00
parent 00b682e6a4
commit a3acac15ee
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,11 +112,6 @@ static const unsigned short intel_pci_device_ids[] = {
PCI_DID_GrP_6SERIES_1_WIFI, PCI_DID_GrP_6SERIES_1_WIFI,
PCI_DID_GrP_6SERIES_2_WIFI, PCI_DID_GrP_6SERIES_2_WIFI,
PCI_DID_GrP_6SERIES_3_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 0
}; };

8
src/include/device/pci_ids.h
View File

@ -4431,10 +4431,6 @@
#define PCI_DID_GrP_6SERIES_1_WIFI 0x51f0 #define PCI_DID_GrP_6SERIES_1_WIFI 0x51f0
#define PCI_DID_GrP_6SERIES_2_WIFI 0x7af0 #define PCI_DID_GrP_6SERIES_2_WIFI 0x7af0
#define PCI_DID_GrP_6SERIES_3_WIFI 0x51f1 #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_IPU 0x9a19
#define PCI_DID_INTEL_TGL_H_IPU 0x9a39 #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_1 0x54f1
#define PCI_DID_INTEL_ADL_N_CNVI_WIFI_2 0x54f2 #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_2 0x54f2
#define PCI_DID_INTEL_ADL_N_CNVI_WIFI_3 0x54f3 #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 */ /* Intel Crashlog */
#define PCI_DID_INTEL_TGL_CPU_CRASHLOG_SRAM 0x9a0d #define PCI_DID_INTEL_TGL_CPU_CRASHLOG_SRAM 0x9a0d

4
src/soc/intel/common/block/cnvi/cnvi.c
View File

@ -21,6 +21,10 @@ static struct device_operations cnvi_wifi_ops = {
}; };
static const unsigned short wifi_pci_device_ids[] = { 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_LP_CNVI_WIFI,
PCI_DID_INTEL_CML_H_CNVI_WIFI, PCI_DID_INTEL_CML_H_CNVI_WIFI,
PCI_DID_INTEL_CNL_LP_CNVI_WIFI, PCI_DID_INTEL_CNL_LP_CNVI_WIFI,