Skip to content

Commit e735fd0

Browse files
committed
[Intel][WDT] Completing devices to probe TCO
* Elkhart Lake (`0x4b23`) * Kaby Lake/H (`0xa2a3`) * Cannon Lake (`0xa323`) * Comet Lake/V (`0xa3a3`) * Ice Lake/NG (`0x38a3`) * Alder lake/M (`0x54a3`) * Arrow Lake/S (`0x7f23`)
1 parent b5a20e8 commit e735fd0

File tree

2 files changed

+40
-3
lines changed

2 files changed

+40
-3
lines changed

x86_64/corefreq-api.h

+12-3
Original file line numberDiff line numberDiff line change
@@ -1228,8 +1228,9 @@ typedef struct
12281228
#define DID_INTEL_X58_HUB_CORE 0x342e
12291229
#define DID_INTEL_X58_HUB_CTRL 0x3423
12301230
#define DID_INTEL_IIO_CORE_REG 0x3728
1231-
/* Source: Intel Corporation Jasper Lake SMBus */
1232-
#define DID_INTEL_JSL_SMBUS 0x4da3
1231+
/* Source: Intel Corporation Elkhart Lake SMBus and Jasper Lake SMBus */
1232+
#define DID_INTEL_EHL_SMBUS 0x4b23
1233+
#define DID_INTEL_JSL_SMBUS 0x4da3
12331234
/* Source: /include/linux/pci_ids.h */
12341235
#define DID_INTEL_SNB_IMC_HA0 0x3ca0
12351236
/* Source: 2nd Generation Intel Core Processor Family Vol2 */
@@ -1394,6 +1395,7 @@ typedef struct
13941395
#define DID_INTEL_KABYLAKE_U_IMC_HAQ 0x5914
13951396
#define DID_INTEL_KABYLAKE_S_IMC_HAQ 0x591f
13961397
#define DID_INTEL_KABYLAKE_X_IMC_HAQ 0x5906
1398+
#define DID_INTEL_KBL_PCH_H_SMBUS 0xa2a3
13971399
/* Source: Hewlett-Packard Company - Sunrise Point-LP SMBus */
13981400
#define DID_INTEL_SPT_LP_SMBUS 0x9d23
13991401
/* Source: 8th Generation Intel Processor for S-Platforms Datasheet Vol2 */
@@ -1416,8 +1418,10 @@ typedef struct
14161418
#define DID_INTEL_WHISKEYLAKE_U_IMC_HAD 0x3e35
14171419
#define DID_INTEL_WHISKEYLAKE_U_IMC_HAQ 0x3e34
14181420
#define DID_INTEL_CANNONLAKE_U_IMC_HB 0x5a04
1419-
/* Source: Comet Lake PCH-LP SMBus Host Controller */
1421+
#define DID_INTEL_CNL_PCH_SMBUS 0xa323
1422+
/* Source: Comet Lake PCH-LP SMBus and PCH-V SMBus Host Controllers */
14201423
#define DID_INTEL_CML_PCH_LP_SMBUS 0x02a3
1424+
#define DID_INTEL_CML_PCH_V_SMBUS 0xa3a3
14211425
/* Source: Intel 400 Series Chipset Family On-Package Platform Controller Hub */
14221426
#define DID_INTEL_COMETLAKE_S_IMC_6C 0x9b53
14231427
#define DID_INTEL_COMETLAKE_S_IMC_10C 0x9b54
@@ -1439,6 +1443,8 @@ typedef struct
14391443
#define DID_INTEL_COMETLAKE_W480_PCH 0x0697
14401444
#define DID_INTEL_ICELAKE_U_4C 0x8a12
14411445
#define DID_INTEL_ICELAKE_U_PCH 0x3482
1446+
/* Source: Apple MacBook Air/Pro - Intel Core i5-1038NG7 */
1447+
#define DID_INTEL_ICL_PCH_NG_SMBUS 0x38a3
14421448
/* Source: Linux: arch/x86/events/intel/uncore_snb.c */
14431449
#define DID_INTEL_COMETLAKE_U1_IMC 0x9b51
14441450
#define DID_INTEL_COMETLAKE_U3_IMC 0x9b71
@@ -1492,6 +1498,7 @@ typedef struct
14921498
#define DID_INTEL_ALDERLAKE_PCH_P 0x5182 /* PCH eSPI Controller */
14931499
#define DID_INTEL_ALDERLAKE_PCH_U 0x5188 /* PCH-U eSPI Controller */
14941500
#define DID_INTEL_ADL_PCH_P_SMBUS 0x51a3 /* ADL PCH-P Watchdog */
1501+
#define DID_INTEL_ADL_PCH_M_SMBUS 0x54a3 /* ADL PCH-M Watchdog */
14951502
#define DID_INTEL_ADL_S_PCH_SMBUS 0x7aa3
14961503
/* Source: 13th Generation Intel Core Processors Datasheet, vol 1 */
14971504
#define DID_INTEL_RAPTORLAKE_S_8P_16E_HB 0xa700
@@ -1539,6 +1546,8 @@ typedef struct
15391546
#define DID_INTEL_METEORLAKE_H_PCH 0x7e02
15401547
#define DID_INTEL_METEORLAKE_U_PCH 0x7e03
15411548
#define DID_INTEL_METEORLAKE_UT4_PCH 0x7e07
1549+
/* Source: Arrow Lake Client Platform/MTL-S (0x6-0xc6, stepping: 0x0) */
1550+
#define DID_INTEL_ARL_MTL_PCH_S_SMBUS 0x7f23
15421551
/* Source: /include/linux/pci_ids.h */
15431552
#define DID_AMD_K8_NB_MEMCTL 0x1102
15441553
#define DID_AMD_K8_NB 0x1100

