Skip to contentSkip to conversation

i2c: Add AT24Cxx EEPROM model

PATCH In review Jan Kiszka 2 participants 4 messages Apr 29, 2013 – May 6, 2013

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

v4 cover i2c: Add AT24Cxx EEPROM model

Changes in v4:
- instead of provide size property, register at24c1..1024 types to allow specifying the size via the device name

Jan Kiszka (2):
i2c: Introduce device address mask
Add AT24Cxx I2C EEPROM device model

 hw/arm/pxa2xx.c        |    3 +-
 hw/arm/tosa.c          |    2 +-
 hw/arm/z2.c            |    2 +-
 hw/audio/wm8750.c      |    2 +-
 hw/display/ssd0303.c   |    2 +-
 hw/gpio/max7310.c      |    2 +-
 hw/i2c/core.c          |   14 ++-
 hw/i2c/smbus.c         |    2 +-
 hw/input/lm832x.c      |    2 +-
 hw/misc/tmp105.c       |    2 +-
 hw/nvram/Makefile.objs |    2 +-
 hw/nvram/at24.c        |  391 ++++++++++++++++++++++++++++++++++++++++++++++++
 hw/timer/ds1338.c      |    2 +-
 hw/timer/twl92230.c    |    2 +-
 include/hw/i2c/i2c.h   |    4 +-
 15 files changed, 417 insertions(+), 17 deletions(-)
 create mode 100644 hw/nvram/at24.c
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH v4 1/2 i2c: Introduce device address mask

Some devices react on multiple addresses. To emulate this, we could register them multiple times, but that is cumbersome. The AT24C16, e.g. listens on 8 different addresses.

Instead, introduce a device address mask that is applied on the transmitted address before matching it against the stored one. Moreover, the transmitted address is passed as additional parameter to the event callback of the device.

---
 hw/arm/pxa2xx.c      |    3 ++-
 hw/arm/tosa.c        |    2 +-
 hw/arm/z2.c          |    2 +-
 hw/audio/wm8750.c    |    2 +-
 hw/display/ssd0303.c |    2 +-
 hw/gpio/max7310.c    |    2 +-
 hw/i2c/core.c        |   14 ++++++++++----
 hw/i2c/smbus.c       |    2 +-
 hw/input/lm832x.c    |    2 +-
 hw/misc/tmp105.c     |    2 +-
 hw/timer/ds1338.c    |    2 +-
 hw/timer/twl92230.c  |    2 +-
 include/hw/i2c/i2c.h |    4 +++-
 13 files changed, 25 insertions(+), 16 deletions(-)
hw/arm/pxa2xx.c +2 -1
index 24b03a0..7d79805 100644
@@ -1240,7 +1240,8 @@ static void pxa2xx_i2c_update(PXA2xxI2CState *s)
 }
 
 /* These are only stubs now.  */
-static void pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event)
+static void pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event,
+                             uint8_t param)
 {
     PXA2xxI2CSlaveState *slave = FROM_I2C_SLAVE(PXA2xxI2CSlaveState, i2c);
     PXA2xxI2CState *s = slave->host;
hw/arm/tosa.c +1 -1
index 47818a5..8a89557 100644
@@ -157,7 +157,7 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data)
     return 0;
 }
 
-static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event)
+static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     TosaDACState *s = FROM_I2C_SLAVE(TosaDACState, i2c);
     s->len = 0;
hw/arm/z2.c +1 -1
index 07a127b..b42d330 100644
@@ -216,7 +216,7 @@ static int aer915_send(I2CSlave *i2c, uint8_t data)
     return 0;
 }
 
-static void aer915_event(I2CSlave *i2c, enum i2c_event event)
+static void aer915_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     AER915State *s = FROM_I2C_SLAVE(AER915State, i2c);
     switch (event) {
hw/audio/wm8750.c +1 -1
index 6b5a349..6181de7 100644
@@ -297,7 +297,7 @@ static void wm8750_reset(I2CSlave *i2c)
     s->i2c_len = 0;
 }
 
-static void wm8750_event(I2CSlave *i2c, enum i2c_event event)
+static void wm8750_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     WM8750State *s = (WM8750State *) i2c;
 
