Skip to content

gc2: es: Modify DIMM sensor channel to match with GC2.0 MB #2633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pabloyangWW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

gc2: es: Modify DIMM sensor channel to match with GC2.0 MB #2633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions meta-facebook/gc2-es/src/platform/plat_sdr_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2043,7 +2043,7 @@ SDR_Full_sensor plat_sdr_table[] = {
"MB_VR_FAON_VOLT_V",
},
{
// DIMM A0 on board temperature
// DIMM A2 on board temperature
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2052,7 +2052,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_TEMP_DIMM_A0, // sensor number
SENSOR_NUM_TEMP_DIMM_A2, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2101,10 +2101,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_DIMMA0_TEMP_C",
"MB_DIMMA2_TEMP_C",
},
{
// DIMM A2 on board temperature
// DIMM A3 on board temperature
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2113,7 +2113,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_TEMP_DIMM_A2, // sensor number
SENSOR_NUM_TEMP_DIMM_A3, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2162,10 +2162,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_DIMMA2_TEMP_C",
"MB_DIMMA3_TEMP_C",
},
{
// DIMM A4 on board temperature
// DIMM A6 on board temperature
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2174,7 +2174,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_TEMP_DIMM_A4, // sensor number
SENSOR_NUM_TEMP_DIMM_A6, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2223,10 +2223,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_DIMMA4_TEMP_C",
"MB_DIMMA6_TEMP_C",
},
{
// DIMM A6 on board temperature
// DIMM A7 on board temperature
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2235,7 +2235,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_TEMP_DIMM_A6, // sensor number
SENSOR_NUM_TEMP_DIMM_A7, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2284,10 +2284,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_DIMMA6_TEMP_C",
"MB_DIMMA7_TEMP_C",
},
{
// DIMMA0 power
// DIMMA2 power
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2296,7 +2296,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_PWR_DIMMA0_PMIC, // sensor number
SENSOR_NUM_PWR_DIMMA2_PMIC, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2345,10 +2345,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_VR_DIMMA0_PMIC_PWR_W",
"MB_VR_DIMMA2_PMIC_PWR_W",
},
{
// DIMMA2 power
// DIMMA3 power
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2357,7 +2357,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_PWR_DIMMA2_PMIC, // sensor number
SENSOR_NUM_PWR_DIMMA3_PMIC, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2406,10 +2406,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_VR_DIMMA2_PMIC_PWR_W",
"MB_VR_DIMMA3_PMIC_PWR_W",
},
{
// DIMMA4 power
// DIMMA6 power
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2418,7 +2418,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_PWR_DIMMA4_PMIC, // sensor number
SENSOR_NUM_PWR_DIMMA6_PMIC, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2467,10 +2467,10 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_VR_DIMMA4_PMIC_PWR_W",
"MB_VR_DIMMA6_PMIC_PWR_W",
},
{
// DIMMA6 power
// DIMMA7 power
0x00,
0x00, // record ID
IPMI_SDR_VER_15, // SDR ver
Expand All @@ -2479,7 +2479,7 @@ SDR_Full_sensor plat_sdr_table[] = {

SELF_I2C_ADDRESS << 1, // owner id
0x00, // owner lun
SENSOR_NUM_PWR_DIMMA6_PMIC, // sensor number
SENSOR_NUM_PWR_DIMMA7_PMIC, // sensor number

IPMI_SDR_ENTITY_ID_SYS_BOARD, // entity id
0x00, // entity instance
Expand Down Expand Up @@ -2528,7 +2528,7 @@ SDR_Full_sensor plat_sdr_table[] = {
0x00, // reserved
0x00, // OEM
IPMI_SDR_STRING_TYPE_ASCII_8, // ID len, should be same as "size of struct"
"MB_VR_DIMMA6_PMIC_PWR_W",
"MB_VR_DIMMA7_PMIC_PWR_W",
},
{
// SSD0 temperature
Expand Down
28 changes: 14 additions & 14 deletions meta-facebook/gc2-es/src/platform/plat_sensor_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ sensor_poll_time_cfg diff_poll_time_sensor_table[] = {

dimm_pmic_mapping_cfg dimm_pmic_map_table[] = {
// dimm_sensor_num, mapping_pmic_sensor_num
{ SENSOR_NUM_TEMP_DIMM_A0, SENSOR_NUM_PWR_DIMMA0_PMIC },
{ SENSOR_NUM_TEMP_DIMM_A2, SENSOR_NUM_PWR_DIMMA2_PMIC },
{ SENSOR_NUM_TEMP_DIMM_A4, SENSOR_NUM_PWR_DIMMA4_PMIC },
{ SENSOR_NUM_TEMP_DIMM_A3, SENSOR_NUM_PWR_DIMMA3_PMIC },
{ SENSOR_NUM_TEMP_DIMM_A6, SENSOR_NUM_PWR_DIMMA6_PMIC },
{ SENSOR_NUM_TEMP_DIMM_A7, SENSOR_NUM_PWR_DIMMA7_PMIC },
};

bool m2_access(uint8_t sensor_num)
Expand Down Expand Up @@ -92,22 +92,22 @@ sensor_cfg plat_sensor_config[] = {
SENSOR_INIT_STATUS, NULL, NULL, NULL, NULL, NULL },

// DIMM temp
{ SENSOR_NUM_TEMP_DIMM_A0, sensor_dev_intel_peci, NONE, CPU_PECI_ADDR,
PECI_TEMP_CHANNEL0_DIMM0, post_access, 0, 0, SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT,
ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS, pre_intel_peci_dimm_read,
&dimm_pre_proc_args[0], NULL, NULL, NULL },
{ SENSOR_NUM_TEMP_DIMM_A2, sensor_dev_intel_peci, NONE, CPU_PECI_ADDR,
PECI_TEMP_CHANNEL2_DIMM0, post_access, 0, 0, SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT,
ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS, pre_intel_peci_dimm_read,
&dimm_pre_proc_args[1], NULL, NULL, NULL },
{ SENSOR_NUM_TEMP_DIMM_A4, sensor_dev_intel_peci, NONE, CPU_PECI_ADDR,
PECI_TEMP_CHANNEL4_DIMM0, post_access, 0, 0, SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT,
{ SENSOR_NUM_TEMP_DIMM_A3, sensor_dev_intel_peci, NONE, CPU_PECI_ADDR,
PECI_TEMP_CHANNEL3_DIMM0, post_access, 0, 0, SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT,
ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS, pre_intel_peci_dimm_read,
&dimm_pre_proc_args[3], NULL, NULL, NULL },
&dimm_pre_proc_args[2], NULL, NULL, NULL },
{ SENSOR_NUM_TEMP_DIMM_A6, sensor_dev_intel_peci, NONE, CPU_PECI_ADDR,
PECI_TEMP_CHANNEL6_DIMM0, post_access, 0, 0, SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT,
ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS, pre_intel_peci_dimm_read,
&dimm_pre_proc_args[4], NULL, NULL, NULL },
{ SENSOR_NUM_TEMP_DIMM_A7, sensor_dev_intel_peci, NONE, CPU_PECI_ADDR,
PECI_TEMP_CHANNEL7_DIMM0, post_access, 0, 0, SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT,
ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS, pre_intel_peci_dimm_read,
&dimm_pre_proc_args[5], NULL, NULL, NULL },

// adc voltage
{ SENSOR_NUM_VOL_STBY12V, sensor_dev_ast_adc, ADC_PORT0, NONE, NONE, stby_access, 667, 100,
Expand Down Expand Up @@ -213,18 +213,18 @@ sensor_cfg plat_sensor_config[] = {
SENSOR_INIT_STATUS, NULL, NULL, NULL, NULL, NULL },

// DIMM PMIC power
{ SENSOR_NUM_PWR_DIMMA0_PMIC, sensor_dev_pmic, I2C_BUS3, PCH_ADDR, NONE, me_access, 0, 0,
SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT, ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS,
NULL, NULL, NULL, NULL, &pmic_init_args[0] },
{ SENSOR_NUM_PWR_DIMMA2_PMIC, sensor_dev_pmic, I2C_BUS3, PCH_ADDR, NONE, me_access, 0, 0,
SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT, ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS,
NULL, NULL, NULL, NULL, &pmic_init_args[1] },
{ SENSOR_NUM_PWR_DIMMA4_PMIC, sensor_dev_pmic, I2C_BUS3, PCH_ADDR, NONE, me_access, 0, 0,
{ SENSOR_NUM_PWR_DIMMA3_PMIC, sensor_dev_pmic, I2C_BUS3, PCH_ADDR, NONE, me_access, 0, 0,
SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT, ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS,
NULL, NULL, NULL, NULL, &pmic_init_args[3] },
NULL, NULL, NULL, NULL, &pmic_init_args[2] },
{ SENSOR_NUM_PWR_DIMMA6_PMIC, sensor_dev_pmic, I2C_BUS3, PCH_ADDR, NONE, me_access, 0, 0,
SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT, ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS,
NULL, NULL, NULL, NULL, &pmic_init_args[4] },
{ SENSOR_NUM_PWR_DIMMA7_PMIC, sensor_dev_pmic, I2C_BUS3, PCH_ADDR, NONE, me_access, 0, 0,
SAMPLE_COUNT_DEFAULT, POLL_TIME_DEFAULT, ENABLE_SENSOR_POLLING, 0, SENSOR_INIT_STATUS,
NULL, NULL, NULL, NULL, &pmic_init_args[5] },
};

sensor_cfg mp5990_sensor_config_table[] = {
Expand Down
24 changes: 12 additions & 12 deletions meta-facebook/gc2-es/src/platform/plat_sensor_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
#define SENSOR_NUM_TEMP_TMP75_FIO 0x03
#define SENSOR_NUM_TEMP_PCH 0x04
#define SENSOR_NUM_TEMP_CPU 0x05
#define SENSOR_NUM_TEMP_DIMM_A0 0x06
#define SENSOR_NUM_TEMP_DIMM_A2 0x07
#define SENSOR_NUM_TEMP_DIMM_A3 0x09
#define SENSOR_NUM_TEMP_DIMM_A4 0x0A
#define SENSOR_NUM_TEMP_DIMM_A6 0x0B
#define SENSOR_NUM_TEMP_DIMM_A7 0x0C
//#define SENSOR_NUM_TEMP_DIMM_A0 0x06
#define SENSOR_NUM_TEMP_DIMM_A2 0x06
#define SENSOR_NUM_TEMP_DIMM_A3 0x07
//#define SENSOR_NUM_TEMP_DIMM_A4 0x0A
#define SENSOR_NUM_TEMP_DIMM_A6 0x0A
#define SENSOR_NUM_TEMP_DIMM_A7 0x0B
#define SENSOR_NUM_TEMP_SSD0 0x0D
#define SENSOR_NUM_TEMP_HSC 0x0E
#define SENSOR_NUM_TEMP_CPU_MARGIN 0x14
Expand Down Expand Up @@ -111,12 +111,12 @@
#define SENSOR_NUM_PWR_PVCCFA_EHV 0x3D
#define SENSOR_NUM_PWR_PVCCD_HV 0x3E
#define SENSOR_NUM_PWR_PVCCINFAON 0x3F
#define SENSOR_NUM_PWR_DIMMA0_PMIC 0x40
#define SENSOR_NUM_PWR_DIMMA2_PMIC 0x41
//#define SENSOR_NUM_PWR_DIMMA3_PMIC 0x36
#define SENSOR_NUM_PWR_DIMMA4_PMIC 0x42
#define SENSOR_NUM_PWR_DIMMA6_PMIC 0x43
#define SENSOR_NUM_PWR_DIMMA7_PMIC 0x47
//#define SENSOR_NUM_PWR_DIMMA0_PMIC 0x40
#define SENSOR_NUM_PWR_DIMMA2_PMIC 0x40
#define SENSOR_NUM_PWR_DIMMA3_PMIC 0x41
//#define SENSOR_NUM_PWR_DIMMA4_PMIC 0x41
#define SENSOR_NUM_PWR_DIMMA6_PMIC 0x42
#define SENSOR_NUM_PWR_DIMMA7_PMIC 0x43

#define SENSOR_NUM_SYSTEM_STATUS 0x10
#define SENSOR_NUM_POWER_ERROR 0x56
Expand Down