GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/mediatek/i2c: Return negative values on error 

Following coreboot's convention, return negative error codes from
platform_i2c_transfer().

BUG=none
TEST=emerge-asurada coreboot
BRANCH=none

Change-Id: I955b9aae11e20d75fac414d15714330e364dad2f
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59539
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Yu-Ping Wu 2021-11-25 14:43:13 +08:00 committed by Felix Held
parent 8422740933
commit 20fe2ee502
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/soc/mediatek/common/i2c.c
View File

@ -106,10 +106,10 @@ static inline void mtk_i2c_dump_info(struct mt_i2c_regs *regs)
mtk_i2c_dump_more_info(regs); mtk_i2c_dump_more_info(regs);
} }
static uint32_t mtk_i2c_transfer(uint8_t bus, struct i2c_msg *seg, static int mtk_i2c_transfer(uint8_t bus, struct i2c_msg *seg,
enum i2c_modes mode) enum i2c_modes mode)
{ {
uint32_t ret_code = I2C_OK; int ret = I2C_OK;
uint16_t status; uint16_t status;
uint16_t dma_sync = 0; uint16_t dma_sync = 0;
uint32_t time_out_val = 0; uint32_t time_out_val = 0;
@ -245,23 +245,23 @@ static uint32_t mtk_i2c_transfer(uint8_t bus, struct i2c_msg *seg,
while (1) { while (1) {
status = read32(&regs->intr_stat); status = read32(&regs->intr_stat);
if (status & I2C_HS_NACKERR) { if (status & I2C_HS_NACKERR) {
ret_code = I2C_TRANSFER_FAIL_HS_NACKERR; ret = I2C_TRANSFER_FAIL_HS_NACKERR;
printk(BIOS_ERR, "[i2c%d] transfer NACK error\n", bus); printk(BIOS_ERR, "[i2c%d] transfer NACK error\n", bus);
mtk_i2c_dump_info(regs); mtk_i2c_dump_info(regs);
break; break;
} else if (status & I2C_ACKERR) { } else if (status & I2C_ACKERR) {
ret_code = I2C_TRANSFER_FAIL_ACKERR; ret = I2C_TRANSFER_FAIL_ACKERR;
printk(BIOS_ERR, "[i2c%d] transfer ACK error\n", bus); printk(BIOS_ERR, "[i2c%d] transfer ACK error\n", bus);
mtk_i2c_dump_info(regs); mtk_i2c_dump_info(regs);
break; break;
} else if (status & I2C_TRANSAC_COMP) { } else if (status & I2C_TRANSAC_COMP) {
ret_code = I2C_OK; ret = I2C_OK;
memcpy(read_buffer, _dma_coherent, read_len); memcpy(read_buffer, _dma_coherent, read_len);
break; break;
} }
if (stopwatch_expired(&sw)) { if (stopwatch_expired(&sw)) {
ret_code = I2C_TRANSFER_FAIL_TIMEOUT; ret = I2C_TRANSFER_FAIL_TIMEOUT;
printk(BIOS_ERR, "[i2c%d] transfer timeout:%d\n", bus, printk(BIOS_ERR, "[i2c%d] transfer timeout:%d\n", bus,
time_out_val); time_out_val);
mtk_i2c_dump_info(regs); mtk_i2c_dump_info(regs);
@ -279,7 +279,7 @@ static uint32_t mtk_i2c_transfer(uint8_t bus, struct i2c_msg *seg,
/* reset the i2c controller for next i2c transfer. */ /* reset the i2c controller for next i2c transfer. */
i2c_hw_reset(bus); i2c_hw_reset(bus);
return ret_code; return ret;
} }
static bool mtk_i2c_should_combine(struct i2c_msg *seg, int left_count) static bool mtk_i2c_should_combine(struct i2c_msg *seg, int left_count)
@ -301,7 +301,7 @@ static int mtk_i2c_max_step_cnt(uint32_t target_speed)
int platform_i2c_transfer(unsigned int bus, struct i2c_msg *segments, int platform_i2c_transfer(unsigned int bus, struct i2c_msg *segments,
int seg_count) int seg_count)
{ {
int ret = 0; int ret;
int i; int i;
int mode; int mode;
@ -314,15 +314,14 @@ int platform_i2c_transfer(unsigned int bus, struct i2c_msg *segments,
} }
ret = mtk_i2c_transfer(bus, &segments[i], mode); ret = mtk_i2c_transfer(bus, &segments[i], mode);
if (ret < 0)
if (ret) return ret;
break;
if (mode == I2C_WRITE_READ_MODE) if (mode == I2C_WRITE_READ_MODE)
i++; i++;
} }
return ret; return 0;
} }
/* /*

12
src/soc/mediatek/common/include/soc/i2c_common.h
View File

@ -88,12 +88,12 @@ enum {
/* I2C Status Code */ /* I2C Status Code */
enum { enum {
I2C_OK = 0x0000, I2C_OK = 0x0000,
I2C_SET_SPEED_FAIL_OVER_SPEED = 0xA001, I2C_SET_SPEED_FAIL_OVER_SPEED = -0xA001,
I2C_TRANSFER_INVALID_LENGTH = 0xA002, I2C_TRANSFER_INVALID_LENGTH = -0xA002,
I2C_TRANSFER_FAIL_HS_NACKERR = 0xA003, I2C_TRANSFER_FAIL_HS_NACKERR = -0xA003,
I2C_TRANSFER_FAIL_ACKERR = 0xA004, I2C_TRANSFER_FAIL_ACKERR = -0xA004,
I2C_TRANSFER_FAIL_TIMEOUT = 0xA005, I2C_TRANSFER_FAIL_TIMEOUT = -0xA005,
I2C_TRANSFER_INVALID_ARGUMENT = 0xA006 I2C_TRANSFER_INVALID_ARGUMENT = -0xA006,
}; };
struct mtk_i2c_ac_timing { struct mtk_i2c_ac_timing {