hw/display/ssd0303.c +1 -1
index beea5bf..cf73e93 100644
@@ -173,7 +173,7 @@ static int ssd0303_send(I2CSlave *i2c, uint8_t data)
     return 0;
 }
 
-static void ssd0303_event(I2CSlave *i2c, enum i2c_event event)
+static void ssd0303_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     ssd0303_state *s = (ssd0303_state *)i2c;
     switch (event) {
hw/gpio/max7310.c +1 -1
index 59b2877..6574436 100644
@@ -123,7 +123,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data)
     return 0;
 }
 
-static void max7310_event(I2CSlave *i2c, enum i2c_event event)
+static void max7310_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     MAX7310State *s = (MAX7310State *) i2c;
     s->len = 0;
hw/i2c/core.c +10 -4
index 0c4fc1d..bb604e9 100644
@@ -76,6 +76,11 @@ void i2c_set_slave_address(I2CSlave *dev, uint8_t address)
     dev->address = address;
 }
 
+void i2c_set_slave_address_mask(I2CSlave *dev, uint8_t mask)
+{
+    dev->address_mask = mask;
+}
+
 /* Return nonzero if bus is busy.  */
 int i2c_bus_busy(i2c_bus *bus)
 {
@@ -93,7 +98,7 @@ int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)
     QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
         DeviceState *qdev = kid->child;
         I2CSlave *candidate = I2C_SLAVE(qdev);
-        if (candidate->address == address) {
+        if (candidate->address == (address & candidate->address_mask)) {
             slave = candidate;
             break;
         }
@@ -108,7 +113,7 @@ int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)
        start condition.  */
     bus->current_dev = slave;
     if (sc->event) {
-        sc->event(slave, recv ? I2C_START_RECV : I2C_START_SEND);
+        sc->event(slave, recv ? I2C_START_RECV : I2C_START_SEND, address);
     }
     return 0;
 }
@@ -124,7 +129,7 @@ void i2c_end_transfer(i2c_bus *bus)
 
     sc = I2C_SLAVE_GET_CLASS(dev);
     if (sc->event) {
-        sc->event(dev, I2C_FINISH);
+        sc->event(dev, I2C_FINISH, 0);
     }
 
     bus->current_dev = NULL;
@@ -175,7 +180,7 @@ void i2c_nack(i2c_bus *bus)
 
     sc = I2C_SLAVE_GET_CLASS(dev);
     if (sc->event) {
-        sc->event(dev, I2C_NACK);
+        sc->event(dev, I2C_NACK, 0);
     }
 }
 
@@ -207,6 +212,7 @@ static int i2c_slave_qdev_init(DeviceState *dev)
     I2CSlave *s = I2C_SLAVE(dev);
     I2CSlaveClass *sc = I2C_SLAVE_GET_CLASS(s);
 
+    s->address_mask = 0x7f;
     return sc->init(s);
 }
 
hw/i2c/smbus.c +1 -1
index 25d2d04..c9e1261 100644
@@ -66,7 +66,7 @@ static void smbus_do_write(SMBusDevice *dev)
     }
 }
 
-static void smbus_i2c_event(I2CSlave *s, enum i2c_event event)
+static void smbus_i2c_event(I2CSlave *s, enum i2c_event event, uint8_t param)
 {
     SMBusDevice *dev = SMBUS_DEVICE(s);
 
hw/input/lm832x.c +1 -1
index bacbeb2..a545e88 100644
@@ -378,7 +378,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value)
     }
 }
 
-static void lm_i2c_event(I2CSlave *i2c, enum i2c_event event)
+static void lm_i2c_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     LM823KbdState *s = FROM_I2C_SLAVE(LM823KbdState, i2c);
 
hw/misc/tmp105.c +1 -1
index 155e03d..ce73288 100644
@@ -170,7 +170,7 @@ static int tmp105_tx(I2CSlave *i2c, uint8_t data)
     return 0;
 }
 
-static void tmp105_event(I2CSlave *i2c, enum i2c_event event)
+static void tmp105_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     TMP105State *s = TMP105(i2c);
 
hw/timer/ds1338.c +1 -1
index 8987cdc..51b3682 100644
@@ -88,7 +88,7 @@ static void inc_regptr(DS1338State *s)
     }
 }
 
-static void ds1338_event(I2CSlave *i2c, enum i2c_event event)
+static void ds1338_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     DS1338State *s = FROM_I2C_SLAVE(DS1338State, i2c);
 
