Skip to content

minerva-ag: Modify sensor name with prefix CB #2195

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

Closed
wants to merge 1 commit into from
Closed

minerva-ag: Modify sensor name with prefix CB #2195

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
2 changes: 1 addition & 1 deletion meta-facebook/minerva-ag/src/platform/plat_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void init_tmp_type()
I2C_MSG i2c_msg = { 0 };
uint8_t retry = 5;
i2c_msg.bus = I2C_BUS_TMP;
i2c_msg.target_addr = ON_DIE_1_TEMP_TMP432_ADDR;
i2c_msg.target_addr = ASIC_DIE_ATH_SENSOR_0_TEMP_TMP432_ADDR;
i2c_msg.tx_len = 1;
i2c_msg.rx_len = 1;
i2c_msg.data[0] = 0xFE; //MFG ID REG
Expand Down
20 changes: 0 additions & 20 deletions meta-facebook/minerva-ag/src/platform/plat_class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,6 @@
#ifndef PLAT_CLASS_H
#define PLAT_CLASS_H

enum GT_FIRMWARE_COMPONENT {
GT_COMPNT_VR0,
GT_COMPNT_VR1,
GT_COMPNT_BIC,
GT_COMPNT_PEX0,
GT_COMPNT_PEX1,
GT_COMPNT_PEX2,
GT_COMPNT_PEX3,
GT_COMPNT_CPLD,
GT_COMPNT_NIC0,
GT_COMPNT_NIC1,
GT_COMPNT_NIC2,
GT_COMPNT_NIC3,
GT_COMPNT_NIC4,
GT_COMPNT_NIC5,
GT_COMPNT_NIC6,
GT_COMPNT_NIC7,
GT_COMPNT_MAX,
};

