Skip to content

minerva-ag: Support delta UBC 2nd addr #2601

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
Victor-Jhong wants to merge 1 commit into from
Closed

minerva-ag: Support delta UBC 2nd addr #2601

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
52 changes: 52 additions & 0 deletions meta-facebook/minerva-ag/src/platform/plat_pldm_sensor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "plat_gpio.h"
#include "emc1413.h"
#include "plat_event.h"
#include "hal_i2c.h"

LOG_MODULE_REGISTER(plat_pldm_sensor);

Expand All @@ -37,6 +38,7 @@ static bool plat_sensor_ubc_polling_enable_flag = true;
static bool plat_sensor_temp_polling_enable_flag = true;
static bool plat_sensor_vr_polling_enable_flag = true;

void plat_pldm_sensor_change_ubc_addr();
void plat_pldm_sensor_change_ubc_dev();
void plat_pldm_sensor_change_ubc_init_args();
void plat_pldm_sensor_change_vr_dev();
Expand Down Expand Up @@ -9200,6 +9202,7 @@ pldm_sensor_info *plat_pldm_sensor_load(int thread_id)
{
switch (thread_id) {
case UBC_SENSOR_THREAD_ID:
plat_pldm_sensor_change_ubc_addr();
plat_pldm_sensor_change_ubc_dev();
plat_pldm_sensor_change_ubc_init_args();
return plat_pldm_sensor_ubc_table;
Expand Down Expand Up @@ -9797,6 +9800,55 @@ void plat_pldm_sensor_change_temp_addr()
}
}

bool plat_check_ubc1_addr()
{
I2C_MSG i2c_msg = { 0 };
uint8_t retry = 5;
i2c_msg.bus = I2C_BUS1;
i2c_msg.target_addr = UBC1_ADDR;
i2c_msg.tx_len = 1;
i2c_msg.rx_len = 1;
i2c_msg.data[0] = 0x00;

if (i2c_master_read(&i2c_msg, retry)) {
// UBC1_2ND_ADDR if UBC1_ADDR read fail
LOG_INF("UBC1 ADDR 0x%02X read fail, change to use 0x%02X for UBC1", UBC1_ADDR,
UBC1_2ND_ADDR);
return false;
}

return true;
}

void plat_pldm_sensor_change_ubc_addr()
{
uint8_t ubc_type = get_ubc_type();

if (ubc_type == UBC_UNKNOWN) {
LOG_ERR("Unable to check the UBC ADDR due to its unknown status.");
return;
}

if (ubc_type == UBC_DELTA_S54SS4P180PMDCF) {
LOG_INF("Check ubc addr for UBC_DELTA_S54SS4P180PMDCF");
if (plat_check_ubc1_addr() == false) {
for (int index = 0;
index < plat_pldm_sensor_get_sensor_count(UBC_SENSOR_THREAD_ID);
index++) {
if ((plat_pldm_sensor_ubc_table[index].pldm_sensor_cfg.target_addr ==
UBC1_ADDR)) {
plat_pldm_sensor_ubc_table[index]
.pldm_sensor_cfg.target_addr = UBC1_2ND_ADDR;
LOG_INF("UBC1 sensor %d ADDR change to 0x%02X for UBC_DELTA_S54SS4P180PMDCF",
plat_pldm_sensor_ubc_table[index]
.pldm_sensor_cfg.num,
UBC1_2ND_ADDR);
}
}
}
}
}

void plat_pldm_sensor_change_ubc_dev()
{
uint8_t ubc_type = get_ubc_type();
Expand Down
4 changes: 3 additions & 1 deletion meta-facebook/minerva-ag/src/platform/plat_pldm_sensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
#define ADDR_UNKNOWN (0xFF >> 1)

/* Define sensors address(7 bit) */
#define UBC1_ADDR (0x28 >> 1)
#define UBC1_ADDR (0x28 >> 1) // 0x14 (7 bit)
#define UBC1_2ND_ADDR (0x3E >> 1) // 0x1f (7 bit)
#define UBC2_ADDR (0x34 >> 1)

#define TOP_INLET_TEMP_ADDR (0x92 >> 1)
Expand Down Expand Up @@ -247,6 +248,7 @@ uint8_t plat_pldm_sensor_get_vr_dev(uint8_t *vr_dev);
void plat_pldm_sensor_change_vr_dev();
void plat_pldm_sensor_change_cpu_bus();
void plat_pldm_sensor_change_retimer_dev();
void plat_pldm_sensor_change_ubc_addr();
bool is_dc_access(uint8_t sensor_num);
void set_plat_sensor_polling_enable_flag(bool value);
void set_plat_sensor_ubc_polling_enable_flag(bool value);
Expand Down