x86_64/corefreqk.c

+28
Original file line numberDiff line numberDiff line change
@@ -10374,18 +10374,38 @@ static void Intel_Watchdog(CORE_RO *Core)
1037410374
.driver_data = (kernel_ulong_t) ICH_TCO
1037510375
},
1037610376
{
10377+
PCI_VDEVICE(INTEL, DID_INTEL_EHL_SMBUS),
10378+
.driver_data = (kernel_ulong_t) TCOBASE
10379+
},
10380+
{
1037710381
PCI_VDEVICE(INTEL, DID_INTEL_JSL_SMBUS),
1037810382
.driver_data = (kernel_ulong_t) TCOBASE
1037910383
},
1038010384
{
10385+
PCI_VDEVICE(INTEL, DID_INTEL_KBL_PCH_H_SMBUS),
10386+
.driver_data = (kernel_ulong_t) TCOBASE
10387+
},
10388+
{
1038110389
PCI_VDEVICE(INTEL, DID_INTEL_SPT_LP_SMBUS),
1038210390
.driver_data = (kernel_ulong_t) TCOBASE
1038310391
},
1038410392
{
10393+
PCI_VDEVICE(INTEL, DID_INTEL_CNL_PCH_SMBUS),
10394+
.driver_data = (kernel_ulong_t) TCOBASE
10395+
},
10396+
{
1038510397
PCI_VDEVICE(INTEL, DID_INTEL_CML_PCH_LP_SMBUS),
1038610398
.driver_data = (kernel_ulong_t) TCOBASE
1038710399
},
1038810400
{
10401+
PCI_VDEVICE(INTEL, DID_INTEL_CML_PCH_V_SMBUS),
10402+
.driver_data = (kernel_ulong_t) TCOBASE
10403+
},
10404+
{
10405+
PCI_VDEVICE(INTEL, DID_INTEL_ICL_PCH_NG_SMBUS),
10406+
.driver_data = (kernel_ulong_t) TCOBASE
10407+
},
10408+
{
1038910409
PCI_VDEVICE(INTEL, DID_INTEL_TGL_PCH_LP_SMBUS),
1039010410
.driver_data = (kernel_ulong_t) TCOBASE
1039110411
},
@@ -10394,13 +10414,21 @@ static void Intel_Watchdog(CORE_RO *Core)
1039410414
.driver_data = (kernel_ulong_t) TCOBASE
1039510415
},
1039610416
{
10417+
PCI_VDEVICE(INTEL, DID_INTEL_ADL_PCH_M_SMBUS),
10418+
.driver_data = (kernel_ulong_t) TCOBASE
10419+
},
10420+
{
1039710421
PCI_VDEVICE(INTEL, DID_INTEL_ADL_S_PCH_SMBUS),
1039810422
.driver_data = (kernel_ulong_t) TCOBASE
1039910423
},
1040010424
{
1040110425
PCI_VDEVICE(INTEL, DID_INTEL_RPL_D_PCH_SMBUS),
1040210426
.driver_data = (kernel_ulong_t) TCOBASE
1040310427
},
10428+
{
10429+
PCI_VDEVICE(INTEL, DID_INTEL_ARL_MTL_PCH_S_SMBUS),
10430+
.driver_data = (kernel_ulong_t) TCOBASE
10431+
},
1040410432
{0, }
1040510433
};
1040610434
if (CoreFreqK_ProbePCI(PCI_WDT_ids, NULL, NULL) < RC_SUCCESS) {

0 commit comments

Comments
 (0)