typedef enum {
DELTA_UBC_AND_MPS_VR,
DELTA_UBC_AND_RNS_VR,
Expand Down
2 changes: 1 addition & 1 deletion meta-facebook/minerva-ag/src/platform/plat_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#define EEPROM_WRITE_SIZE 0x80

#define MAX_AUX_SENSOR_NAME_LEN 42
#define MAX_AUX_SENSOR_NAME_LEN 50

#define ENABLE_U50SU4P180PMDAFC
#define ENABLE_BMR313
Expand Down
138 changes: 69 additions & 69 deletions meta-facebook/minerva-ag/src/platform/plat_hook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
CHECK_NULL_ARG_WITH_RETURN(cfg, false);
ARG_UNUSED(args);

sensor_val *reading_val = (sensor_val *)reading;

Check failure on line 77 in meta-facebook/minerva-ag/src/platform/plat_hook.c

View workflow job for this annotation

GitHub Actions / Aggregate-Lint-Output 

[] reported by reviewdog 🐶
Variable 'reading_val' can be declared as pointer to const

Raw Output:
meta-facebook/minerva-ag/src/platform/plat_hook.c:77:14:Variable 'reading_val' can be declared as pointer to const

int sensor_reading = 0;
static int ubc1_current_mA;

if (cfg->num == SENSOR_NUM_UBC_1_P12V_CURR_A) {
if (cfg->num == UBC1_P12V_CURR_A) {
if (reading != NULL) {
if (reading_val->integer >= 0) {
sensor_reading =
Expand All @@ -95,7 +95,7 @@
}
}

if (cfg->num == SENSOR_NUM_UBC_2_P12V_CURR_A) {
if (cfg->num == UBC2_P12V_CURR_A) {
if (reading != NULL) {
if (reading_val->integer >= 0) {
sensor_reading =
Expand Down Expand Up @@ -162,12 +162,12 @@
};

temp_mapping_sensor temp_index_table[] = {
{ TEMP_INDEX_ON_DIE_1_2, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP" },
{ TEMP_INDEX_ON_DIE_3_4, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP" },
{ TEMP_INDEX_TOP_INLET, SENSOR_NUM_TOP_INLET_TEMP_C, "TOP_INLET_TEMP" },
{ TEMP_INDEX_BOT_INLET, SENSOR_NUM_BOT_INLET_TEMP_C, "BOT_INLET_TEMP" },
{ TEMP_INDEX_TOP_OUTLET, SENSOR_NUM_TOP_OUTLET_TEMP_C, "TOP_OUTLET_TEMP" },
{ TEMP_INDEX_BOT_OUTLET, SENSOR_NUM_BOT_OUTLET_TEMP_C, "BOT_OUTLET_TEMP" },
{ TEMP_INDEX_ON_DIE_1_2, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP" },
{ TEMP_INDEX_ON_DIE_3_4, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP" },
{ TEMP_INDEX_TOP_INLET, TOP_INLET_TEMP_C, "CB_TOP_INLET_TEMP" },
{ TEMP_INDEX_BOT_INLET, BOT_INLET_TEMP_C, "CB_BOT_INLET_TEMP" },
{ TEMP_INDEX_TOP_OUTLET, TOP_OUTLET_TEMP_C, "CB_TOP_OUTLET_TEMP" },
{ TEMP_INDEX_BOT_OUTLET, BOT_OUTLET_TEMP_C, "CB_BOT_OUTLET_TEMP" },
};

bool temp_sensor_rail_name_get(uint8_t rail, uint8_t **name)
Expand Down Expand Up @@ -241,7 +241,7 @@
return true;
}

bool post_vr_read(sensor_cfg *cfg, void *args, int *const reading)

Check failure on line 244 in meta-facebook/minerva-ag/src/platform/plat_hook.c

View workflow job for this annotation

GitHub Actions / Aggregate-Lint-Output 

[] reported by reviewdog 🐶
Parameter 'reading' can be declared as pointer to const

Raw Output:
meta-facebook/minerva-ag/src/platform/plat_hook.c:244:59:Parameter 'reading' can be declared as pointer to const
{
CHECK_NULL_ARG_WITH_RETURN(cfg, false);
CHECK_NULL_ARG_WITH_RETURN(args, false);
Expand Down Expand Up @@ -282,38 +282,38 @@

// clang-format off
temp_threshold_mapping_sensor temp_index_threshold_type_table[] = {
{ ON_DIE_1_2_LOCAL_HIGH_LIMIT, LOCAL_HIGH_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_LOCAL_HIGH_LIM" },
{ ON_DIE_1_2_LOCAL_LOW_LIMIT, LOCAL_LOW_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_LOCAL_LOW_LIM" },
{ ON_DIE_1_2_REMOTE_1_HIGH_LIMIT, REMOTE_1_HIGH_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_REMOTE1_HIGH_LIM" },
{ ON_DIE_1_2_REMOTE_1_LOW_LIMIT, REMOTE_1_LOW_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_REMOTE1_LOW_LIM" },
{ ON_DIE_1_2_REMOTE_2_HIGH_LIMIT, REMOTE_2_HIGH_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_REMOTE2_HIGH_LIM" },
{ ON_DIE_1_2_REMOTE_2_LOW_LIMIT, REMOTE_2_LOW_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_REMOTE2_LOW_LIM" },
{ ON_DIE_1_2_LOCAL_THERM_LIMIT, LOCAL_THERM_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_LOCAL_LIM" },
{ ON_DIE_1_2_REMOTE_1_THERM_LIMIT, REMOTE_1_THERM_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_REMOTE1_LIM" },
{ ON_DIE_1_2_REMOTE_2_THERM_LIMIT, REMOTE_2_THERM_LIMIT, SENSOR_NUM_ON_DIE_1_TEMP_C, "ON_DIE_1_TEMP_REMOTE2_LIM" },


{ ON_DIE_3_4_LOCAL_HIGH_LIMIT, LOCAL_HIGH_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_LOCAL_HIGH_LIM" },
{ ON_DIE_3_4_LOCAL_LOW_LIMIT, LOCAL_LOW_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_LOCAL_LOW_LIM" },
{ ON_DIE_3_4_REMOTE_1_HIGH_LIMIT, REMOTE_1_HIGH_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_REMOTE1_HIGH_LIM" },
{ ON_DIE_3_4_REMOTE_1_LOW_LIMIT, REMOTE_1_LOW_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_REMOTE1_LOW_LIM" },
{ ON_DIE_3_4_REMOTE_2_HIGH_LIMIT, REMOTE_2_HIGH_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_REMOTE2_HIGH_LIM" },
{ ON_DIE_3_4_REMOTE_2_LOW_LIMIT, REMOTE_2_LOW_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_REMOTE2_LOW_LIM" },
{ ON_DIE_3_4_LOCAL_THERM_LIMIT, LOCAL_THERM_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_LOCAL_LIM" },
{ ON_DIE_3_4_REMOTE_1_THERM_LIMIT, REMOTE_1_THERM_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_REMOTE1_LIM" },
{ ON_DIE_3_4_REMOTE_2_THERM_LIMIT, REMOTE_2_THERM_LIMIT, SENSOR_NUM_ON_DIE_3_TEMP_C, "ON_DIE_2_TEMP_REMOTE2_LIM" },
{ ON_DIE_1_2_LOCAL_HIGH_LIMIT, LOCAL_HIGH_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_LOCAL_HIGH_LIM" },
{ ON_DIE_1_2_LOCAL_LOW_LIMIT, LOCAL_LOW_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_LOCAL_LOW_LIM" },
{ ON_DIE_1_2_REMOTE_1_HIGH_LIMIT, REMOTE_1_HIGH_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_REMOTE1_HIGH_LIM" },
{ ON_DIE_1_2_REMOTE_1_LOW_LIMIT, REMOTE_1_LOW_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_REMOTE1_LOW_LIM" },
{ ON_DIE_1_2_REMOTE_2_HIGH_LIMIT, REMOTE_2_HIGH_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_REMOTE2_HIGH_LIM" },
{ ON_DIE_1_2_REMOTE_2_LOW_LIMIT, REMOTE_2_LOW_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_REMOTE2_LOW_LIM" },
{ ON_DIE_1_2_LOCAL_THERM_LIMIT, LOCAL_THERM_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_LOCAL_LIM" },
{ ON_DIE_1_2_REMOTE_1_THERM_LIMIT, REMOTE_1_THERM_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_REMOTE1_LIM" },
{ ON_DIE_1_2_REMOTE_2_THERM_LIMIT, REMOTE_2_THERM_LIMIT, ASIC_DIE_ATH_SENSOR_0_TEMP_C, "CB_ASIC_DIE_ATH_SENSOR_0_TEMP_REMOTE2_LIM" },


{ ON_DIE_3_4_LOCAL_HIGH_LIMIT, LOCAL_HIGH_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_LOCAL_HIGH_LIM" },
{ ON_DIE_3_4_LOCAL_LOW_LIMIT, LOCAL_LOW_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_LOCAL_LOW_LIM" },
{ ON_DIE_3_4_REMOTE_1_HIGH_LIMIT, REMOTE_1_HIGH_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_REMOTE1_HIGH_LIM" },
{ ON_DIE_3_4_REMOTE_1_LOW_LIMIT, REMOTE_1_LOW_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_REMOTE1_LOW_LIM" },
{ ON_DIE_3_4_REMOTE_2_HIGH_LIMIT, REMOTE_2_HIGH_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_REMOTE2_HIGH_LIM" },
{ ON_DIE_3_4_REMOTE_2_LOW_LIMIT, REMOTE_2_LOW_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_REMOTE2_LOW_LIM" },
{ ON_DIE_3_4_LOCAL_THERM_LIMIT, LOCAL_THERM_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_LOCAL_LIM" },
{ ON_DIE_3_4_REMOTE_1_THERM_LIMIT, REMOTE_1_THERM_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_REMOTE1_LIM" },
{ ON_DIE_3_4_REMOTE_2_THERM_LIMIT, REMOTE_2_THERM_LIMIT, ASIC_DIE_N_OWL_TEMP_C, "CB_ASIC_DIE_N_OWL_TEMP_REMOTE2_LIM" },

{ TOP_INLET_LOW_LIMIT, LOCAL_LOW_LIMIT, SENSOR_NUM_TOP_INLET_TEMP_C, "TOP_INLET_TEMP_LOW_LIM" },
{ TOP_INLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, SENSOR_NUM_TOP_INLET_TEMP_C, "TOP_INLET_TEMP_HIGH_LIM" },
{ TOP_INLET_LOW_LIMIT, LOCAL_LOW_LIMIT, TOP_INLET_TEMP_C, "CB_TOP_INLET_TEMP_LOW_LIM" },
{ TOP_INLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, TOP_INLET_TEMP_C, "CB_TOP_INLET_TEMP_HIGH_LIM" },

{ TOP_OUTLET_LOW_LIMIT, LOCAL_LOW_LIMIT, SENSOR_NUM_TOP_OUTLET_TEMP_C, "TOP_OUTLET_TEMP_LOW_LIM" },
{ TOP_OUTLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, SENSOR_NUM_TOP_OUTLET_TEMP_C, "TOP_OUTLET_TEMP_HIGH_LIM" },
{ TOP_OUTLET_LOW_LIMIT, LOCAL_LOW_LIMIT, TOP_OUTLET_TEMP_C, "CB_TOP_OUTLET_TEMP_LOW_LIM" },
{ TOP_OUTLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, TOP_OUTLET_TEMP_C, "CB_TOP_OUTLET_TEMP_HIGH_LIM" },

{ BOT_INLET_LOW_LIMIT, LOCAL_LOW_LIMIT, SENSOR_NUM_BOT_OUTLET_TEMP_C, "BOT_INLET_TEMP_LOW_LIM" },
{ BOT_INLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, SENSOR_NUM_BOT_INLET_TEMP_C, "BOT_INLET_TEMP_HIGH_LIM" },
{ BOT_INLET_LOW_LIMIT, LOCAL_LOW_LIMIT, BOT_INLET_TEMP_C, "CB_BOT_INLET_TEMP_LOW_LIM" },
{ BOT_INLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, BOT_INLET_TEMP_C, "CB_BOT_INLET_TEMP_HIGH_LIM" },

{ BOT_OUTLET_LOW_LIMIT, LOCAL_LOW_LIMIT, SENSOR_NUM_BOT_OUTLET_TEMP_C, "BOT_OUTLET_TEMP_LOW_LIM" },
{ BOT_OUTLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, SENSOR_NUM_BOT_OUTLET_TEMP_C, "BOT_OUTLET_TEMP_HIGH_LIM" },
{ BOT_OUTLET_LOW_LIMIT, LOCAL_LOW_LIMIT, BOT_OUTLET_TEMP_C, "CB_BOT_OUTLET_TEMP_LOW_LIM" },
{ BOT_OUTLET_HIGH_LIMIT, LOCAL_HIGH_LIMIT, BOT_OUTLET_TEMP_C, "CB_BOT_OUTLET_TEMP_HIGH_LIM" },
};
// clang-format on

Expand Down Expand Up @@ -345,44 +345,44 @@

/* the order is following enum VR_RAIL_E */
vr_mapping_sensor vr_rail_table[] = {
{ VR_RAIL_E_OSFP_P3V3, SENSOR_NUM_OSFP_P3V3_VOLT_V, "AEGIS_P3V3", 0xffffffff },
{ VR_RAIL_E_P0V85, SENSOR_NUM_CPU_P0V85_PVDD_VOLT_V, "AEGIS_P0V85_PVDD", 0xffffffff },
{ VR_RAIL_E_P0V75_PVDD_CH_N, SENSOR_NUM_CPU_P0V75_PVDD_CH_N_VOLT_V, "AEGIS_P0V75_PVDD_CH_N",
{ VR_RAIL_E_P3V3, VR_P3V3_VOLT_V, "CB_VR_ASIC_P3V3", 0xffffffff },
{ VR_RAIL_E_P0V85_PVDD, VR_ASIC_P0V85_PVDD_VOLT_V, "CB_VR_ASIC_P0V85_PVDD", 0xffffffff },
{ VR_RAIL_E_P0V75_PVDD_CH_N, VR_ASIC_P0V75_PVDD_CH_N_VOLT_V, "CB_VR_ASIC_P0V75_PVDD_CH_N",
0xffffffff },
{ VR_RAIL_E_P0V75_MAX_PHY_N, SENSOR_NUM_CPU_P0V75_MAX_PHY_N_VOLT_V, "AEGIS_P0V75_MAX_PHY_N",
{ VR_RAIL_E_P0V75_MAX_PHY_N, VR_ASIC_P0V75_MAX_PHY_N_VOLT_V, "CB_VR_ASIC_P0V75_MAX_PHY_N",
0xffffffff },
{ VR_RAIL_E_P0V75_PVDD_CH_S, SENSOR_NUM_CPU_P0V75_PVDD_CH_S_VOLT_V, "AEGIS_P0V75_PVDD_CH_S",
{ VR_RAIL_E_P0V75_PVDD_CH_S, VR_ASIC_P0V75_PVDD_CH_S_VOLT_V, "CB_VR_ASIC_P0V75_PVDD_CH_S",
0xffffffff },
{ VR_RAIL_E_P0V75_MAX_PHY_S, SENSOR_NUM_CPU_P0V75_MAX_PHY_S_VOLT_V, "AEGIS_P0V75_MAX_PHY_S",
{ VR_RAIL_E_P0V75_MAX_PHY_S, VR_ASIC_P0V75_MAX_PHY_S_VOLT_V, "CB_VR_ASIC_P0V75_MAX_PHY_S",
0xffffffff },
{ VR_RAIL_E_P0V75_TRVDD_ZONEA, SENSOR_NUM_CPU_P0V75_TRVDD_ZONEA_VOLT_V,
"AEGIS_P0V75_TRVDD_ZONEA", 0xffffffff },
{ VR_RAIL_E_P1V8_VPP_HBM0_2_4, SENSOR_NUM_CPU_P1V8_VPP_HBM0_2_4_VOLT_V,
"AEGIS_VPP_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P0V75_TRVDD_ZONEB, SENSOR_NUM_CPU_P0V75_TRVDD_ZONEB_VOLT_V,
"AEGIS_P0V75_TRVDD_ZONEB", 0xffffffff },
{ VR_RAIL_E_P0V4_VDDQL_HBM0_2_4, SENSOR_NUM_CPU_P0V4_VDDQL_HBM0_2_4_VOLT_V,
"AEGIS_VDDQL_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P1V1_VDDC_HBM0_2_4, SENSOR_NUM_CPU_P1V1_VDDC_HBM0_2_4_VOLT_V,
"AEGIS_P1V1_VDDC_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P0V75_VDDPHY_HBM0_2_4, SENSOR_NUM_CPU_P0V75_VDDPHY_HBM0_2_4_VOLT_V,
"AEGIS_P0V75_VDDPHY_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P0V9_TRVDD_ZONEA, SENSOR_NUM_CPU_P0V9_TRVDD_ZONEA_VOLT_V,
"AEGIS_P0V9_TRVDD_ZONEA", 0xffffffff },
{ VR_RAIL_E_P1V8_VPP_HBM1_3_5, SENSOR_NUM_CPU_P1V8_VPP_HBM1_3_5_VOLT_V,
"AEGIS_VPP_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P0V9_TRVDD_ZONEB, SENSOR_NUM_CPU_P0V9_TRVDD_ZONEB_VOLT_V,
"AEGIS_P0V9_TRVDD_ZONEB", 0xffffffff },
{ VR_RAIL_E_P0V4_VDDQL_HBM1_3_5, SENSOR_NUM_CPU_P0V4_VDDQL_HBM1_3_5_VOLT_V,
"AEGIS_VDDQL_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P1V1_VDDC_HBM1_3_5, SENSOR_NUM_CPU_P1V1_VDDC_HBM1_3_5_VOLT_V,
"AEGIS_P1V1_VDDC_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P0V75_VDDPHY_HBM1_3_5, SENSOR_NUM_CPU_P0V75_VDDPHY_HBM1_3_5_VOLT_V,
"AEGIS_P0V75_VDDPHY_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P0V8_VDDA_PCIE, SENSOR_NUM_CPU_P0V8_VDDA_PCIE_VOLT_V, "AEGIS_VDDA_PCIE",
0xffffffff },
{ VR_RAIL_E_P1V2_VDDHTX_PCIE, SENSOR_NUM_CPU_P1V2_VDDHTX_PCIE_VOLT_V, "AEGIS_VDDHTX_PCIE",
{ VR_RAIL_E_P0V75_TRVDD_ZONEA, VR_ASIC_P0V75_TRVDD_ZONEA_VOLT_V,
"CB_VR_ASIC_P0V75_TRVDD_ZONEA", 0xffffffff },
{ VR_RAIL_E_P1V8_VPP_HBM0_HBM2_HBM4, VR_ASIC_P1V8_VPP_HBM0_HBM2_HBM4_VOLT_V,
"CB_VR_ASIC_P1V8_VPP_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P0V75_TRVDD_ZONEB, VR_ASIC_P0V75_TRVDD_ZONEB_VOLT_V,
"CB_VR_ASIC_P0V75_TRVDD_ZONEB", 0xffffffff },
{ VR_RAIL_E_P0V4_VDDQL_HBM0_HBM2_HBM4, VR_ASIC_P0V4_VDDQL_HBM0_HBM2_HBM4_VOLT_V,
"CB_VR_ASIC_P0V4_VDDQL_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P1V1_VDDC_HBM0_HBM2_HBM4, VR_ASIC_P1V1_VDDC_HBM0_HBM2_HBM4_VOLT_V,
"CB_VR_ASIC_P1V1_VDDC_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P0V75_VDDPHY_HBM0_HBM2_HBM4, VR_ASIC_P0V75_VDDPHY_HBM0_HBM2_HBM4_VOLT_V,
"CB_VR_ASIC_P0V75_VDDPHY_HBM0_HBM2_HBM4", 0xffffffff },
{ VR_RAIL_E_P0V9_TRVDD_ZONEA, VR_ASIC_P0V9_TRVDD_ZONEA_VOLT_V,
"CB_VR_ASIC_P0V9_TRVDD_ZONEA", 0xffffffff },
{ VR_RAIL_E_P1V8_VPP_HBM1_HBM3_HBM5, VR_ASIC_P1V8_VPP_HBM1_HBM3_HBM5_VOLT_V,
"CB_VR_ASIC_P1V8_VPP_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P0V9_TRVDD_ZONEB, VR_ASIC_P0V9_TRVDD_ZONEB_VOLT_V,
"CB_VR_ASIC_P0V9_TRVDD_ZONEB", 0xffffffff },
{ VR_RAIL_E_P0V4_VDDQL_HBM1_HBM3_HBM5, VR_ASIC_P0V4_VDDQL_HBM1_HBM3_HBM5_VOLT_V,
"CB_VR_ASIC_P0V4_VDDQL_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P1V1_VDDC_HBM1_HBM3_HBM5, VR_ASIC_P1V1_VDDC_HBM1_HBM3_HBM5_VOLT_V,
"CB_VR_ASIC_P1V1_VDDC_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P0V75_VDDPHY_HBM1_HBM3_HBM5, VR_ASIC_P0V75_VDDPHY_HBM1_HBM3_HBM5_VOLT_V,
"CB_VR_ASIC_P0V75_VDDPHY_HBM1_HBM3_HBM5", 0xffffffff },
{ VR_RAIL_E_P0V8_VDDA_PCIE, VR_ASIC_P0V8_VDDA_PCIE_VOLT_V, "CB_VR_ASIC_P0V8_VDDA_PCIE",
0xffffffff },
{ VR_RAIL_E_P1V2_VDDHTX_PCIE, VR_ASIC_P1V2_VDDHTX_PCIE_VOLT_V,
"CB_VR_ASIC_P1V2_VDDHTX_PCIE", 0xffffffff },
};

vr_mapping_status vr_status_table[] = {
Expand Down
24 changes: 12 additions & 12 deletions meta-facebook/minerva-ag/src/platform/plat_hook.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "plat_pldm_sensor.h"

enum VR_INDEX_E {
VR_INDEX_E_OSFP_P3V3 = 0,
VR_INDEX_E_P3V3 = 0,
VR_INDEX_E_P0V85,
VR_INDEX_E_P0V75_CH_N,
VR_INDEX_E_P0V75_CH_S,
Expand All @@ -35,29 +35,29 @@ enum VR_INDEX_E {
VR_INDEX_E_P0V9_TRVDD_ZONEA,
VR_INDEX_E_P0V9_TRVDD_ZONEB,
VR_INDEX_E_P1V1_VDDC_HBM1_HBM3_HBM5,
VR_INDEX_E_VDDA_PCIE,
VR_INDEX_E_P0V8_VDDA_PCIE,
VR_INDEX_MAX,
};

enum VR_RAIL_E {
VR_RAIL_E_OSFP_P3V3 = 0,
VR_RAIL_E_P0V85,
VR_RAIL_E_P3V3 = 0,
VR_RAIL_E_P0V85_PVDD,
VR_RAIL_E_P0V75_PVDD_CH_N,
VR_RAIL_E_P0V75_MAX_PHY_N,
VR_RAIL_E_P0V75_PVDD_CH_S,
VR_RAIL_E_P0V75_MAX_PHY_S,
VR_RAIL_E_P0V75_TRVDD_ZONEA,
VR_RAIL_E_P1V8_VPP_HBM0_2_4,
VR_RAIL_E_P1V8_VPP_HBM0_HBM2_HBM4,
VR_RAIL_E_P0V75_TRVDD_ZONEB,
VR_RAIL_E_P0V4_VDDQL_HBM0_2_4,
VR_RAIL_E_P1V1_VDDC_HBM0_2_4,
VR_RAIL_E_P0V75_VDDPHY_HBM0_2_4,
VR_RAIL_E_P0V4_VDDQL_HBM0_HBM2_HBM4,
VR_RAIL_E_P1V1_VDDC_HBM0_HBM2_HBM4,
VR_RAIL_E_P0V75_VDDPHY_HBM0_HBM2_HBM4,
VR_RAIL_E_P0V9_TRVDD_ZONEA,
VR_RAIL_E_P1V8_VPP_HBM1_3_5,
VR_RAIL_E_P1V8_VPP_HBM1_HBM3_HBM5,
VR_RAIL_E_P0V9_TRVDD_ZONEB,
VR_RAIL_E_P0V4_VDDQL_HBM1_3_5,
VR_RAIL_E_P1V1_VDDC_HBM1_3_5,
VR_RAIL_E_P0V75_VDDPHY_HBM1_3_5,
VR_RAIL_E_P0V4_VDDQL_HBM1_HBM3_HBM5,
VR_RAIL_E_P1V1_VDDC_HBM1_HBM3_HBM5,
VR_RAIL_E_P0V75_VDDPHY_HBM1_HBM3_HBM5,
VR_RAIL_E_P0V8_VDDA_PCIE,
VR_RAIL_E_P1V2_VDDHTX_PCIE,
VR_RAIL_E_MAX,
Expand Down
31 changes: 15 additions & 16 deletions meta-facebook/minerva-ag/src/platform/plat_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,21 @@
} vr_ubc_device_table;

vr_ubc_device_table vr_device_table[] = {
{ UBC_1, SENSOR_NUM_UBC_1_TEMP_C },
{ UBC_2, SENSOR_NUM_UBC_2_TEMP_C },
{ VR_1, SENSOR_NUM_OSFP_P3V3_TEMP_C },
{ VR_2, SENSOR_NUM_CPU_P0V85_PVDD_TEMP_C },
{ VR_3, SENSOR_NUM_CPU_P0V75_PVDD_CH_N_TEMP_C, SENSOR_NUM_CPU_P0V75_MAX_PHY_N_TEMP_C },
{ VR_4, SENSOR_NUM_CPU_P0V75_PVDD_CH_S_TEMP_C, SENSOR_NUM_CPU_P0V75_MAX_PHY_S_TEMP_C },
{ VR_5, SENSOR_NUM_CPU_P0V75_TRVDD_ZONEA_TEMP_C, SENSOR_NUM_CPU_P1V8_VPP_HBM0_2_4_TEMP_C },
{ VR_6, SENSOR_NUM_CPU_P0V75_TRVDD_ZONEB_TEMP_C,
SENSOR_NUM_CPU_P0V4_VDDQL_HBM0_2_4_TEMP_C },
{ VR_7, SENSOR_NUM_CPU_P1V1_VDDC_HBM0_2_4_TEMP_C,
SENSOR_NUM_CPU_P0V75_VDDPHY_HBM0_2_4_TEMP_C },
{ VR_8, SENSOR_NUM_CPU_P0V9_TRVDD_ZONEA_TEMP_C, SENSOR_NUM_CPU_P1V8_VPP_HBM1_3_5_TEMP_C },
{ VR_9, SENSOR_NUM_CPU_P0V9_TRVDD_ZONEB_TEMP_C, SENSOR_NUM_CPU_P0V4_VDDQL_HBM1_3_5_TEMP_C },
{ VR_10, SENSOR_NUM_CPU_P1V1_VDDC_HBM1_3_5_TEMP_C,
SENSOR_NUM_CPU_P0V75_VDDPHY_HBM1_3_5_TEMP_C },
{ VR_11, SENSOR_NUM_CPU_P0V8_VDDA_PCIE_TEMP_C, SENSOR_NUM_CPU_P1V2_VDDHTX_PCIE_TEMP_C },
{ UBC_1, UBC1_P12V_TEMP_C },
{ UBC_2, UBC2_P12V_TEMP_C },
{ VR_1, VR_P3V3_TEMP_C },
{ VR_2, VR_ASIC_P0V85_PVDD_TEMP_C },
{ VR_3, VR_ASIC_P0V75_PVDD_CH_N_TEMP_C, VR_ASIC_P0V75_MAX_PHY_N_TEMP_C },
{ VR_4, VR_ASIC_P0V75_PVDD_CH_S_TEMP_C, VR_ASIC_P0V75_MAX_PHY_S_TEMP_C },
{ VR_5, VR_ASIC_P0V75_TRVDD_ZONEA_TEMP_C, VR_ASIC_P1V8_VPP_HBM0_HBM2_HBM4_TEMP_C },
{ VR_6, VR_ASIC_P0V75_TRVDD_ZONEB_TEMP_C, VR_ASIC_P0V4_VDDQL_HBM0_HBM2_HBM4_TEMP_C },
{ VR_7, VR_ASIC_P1V1_VDDC_HBM0_HBM2_HBM4_TEMP_C,
VR_ASIC_P0V75_VDDPHY_HBM0_HBM2_HBM4_TEMP_C },
{ VR_8, VR_ASIC_P0V9_TRVDD_ZONEA_TEMP_C, VR_ASIC_P1V8_VPP_HBM1_HBM3_HBM5_TEMP_C },
{ VR_9, VR_ASIC_P0V9_TRVDD_ZONEB_TEMP_C, VR_ASIC_P0V4_VDDQL_HBM1_HBM3_HBM5_TEMP_C },
{ VR_10, VR_ASIC_P1V1_VDDC_HBM1_HBM3_HBM5_TEMP_C,
VR_ASIC_P0V75_VDDPHY_HBM1_HBM3_HBM5_TEMP_C },
{ VR_11, VR_ASIC_P0V8_VDDA_PCIE_TEMP_C, VR_ASIC_P1V2_VDDHTX_PCIE_TEMP_C },
};

typedef struct _vr_error_callback_info_ {
Expand Down Expand Up @@ -138,7 +137,7 @@

memcpy(log_data, &log_entry, cmd_size);

plat_err_log_mapping *p = (plat_err_log_mapping *)log_data;

Check failure on line 140 in meta-facebook/minerva-ag/src/platform/plat_log.c

View workflow job for this annotation

GitHub Actions / Aggregate-Lint-Output 

[] reported by reviewdog 🐶
Variable 'p' can be declared as pointer to const

Raw Output:
meta-facebook/minerva-ag/src/platform/plat_log.c:140:24:Variable 'p' can be declared as pointer to const

LOG_HEXDUMP_DBG(log_data, cmd_size, "plat_log_read_before");

Expand Down
Loading
Loading