yongqiang niu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
WIP: soc/mediatek/mt8192: add i2c driver support
Add i2c controller driver code
TEST=Boots correctly on MT8192P1
Signed-off-by: jg_daolongzhu jg_daolongzhu@mediatek.corp-partner.google.com Change-Id: Ib8ece265687d37bafe2f0de63459ea0fabab8a11 --- M src/soc/mediatek/common/i2c.c M src/soc/mediatek/common/include/soc/i2c_common.h M src/soc/mediatek/mt8192/Makefile.inc A src/soc/mediatek/mt8192/i2c.c M src/soc/mediatek/mt8192/include/soc/addressmap.h A src/soc/mediatek/mt8192/include/soc/i2c.h 6 files changed, 247 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/46573/1
diff --git a/src/soc/mediatek/common/i2c.c b/src/soc/mediatek/common/i2c.c index 87925ba..931e36d 100644 --- a/src/soc/mediatek/common/i2c.c +++ b/src/soc/mediatek/common/i2c.c @@ -47,6 +47,7 @@ { uint32_t ret_code = I2C_OK; uint16_t status; + uint16_t dma_sync = 0; uint32_t time_out_val = 0; uint8_t addr; uint32_t write_len = 0; @@ -62,6 +63,12 @@
addr = seg[0].slave;
+ if (mtk_i2c_bus_controller[bus].mt_i2c_flag == I2C_APDMA_ASYNC) { + dma_sync = I2C_DMA_SKIP_CONFIG | I2C_DMA_ASYNC_MODE; + if (mode == I2C_WRITE_READ_MODE) + dma_sync |= I2C_DMA_DIR_CHANGE; + } + switch (mode) { case I2C_WRITE_MODE: assert(seg[0].len > 0 && seg[0].len <= 255); @@ -113,7 +120,7 @@ write32(®s->slave_addr, addr << 1);
/* Prepare buffer data to start transfer */ - write32(&dma_regs->dma_con, I2C_DMA_CON_TX); + write32(&dma_regs->dma_con, I2C_DMA_CON_TX | dma_sync); write32(&dma_regs->dma_tx_mem_addr, (uintptr_t)_dma_coherent); write32(&dma_regs->dma_tx_len, write_len); break; @@ -132,7 +139,7 @@ write32(®s->slave_addr, (addr << 1 | 0x1));
/* Prepare buffer data to start transfer */ - write32(&dma_regs->dma_con, I2C_DMA_CON_RX); + write32(&dma_regs->dma_con, I2C_DMA_CON_RX | dma_sync); write32(&dma_regs->dma_rx_mem_addr, (uintptr_t)_dma_coherent); write32(&dma_regs->dma_rx_len, read_len); break; @@ -154,7 +161,7 @@ write32(®s->slave_addr, addr << 1);
/* Prepare buffer data to start transfer */ - write32(&dma_regs->dma_con, I2C_DMA_CLR_FLAG); + write32(&dma_regs->dma_con, I2C_DMA_CLR_FLAG | dma_sync); write32(&dma_regs->dma_tx_mem_addr, (uintptr_t)_dma_coherent); write32(&dma_regs->dma_tx_len, write_len); write32(&dma_regs->dma_rx_mem_addr, (uintptr_t)_dma_coherent); diff --git a/src/soc/mediatek/common/include/soc/i2c_common.h b/src/soc/mediatek/common/include/soc/i2c_common.h index 0100e26..198a2b57 100644 --- a/src/soc/mediatek/common/include/soc/i2c_common.h +++ b/src/soc/mediatek/common/include/soc/i2c_common.h @@ -38,6 +38,9 @@ I2C_DMA_INT_FLAG_NONE = 0x0, I2C_DMA_CLR_FLAG = 0x0, I2C_DMA_FLUSH_FLAG = 0x1, + I2C_DMA_ASYNC_MODE = 0x0004, + I2C_DMA_SKIP_CONFIG = 0x0010, + I2C_DMA_DIR_CHANGE = 0x0200, };
enum { @@ -46,6 +49,11 @@ I2C_CONTROL_MASK = (0x3f << 1) };
+enum { + I2C_APDMA_NOASYNC = 0, + I2C_APDMA_ASYNC = 1, +}; + /* Register mask */ enum { I2C_HS_NACKERR = (1 << 2), @@ -80,6 +88,7 @@ struct mtk_i2c { struct mt_i2c_regs *i2c_regs; struct mt_i2c_dma_regs *i2c_dma_regs; + uint32_t mt_i2c_flag; };
extern struct mtk_i2c mtk_i2c_bus_controller[]; diff --git a/src/soc/mediatek/mt8192/Makefile.inc b/src/soc/mediatek/mt8192/Makefile.inc index d695824..04d57dc 100755 --- a/src/soc/mediatek/mt8192/Makefile.inc +++ b/src/soc/mediatek/mt8192/Makefile.inc @@ -5,6 +5,7 @@ bootblock-y += bootblock.c bootblock-y += flash_controller.c bootblock-y += ../common/gpio.c gpio.c +bootblock-y += ../common/i2c.c i2c.c bootblock-y += ../common/mmu_operations.c bootblock-y += ../common/pll.c pll.c bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c @@ -19,6 +20,7 @@ verstage-y += auxadc.c verstage-y += flash_controller.c verstage-y += ../common/gpio.c gpio.c +verstage-y += ../common/i2c.c i2c.c verstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c verstage-y += ../common/timer.c verstage-y += ../common/uart.c @@ -30,6 +32,7 @@ romstage-y += emi.c romstage-y += flash_controller.c romstage-y += ../common/gpio.c gpio.c +romstage-y += ../common/i2c.c i2c.c romstage-y += ../common/mmu_operations.c romstage-y += memory.c dramc_param.c ../common/memory_test.c romstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c @@ -41,6 +44,7 @@ ramstage-y += auxadc.c ramstage-y += flash_controller.c ramstage-y += ../common/gpio.c gpio.c +ramstage-y += ../common/i2c.c i2c.c ramstage-y += emi.c ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c ramstage-y += dpm.c diff --git a/src/soc/mediatek/mt8192/i2c.c b/src/soc/mediatek/mt8192/i2c.c new file mode 100644 index 0000000..6b9c1ea --- /dev/null +++ b/src/soc/mediatek/mt8192/i2c.c @@ -0,0 +1,176 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <assert.h> +#include <device/mmio.h> +#include <soc/pll.h> +#include <soc/i2c.h> +#include <soc/gpio.h> + +#define I2C_CLK_HZ (UNIVPLL_HZ / 20) +struct mtk_i2c mtk_i2c_bus_controller[] = { + /* i2c0 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x250000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c1 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x70000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x80), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c2 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x71000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x100), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c3 setting */ + { + .i2c_regs = (void *)(I2C_BASE), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x280), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c4 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x72000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x300), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c5 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x150000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x480), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c6 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x251000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x500), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c7 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x50000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x580), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c8 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x51000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x700), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, + + /* i2c9 setting */ + { + .i2c_regs = (void *)(I2C_BASE + 0x52000), + .i2c_dma_regs = (void *)(I2C_DMA_BASE + 0x880), + .mt_i2c_flag = I2C_APDMA_ASYNC, + }, +}; + +#define I2C_BUS_NUMBER ARRAY_SIZE(mtk_i2c_bus_controller) + +struct pad_func { + gpio_t gpio; + u8 func; +}; + +#define PAD_FUNC(name, func) {GPIO(name), PAD_##name##_FUNC_##func} + +static const struct pad_func i2c_funcs[I2C_BUS_NUMBER][2] = { + { + PAD_FUNC(SDA0, SDA0), + PAD_FUNC(SCL0, SCL0), + }, + { + PAD_FUNC(SDA1, SDA1), + PAD_FUNC(SCL1, SCL1), + }, + { + PAD_FUNC(SDA2, SDA2), + PAD_FUNC(SCL2, SCL2), + }, + { + PAD_FUNC(SDA3, SDA3), + PAD_FUNC(SCL3, SCL3), + }, + { + PAD_FUNC(SDA4, SDA4), + PAD_FUNC(SCL4, SCL4), + }, + { + PAD_FUNC(SDA5, SDA5), + PAD_FUNC(SCL5, SCL5), + }, + { + PAD_FUNC(SDA6, SDA6), + PAD_FUNC(SCL6, SCL6), + }, + { + PAD_FUNC(SDA7, SDA7), + PAD_FUNC(SCL7, SCL7), + }, + { + PAD_FUNC(SDA8, SDA8), + PAD_FUNC(SCL8, SCL8), + }, + { + PAD_FUNC(SDA9, SDA9), + PAD_FUNC(SCL9, SCL9), + }, +}; + +static void mtk_i2c_set_gpio_pinmux(uint8_t bus) +{ + assert(bus < I2C_BUS_NUMBER); + + const struct pad_func *ptr = i2c_funcs[bus]; + for (size_t i = 0; i < 2; i++) { + gpio_set_mode(ptr[i].gpio, ptr[i].func); + gpio_set_pull(ptr[i].gpio, GPIO_PULL_ENABLE, GPIO_PULL_UP); + } +} + +static void mtk_i2c_speed_init(uint8_t bus) +{ + uint8_t step_div; + const uint8_t clock_div = 5; + const uint8_t sample_div = 1; + uint32_t i2c_freq; + + assert(bus < ARRAY_SIZE(mtk_i2c_bus_controller)); + + /* Calculate i2c frequency */ + step_div = DIV_ROUND_UP(I2C_CLK_HZ, + (400 * KHz * sample_div * 2) * clock_div); + i2c_freq = I2C_CLK_HZ / (step_div * sample_div * 2 * clock_div); + assert(sample_div < 8 && step_div < 64 && i2c_freq <= 400 * KHz && + i2c_freq >= 380 * KHz); + + /* Init i2c bus Timing register */ + write32(&mtk_i2c_bus_controller[bus].i2c_regs->timing, + (sample_div - 1) << 8 | (step_div - 1)); + write32(&mtk_i2c_bus_controller[bus].i2c_regs->ltiming, + (sample_div - 1) << 6 | (step_div - 1)); + + /* Init i2c bus clock_div register */ + write32(&mtk_i2c_bus_controller[bus].i2c_regs->clock_div, + clock_div - 1); +} + +void mtk_i2c_bus_init(uint8_t bus) +{ + mtk_i2c_speed_init(bus); + mtk_i2c_set_gpio_pinmux(bus); +} diff --git a/src/soc/mediatek/mt8192/include/soc/addressmap.h b/src/soc/mediatek/mt8192/include/soc/addressmap.h index 85eac5b..3fd2bca 100644 --- a/src/soc/mediatek/mt8192/include/soc/addressmap.h +++ b/src/soc/mediatek/mt8192/include/soc/addressmap.h @@ -29,6 +29,7 @@ PMIF_SPMI_BASE = IO_PHYS + 0x00027000, PMICSPI_MST_BASE = IO_PHYS + 0x00028000, SPMI_MST_BASE = IO_PHYS + 0x00029000, + I2C_DMA_BASE = IO_PHYS + 0x00217080, EMI_BASE = IO_PHYS + 0x00219000, EMI_MPU_BASE = IO_PHYS + 0x00226000, DRAMC_CHA_AO_BASE = IO_PHYS + 0x00230000, @@ -50,6 +51,7 @@ UFSHCI_BASE = IO_PHYS + 0x01270000, EFUSEC_BASE = IO_PHYS + 0x01C10000, IOCFG_RM_BASE = IO_PHYS + 0x01C20000, + I2C_BASE = IO_PHYS + 0x01CB0000, IOCFG_BM_BASE = IO_PHYS + 0x01D10000, IOCFG_BL_BASE = IO_PHYS + 0x01D30000, IOCFG_BR_BASE = IO_PHYS + 0x01D40000, diff --git a/src/soc/mediatek/mt8192/include/soc/i2c.h b/src/soc/mediatek/mt8192/include/soc/i2c.h new file mode 100644 index 0000000..72a9af1 --- /dev/null +++ b/src/soc/mediatek/mt8192/include/soc/i2c.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SOC_MEDIATEK_MT8192_I2C_H +#define SOC_MEDIATEK_MT8192_I2C_H + +#include <soc/i2c_common.h> + +/* I2C Register */ +struct mt_i2c_regs { + uint32_t data_port; + uint32_t slave_addr; + uint32_t intr_mask; + uint32_t intr_stat; + uint32_t control; + uint32_t transfer_len; + uint32_t transac_len; + uint32_t delay_len; + uint32_t timing; + uint32_t start; + uint32_t ext_conf; + uint32_t ltiming; + uint32_t hs; + uint32_t io_config; + uint32_t fifo_addr_clr; + uint32_t reserved0[2]; + uint32_t transfer_aux_len; + uint32_t clock_div; + uint32_t time_out; + uint32_t softreset; + uint32_t reserved1[36]; + uint32_t debug_stat; + uint32_t debug_ctrl; + uint32_t reserved2[2]; + uint32_t fifo_stat; + uint32_t fifo_thresh; + uint32_t reserved3[932]; + uint32_t multi_dma; + uint32_t reserved4[2]; + uint32_t rollback; +}; + +check_member(mt_i2c_regs, multi_dma, 0xf8c); + +void mtk_i2c_bus_init(uint8_t bus); + +#endif /* SOC_MEDIATEK_MT8192_I2C_H */
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 4:
(2 comments)
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... File src/soc/mediatek/mt8192/i2c.c:
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 10: struct const struct
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 152: ARRAY_SIZE(mtk_i2c_bus_controller) I2C_BUS_NUMBER
Hello Jg Daolongzhu, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46573
to look at the new patch set (#5).
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
WIP: soc/mediatek/mt8192: add i2c driver support
Add i2c controller driver code
TEST=Boots correctly on MT8192P1
Signed-off-by: jg_daolongzhu jg_daolongzhu@mediatek.corp-partner.google.com Change-Id: Ib8ece265687d37bafe2f0de63459ea0fabab8a11 --- M src/soc/mediatek/common/i2c.c M src/soc/mediatek/common/include/soc/i2c_common.h M src/soc/mediatek/mt8192/Makefile.inc A src/soc/mediatek/mt8192/i2c.c M src/soc/mediatek/mt8192/include/soc/addressmap.h A src/soc/mediatek/mt8192/include/soc/i2c.h 6 files changed, 247 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/46573/5
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46573/5/src/soc/mediatek/mt8192/Mak... File src/soc/mediatek/mt8192/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/46573/5/src/soc/mediatek/mt8192/Mak... PS5, Line 36: romstage-y += ../common/mmu_operations.c mmu_operations.c Please put it below i2c (sort these alphabetically).
wang qii has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 6:
(2 comments)
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... File src/soc/mediatek/mt8192/i2c.c:
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 10: struct
const struct
In order to maintain consistency with other references, const is not used in particular, and it may be possible to add another patch for uniform modification.
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 152: ARRAY_SIZE(mtk_i2c_bus_controller)
I2C_BUS_NUMBER
Ack
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 7:
(2 comments)
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... File src/soc/mediatek/mt8192/i2c.c:
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 10: struct
In order to maintain consistency with other references, const is not used in particular, and it may […]
What do you mean by "other references"? If this is supposed to be a constant array then we should add the 'const' modifier here.
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 152: ARRAY_SIZE(mtk_i2c_bus_controller)
Ack
Not done?
wang qii has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 7:
(1 comment)
I have merge that two patch to: https://review.coreboot.org/c/coreboot/+/47800
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... File src/soc/mediatek/mt8192/i2c.c:
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 10: struct
What do you mean by "other references"? If this is supposed to be a constant array then we should a […]
src/soc/mediatek/mt8183/i2c.c and src/soc/mediatek/mt8173/i2c.c, if we add 'const' modifier here, that will case build fail. I think it need a code style patch to fix it separately.
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... File src/soc/mediatek/mt8192/i2c.c:
https://review.coreboot.org/c/coreboot/+/46573/4/src/soc/mediatek/mt8192/i2c... PS4, Line 10: struct
src/soc/mediatek/mt8183/i2c.c and src/soc/mediatek/mt8173/i2c.c, if we add […]
Fair enough.
Yidi Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 9:
replace with CB:47800
Yidi Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Patch Set 9: Code-Review-1
Yongqiang Niu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Set Ready For Review
yongqiang niu has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/46573 )
Change subject: WIP: soc/mediatek/mt8192: add i2c driver support ......................................................................
Abandoned