mirror of https://github.com/xemu-project/xemu.git
aspeed/i2c: Check SRAM enablement on AST2500
The SRAM must be enabled before using the Buffer Pool mode or the DMA mode. This is not required on other SoCs. Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Joel Stanley <joel@jms.id.au> Tested-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-id: 20191119141211.25716-3-clg@kaod.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
6054fc73e8
commit
aab90b1cac
|
@ -31,6 +31,8 @@
|
||||||
#define I2C_CTRL_STATUS 0x00 /* Device Interrupt Status */
|
#define I2C_CTRL_STATUS 0x00 /* Device Interrupt Status */
|
||||||
#define I2C_CTRL_ASSIGN 0x08 /* Device Interrupt Target
|
#define I2C_CTRL_ASSIGN 0x08 /* Device Interrupt Target
|
||||||
Assignment */
|
Assignment */
|
||||||
|
#define I2C_CTRL_GLOBAL 0x0C /* Global Control Register */
|
||||||
|
#define I2C_CTRL_SRAM_EN BIT(0)
|
||||||
|
|
||||||
/* I2C Device (Bus) Register */
|
/* I2C Device (Bus) Register */
|
||||||
|
|
||||||
|
@ -271,6 +273,29 @@ static uint8_t aspeed_i2c_get_addr(AspeedI2CBus *bus)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool aspeed_i2c_check_sram(AspeedI2CBus *bus)
|
||||||
|
{
|
||||||
|
AspeedI2CState *s = bus->controller;
|
||||||
|
AspeedI2CClass *aic = ASPEED_I2C_GET_CLASS(s);
|
||||||
|
|
||||||
|
if (!aic->check_sram) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* AST2500: SRAM must be enabled before using the Buffer Pool or
|
||||||
|
* DMA mode.
|
||||||
|
*/
|
||||||
|
if (!(s->ctrl_global & I2C_CTRL_SRAM_EN) &&
|
||||||
|
(bus->cmd & (I2CD_RX_DMA_ENABLE | I2CD_TX_DMA_ENABLE |
|
||||||
|
I2CD_RX_BUFF_ENABLE | I2CD_TX_BUFF_ENABLE))) {
|
||||||
|
qemu_log_mask(LOG_GUEST_ERROR, "%s: SRAM is not enabled\n", __func__);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The state machine needs some refinement. It is only used to track
|
* The state machine needs some refinement. It is only used to track
|
||||||
* invalid STOP commands for the moment.
|
* invalid STOP commands for the moment.
|
||||||
|
@ -282,6 +307,10 @@ static void aspeed_i2c_bus_handle_cmd(AspeedI2CBus *bus, uint64_t value)
|
||||||
bus->cmd &= ~0xFFFF;
|
bus->cmd &= ~0xFFFF;
|
||||||
bus->cmd |= value & 0xFFFF;
|
bus->cmd |= value & 0xFFFF;
|
||||||
|
|
||||||
|
if (!aspeed_i2c_check_sram(bus)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (bus->cmd & I2CD_M_START_CMD) {
|
if (bus->cmd & I2CD_M_START_CMD) {
|
||||||
uint8_t state = aspeed_i2c_get_state(bus) & I2CD_MACTIVE ?
|
uint8_t state = aspeed_i2c_get_state(bus) & I2CD_MACTIVE ?
|
||||||
I2CD_MSTARTR : I2CD_MSTART;
|
I2CD_MSTARTR : I2CD_MSTART;
|
||||||
|
@ -436,6 +465,8 @@ static uint64_t aspeed_i2c_ctrl_read(void *opaque, hwaddr offset,
|
||||||
switch (offset) {
|
switch (offset) {
|
||||||
case I2C_CTRL_STATUS:
|
case I2C_CTRL_STATUS:
|
||||||
return s->intr_status;
|
return s->intr_status;
|
||||||
|
case I2C_CTRL_GLOBAL:
|
||||||
|
return s->ctrl_global;
|
||||||
default:
|
default:
|
||||||
qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx "\n",
|
qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx "\n",
|
||||||
__func__, offset);
|
__func__, offset);
|
||||||
|
@ -448,7 +479,12 @@ static uint64_t aspeed_i2c_ctrl_read(void *opaque, hwaddr offset,
|
||||||
static void aspeed_i2c_ctrl_write(void *opaque, hwaddr offset,
|
static void aspeed_i2c_ctrl_write(void *opaque, hwaddr offset,
|
||||||
uint64_t value, unsigned size)
|
uint64_t value, unsigned size)
|
||||||
{
|
{
|
||||||
|
AspeedI2CState *s = opaque;
|
||||||
|
|
||||||
switch (offset) {
|
switch (offset) {
|
||||||
|
case I2C_CTRL_GLOBAL:
|
||||||
|
s->ctrl_global = value;
|
||||||
|
break;
|
||||||
case I2C_CTRL_STATUS:
|
case I2C_CTRL_STATUS:
|
||||||
default:
|
default:
|
||||||
qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx "\n",
|
qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx "\n",
|
||||||
|
@ -684,6 +720,7 @@ static void aspeed_2500_i2c_class_init(ObjectClass *klass, void *data)
|
||||||
aic->pool_size = 0x100;
|
aic->pool_size = 0x100;
|
||||||
aic->pool_base = 0x200;
|
aic->pool_base = 0x200;
|
||||||
aic->bus_pool_base = aspeed_2500_i2c_bus_pool_base;
|
aic->bus_pool_base = aspeed_2500_i2c_bus_pool_base;
|
||||||
|
aic->check_sram = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo aspeed_2500_i2c_info = {
|
static const TypeInfo aspeed_2500_i2c_info = {
|
||||||
|
|
|
@ -61,6 +61,7 @@ typedef struct AspeedI2CState {
|
||||||
qemu_irq irq;
|
qemu_irq irq;
|
||||||
|
|
||||||
uint32_t intr_status;
|
uint32_t intr_status;
|
||||||
|
uint32_t ctrl_global;
|
||||||
MemoryRegion pool_iomem;
|
MemoryRegion pool_iomem;
|
||||||
uint8_t pool[ASPEED_I2C_MAX_POOL_SIZE];
|
uint8_t pool[ASPEED_I2C_MAX_POOL_SIZE];
|
||||||
|
|
||||||
|
@ -83,6 +84,8 @@ typedef struct AspeedI2CClass {
|
||||||
uint64_t pool_size;
|
uint64_t pool_size;
|
||||||
hwaddr pool_base;
|
hwaddr pool_base;
|
||||||
uint8_t *(*bus_pool_base)(AspeedI2CBus *);
|
uint8_t *(*bus_pool_base)(AspeedI2CBus *);
|
||||||
|
bool check_sram;
|
||||||
|
|
||||||
} AspeedI2CClass;
|
} AspeedI2CClass;
|
||||||
|
|
||||||
I2CBus *aspeed_i2c_get_bus(DeviceState *dev, int busnr);
|
I2CBus *aspeed_i2c_get_bus(DeviceState *dev, int busnr);
|
||||||
|
|
Loading…
Reference in New Issue