Re: [PATCH v1 03/15] hw/i2c/aspeed: support to set the different memory size

[Cédric Le Goater]

On 7/18/24 08:49, Jamin Lin wrote:

According to the datasheet of ASPEED SOCs,
an I2C controller owns 8KB of register space for AST2700,
owns 4KB of register space for AST2600, AST2500 and AST2400,
and owns 64KB of register space for AST1030.

It set the memory region size 4KB by default and it does not compatible
register space for AST2700.

Introduce a new class attribute to set the I2C controller memory size
for different ASPEED SOCs.

Signed-off-by: Jamin Lin <jamin_...@aspeedtech.com>
---
  hw/i2c/aspeed_i2c.c         | 6 +++++-
  include/hw/i2c/aspeed_i2c.h | 2 +-
  2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index b43afd250d..7d5a53c4c0 100644
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -1014,7 +1014,7 @@ static void aspeed_i2c_realize(DeviceState *dev, Error 
**errp)

sysbus_init_irq(sbd, &s->irq);

      memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_i2c_ctrl_ops, s,
-                          "aspeed.i2c", 0x1000);
+                          "aspeed.i2c", aic->mem_size);
      sysbus_init_mmio(sbd, &s->iomem);

for (i = 0; i < aic->num_busses; i++) {

@@ -1286,6 +1286,7 @@ static void aspeed_2400_i2c_class_init(ObjectClass 
*klass, void *data)
      aic->pool_size = 0x800;
      aic->pool_base = 0x800;
      aic->bus_pool_base = aspeed_2400_i2c_bus_pool_base;
+    aic->mem_size = 0x1000;
  }

static const TypeInfo aspeed_2400_i2c_info = {

@@ -1320,6 +1321,7 @@ static void aspeed_2500_i2c_class_init(ObjectClass 
*klass, void *data)
      aic->bus_pool_base = aspeed_2500_i2c_bus_pool_base;
      aic->check_sram = true;
      aic->has_dma = true;
+    aic->mem_size = 0x1000;
  }

static const TypeInfo aspeed_2500_i2c_info = {

@@ -1353,6 +1355,7 @@ static void aspeed_2600_i2c_class_init(ObjectClass 
*klass, void *data)
      aic->pool_base = 0xC00;
      aic->bus_pool_base = aspeed_2600_i2c_bus_pool_base;
      aic->has_dma = true;
+    aic->mem_size = 0x1000;
  }

static const TypeInfo aspeed_2600_i2c_info = {

@@ -1376,6 +1379,7 @@ static void aspeed_1030_i2c_class_init(ObjectClass 
*klass, void *data)
      aic->pool_base = 0xC00;
      aic->bus_pool_base = aspeed_2600_i2c_bus_pool_base;
      aic->has_dma = true;
+    aic->mem_size = 0x10000;

Are you sure this value is correct ?


Thanks,

C.

  }

static const TypeInfo aspeed_1030_i2c_info = {

diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h
index a064479e59..065b636d29 100644
--- a/include/hw/i2c/aspeed_i2c.h
+++ b/include/hw/i2c/aspeed_i2c.h
@@ -283,7 +283,7 @@ struct AspeedI2CClass {
      uint8_t *(*bus_pool_base)(AspeedI2CBus *);
      bool check_sram;
      bool has_dma;
-
+    uint64_t mem_size;
  };

static inline bool aspeed_i2c_is_new_mode(AspeedI2CState *s)