i2c: npcx: Improve error logging

Add the device name to the error logs so we can differentiate which
device caused the error and not just which port.

Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress 2025-05-20 15:13:27 -06:00 committed by Benjamin Cabé
parent 27f6bc861c
commit 270c98bc23

View File

@ -558,8 +558,7 @@ static int i2c_ctrl_recovery(const struct device *dev)
ret = i2c_ctrl_wait_stop_completed(dev, I2C_MAX_TIMEOUT);
inst->SMBCST |= BIT(NPCX_SMBCST_BB);
if (ret != 0) {
LOG_ERR("Abort i2c port%02x fail! Bus might be stalled.",
data->port);
LOG_ERR("Abort i2c %s::%02x fail! Bus might be stalled.", dev->name, data->port);
}
/*
@ -571,8 +570,7 @@ static int i2c_ctrl_recovery(const struct device *dev)
inst->SMBCTL2 &= ~BIT(NPCX_SMBCTL2_ENABLE);
ret = i2c_ctrl_wait_idle_completed(dev, I2C_MAX_TIMEOUT);
if (ret != 0) {
LOG_ERR("Reset i2c port%02x fail! Bus might be stalled.",
data->port);
LOG_ERR("Reset i2c %s::%02x fail! Bus might be stalled.", dev->name, data->port);
return -EIO;
}
@ -1014,7 +1012,7 @@ static void i2c_ctrl_isr(const struct device *dev)
/* Make sure slave doesn't hold bus by reading FIFO again */
tmp = i2c_ctrl_fifo_read(dev);
LOG_ERR("Bus error occurred on i2c port%02x!", data->port);
LOG_ERR("Bus error occurred on i2c %s::%02x!", dev->name, data->port);
data->oper_state = NPCX_I2C_ERROR_RECOVERY;
/* I/O error occurred */
@ -1438,7 +1436,7 @@ int npcx_i2c_ctrl_transfer(const struct device *i2c_dev, struct i2c_msg *msgs,
data->oper_state == NPCX_I2C_ERROR_RECOVERY) {
ret = npcx_i2c_ctrl_recover_bus(i2c_dev);
if (ret != 0) {
LOG_ERR("Recover Bus failed");
LOG_ERR("Recover Bus failed: %s::%d", i2c_dev->name, port);
goto out;
}
@ -1479,8 +1477,8 @@ int npcx_i2c_ctrl_transfer(const struct device *i2c_dev, struct i2c_msg *msgs,
if (data->trans_err == 0) {
data->oper_state = NPCX_I2C_IDLE;
} else {
LOG_ERR("STOP fail! bus is held on i2c port%02x!",
data->port);
LOG_ERR("STOP fail! bus is held on i2c %s::%02x!\n", i2c_dev->name,
data->port);
data->oper_state = NPCX_I2C_ERROR_RECOVERY;
}
}