hw/timer/twl92230.c +1 -1
index b730d85..be8d3a1 100644
@@ -706,7 +706,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value)
     }
 }
 
-static void menelaus_event(I2CSlave *i2c, enum i2c_event event)
+static void menelaus_event(I2CSlave *i2c, enum i2c_event event, uint8_t param)
 {
     MenelausState *s = (MenelausState *) i2c;
 
include/hw/i2c/i2c.h +3 -1
index 461392f..c0f38b8 100644
@@ -39,7 +39,7 @@ typedef struct I2CSlaveClass
     int (*recv)(I2CSlave *s);
 
     /* Notify the slave of a bus state change.  */
-    void (*event)(I2CSlave *s, enum i2c_event event);
+    void (*event)(I2CSlave *s, enum i2c_event event, uint8_t param);
 } I2CSlaveClass;
 
 struct I2CSlave
@@ -48,10 +48,12 @@ struct I2CSlave
 
     /* Remaining fields for internal use by the I2C code.  */
     uint8_t address;
+    uint8_t address_mask;
 };
 
 i2c_bus *i2c_init_bus(DeviceState *parent, const char *name);
 void i2c_set_slave_address(I2CSlave *dev, uint8_t address);
+void i2c_set_slave_address_mask(I2CSlave *dev, uint8_t mask);
 int i2c_bus_busy(i2c_bus *bus);
 int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv);
 void i2c_end_transfer(i2c_bus *bus);
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH v4 2/2 Add AT24Cxx I2C EEPROM device model

In reply to Jan Kiszka

This implements I2C EEPROMs of the AT24Cxx series. Sizes from 1Kbit to 1024Kbit are supported. Each EEPROM is backed by a block device. Its size can be explicitly specified by selecting the exact device type (required for sizes < 512, the blockdev sector size) or implicitly by providing a block device image of the corresponding size. Device addresses are built from the device number property. Write protection can be configured by declaring the block device read-only.

---
 hw/nvram/Makefile.objs |    2 +-
 hw/nvram/at24.c        |  391 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 392 insertions(+), 1 deletions(-)
 create mode 100644 hw/nvram/at24.c
hw/nvram/Makefile.objs +1 -1
index e9a6694..8271cd6 100644
@@ -1,5 +1,5 @@
 common-obj-$(CONFIG_DS1225Y) += ds1225y.o
-common-obj-y += eeprom93xx.o
+common-obj-y += eeprom93xx.o at24.o
 common-obj-y += fw_cfg.o
 common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
 obj-$(CONFIG_PSERIES) += spapr_nvram.o
hw/nvram/at24.c new file +391 -0

391 lines not on this page · raw message

Signature · 1 line
1.7.3.4
#3 lore raw
In reply to Jan Kiszka

HI Jan,

Quoted 26 lines · Jan Kiszka

Changes in v4:
- instead of provide size property, register at24c1..1024 types to allow specifying the size via the device name

Jan Kiszka (2):
i2c: Introduce device address mask
Add AT24Cxx I2C EEPROM device model

 hw/arm/pxa2xx.c        |    3 +-
 hw/arm/tosa.c          |    2 +-
 hw/arm/z2.c            |    2 +-
 hw/audio/wm8750.c      |    2 +-
 hw/display/ssd0303.c   |    2 +-
 hw/gpio/max7310.c      |    2 +-
 hw/i2c/core.c          |   14 ++-
 hw/i2c/smbus.c         |    2 +-
 hw/input/lm832x.c      |    2 +-
 hw/misc/tmp105.c       |    2 +-
 hw/nvram/Makefile.objs |    2 +-
 hw/nvram/at24.c        |  391 ++++++++++++++++++++++++++++++++++++++++++++++++
 hw/timer/ds1338.c      |    2 +-
 hw/timer/twl92230.c    |    2 +-
 include/hw/i2c/i2c.h   |    4 +-
 15 files changed, 417 insertions(+), 17 deletions(-)
 create mode 100644 hw/nvram/at24.c
Quoted 4 lines

--
1.7.3.4

acked-by <[email protected]>

to both. The few prediscussed issues I have are best addressed as incremental developments for 1.6 and this stands in its own right.

Regards,
Peter