Misc NPCM7XX patches
cover Misc NPCM7XX patches
[NOTE: I'm reviving a bunch of patches that was in the process of upstreaming a while ago but paused.]
This patch set contains a few bug fixes and I2C devices for some NPCM7XX boards.
Patch 1~2 fix a problem that causes the SMBus module to behave incorrectly when it's in FIFO mode and trying to receive more than 16 bytes at a time.
Patch 3 fixes a error in a register for ADC module.
Patch 4 makes the ADC input to be R/W instead of write only. It allows a test system to read these via QMP and has no negative effect.
Patch 5 adds a new blockdev IF type IF_OTHER.
Patch 6 allows at24c_eeprom_init to take a bus as parameter so it can be used by more use cases (e.g. behind an I2C mux.)
Patch 7 allows at24c_eeprom_init to take a drive as property, similar to sdhci_attach_device().
Patch 8 uses the function defined in patch 5 to add the EEPROM and other I2C devices for Quanta GBS board.
-- Changes since v4:
1. Add comments to patch 5.
2. Split patch 6 into 2 patches according to the feedback. Each patch does it own task.
-- Changes since v3:
1. Add a new blockdev IF type IF_OTHER.
2. Use IF_OTHER instead of IF_NONE.
-- Changes since v2:
1. Dropped patch 7.
2. Drop an extra variable in patch 5.
-- Changes since v1:
1. Rewrote patch 5 to implement the function in NPCM7xx board file instead of the EEPROM device file.
2. Slightly modify patch 6 to adapt to the changes and QEMU comment style.
3. Squash patch 7 into patch 5 to make it compile.
4. Add a new patch 7.
Hao Wu (7):
hw/i2c: Clear ACK bit in NPCM7xx SMBus module hw/i2c: Read FIFO during RXF_CTL change in NPCM7XX SMBus hw/adc: Fix CONV bit in NPCM7XX ADC CON register hw/adc: Make adci[*] R/W in NPCM7XX ADC
blockdev: Add a new IF type IF_OTHER
hw/arm: npcm8xx_boards: EEPROMs can take bus as parameter hw/arm: Set drive property for at24c eeprom
Patrick Venture (1):
hw/arm: quanta-gbs-bmc add i2c devices
blockdev.c | 4 +- hw/adc/npcm7xx_adc.c | 4 +- hw/arm/npcm7xx_boards.c | 102 ++++++++++++++++++++------------- hw/i2c/npcm7xx_smbus.c | 8 +-- include/sysemu/blockdev.h | 1 + tests/qtest/npcm7xx_adc-test.c | 2 +- 6 files changed, 73 insertions(+), 48 deletions(-)
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
PATCH 1/8 hw/i2c: Clear ACK bit in NPCM7xx SMBus module
The ACK bit in NPCM7XX SMBus module should be cleared each time it sends out a NACK signal. This patch fixes the bug that it fails to do so.
--- hw/i2c/npcm7xx_smbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i2c/npcm7xx_smbus.c +1 -1
@@ -270,7 +270,7 @@ static void npcm7xx_smbus_recv_byte(NPCM7xxSMBusState *s)if (s->st &NPCM7XX_SMBCTL1_ACK ) {trace_npcm7xx_smbus_nack (DEVICE (s)->canonical_path);i2c_nack (s->bus); - s->st &=NPCM7XX_SMBCTL1_ACK ; + s->st &= ~NPCM7XX_SMBCTL1_ACK ; }trace_npcm7xx_smbus_recv_byte ((DEVICE (s)->canonical_path), s->sda);npcm7xx_smbus_update_irq (s);
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
PATCH 2/8 hw/i2c: Read FIFO during RXF_CTL change in NPCM7XX SMBus
In reply to Hao WuOriginally we read in from SMBus when RXF_STS is cleared. However, the driver clears RXF_STS before setting RXF_CTL, causing the SM bus module to read incorrect amount of bytes in FIFO mode when the number of bytes read changed. This patch fixes this issue.
--- hw/i2c/npcm7xx_smbus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/i2c/npcm7xx_smbus.c +3 -3
@@ -637,9 +637,6 @@ static void npcm7xx_smbus_write_rxf_sts(NPCM7xxSMBusState *s, uint8_t value) {if (value &NPCM7XX_SMBRXF_STS_RX_THST ) { s->rxf_sts &= ~NPCM7XX_SMBRXF_STS_RX_THST ; -if (s->status ==NPCM7XX_SMBUS_STATUS_RECEIVING ) { -npcm7xx_smbus_recv_fifo (s); - } } }
@@ -651,6 +648,9 @@ static void npcm7xx_smbus_write_rxf_ctl(NPCM7xxSMBusState *s, uint8_t value) new_ctl =KEEP_OLD_BIT (s->rxf_ctl, new_ctl,NPCM7XX_SMBRXF_CTL_LAST ); } s->rxf_ctl = new_ctl; +if (s->status ==NPCM7XX_SMBUS_STATUS_RECEIVING ) { +npcm7xx_smbus_recv_fifo (s); + } }static uint64_t npcm7xx_smbus_read (void *opaque,hwaddr offset,unsigned size)
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
PATCH 3/8 hw/adc: Fix CONV bit in NPCM7XX ADC CON register
In reply to Hao WuThe correct bit for the CONV bit in NPCM7XX ADC is bit 13. This patch fixes that in the module, and also lower the IRQ when the guest is done handling an interrupt event from the ADC module.
--- hw/adc/npcm7xx_adc.c | 2 +- tests/qtest/npcm7xx_adc-test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
hw/adc/npcm7xx_adc.c +1 -1
@@ -36,7 +36,7 @@ REG32(NPCM7XX_ADC_DATA, 0x4)#define NPCM7XX_ADC_CON_INT BIT(18)#define NPCM7XX_ADC_CON_EN BIT(17)#define NPCM7XX_ADC_CON_RST BIT(16) -#define NPCM7XX_ADC_CON_CONV BIT(14) +#define NPCM7XX_ADC_CON_CONV BIT(13)#define NPCM7XX_ADC_CON_DIV (rv) extract32(rv, 1, 8)#define NPCM7XX_ADC_MAX_RESULT 1023
tests/qtest/npcm7xx_adc-test.c +1 -1
@@ -50,7 +50,7 @@#define CON_INT BIT(18)#define CON_EN BIT(17)#define CON_RST BIT(16) -#define CON_CONV BIT(14) +#define CON_CONV BIT(13)#define CON_DIV (rv) extract32(rv, 1, 8)#define FST_RDST BIT(1)
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
PATCH 4/8 hw/adc: Make adci[*] R/W in NPCM7XX ADC
In reply to Hao WuOur sensor test requires both reading and writing from a sensor's QOM property. So we need to make the input of ADC module R/W instead of write only for that to work.
--- hw/adc/npcm7xx_adc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/adc/npcm7xx_adc.c +1 -1
@@ -242,7 +242,7 @@ static void npcm7xx_adc_init(Object *obj)for (i =0 ; i <NPCM7XX_ADC_NUM_INPUTS ; ++i) {object_property_add_uint32_ptr (obj,"adci[*]" , - &s->adci[i],OBJ_PROP_FLAG_WRITE ); + &s->adci[i],OBJ_PROP_FLAG_READWRITE ); }object_property_add_uint32_ptr (obj,"vref" , &s->vref,OBJ_PROP_FLAG_WRITE );
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
PATCH 5/8 blockdev: Add a new IF type IF_OTHER
In reply to Hao WuThis type is used to represent block devs that are not suitable to be represented by other existing types.
A sample use is to represent an at24c eeprom device defined in hw/nvram/eeprom_at24c.c. The block device can be used to contain the content of the said eeprom device.
--- blockdev.c | 4 +++- include/sysemu/blockdev.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
blockdev.c +3 -1
@@ -82,6 +82,7 @@ static const char *const if_name[IF_COUNT] = { [IF_MTD] = "mtd", [IF_SD] = "sd", [IF_VIRTIO] = "virtio", + [IF_OTHER] = "other", [IF_XEN] = "xen", };
@@ -726,7 +727,8 @@ QemuOptsList qemu_legacy_drive_opts = { },{ .name = "if", .type = QEMU_OPT_STRING, - .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", + .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio," + " other)", },{ .name = "file", .type = QEMU_OPT_STRING,
include/sysemu/blockdev.h +1 -0
@@ -21,6 +21,7 @@ typedef enum {*/ IF_NONE =0 ,IF_IDE ,IF_SCSI ,IF_FLOPPY ,IF_PFLASH ,IF_MTD ,IF_SD ,IF_VIRTIO ,IF_XEN , +IF_OTHER ,IF_COUNT } BlockInterfaceType;
Signature · 1 line
2.37.0.170.g444d1eabd0-goog