mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
Extend support of SMBUS(module pm_smbus.c) HST_STS register.
Previous realization doesn't consider flags in the status register. Add DS and INTR bits of HST_STS register set after transaction execution. Update bits resetting in HST_STS register. Update error processing: if DEV_ERR bit set transaction isn't execution. Signed-off-by: MRatnikov <m.o.ratnikov@gmail.com> Message-id: 1373230982-9190-1-git-send-email-m.o.ratnikov@gmail.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
02c4bdf1d2
commit
edb5092c24
|
@ -32,6 +32,18 @@
|
||||||
#define SMBHSTDAT1 0x06
|
#define SMBHSTDAT1 0x06
|
||||||
#define SMBBLKDAT 0x07
|
#define SMBBLKDAT 0x07
|
||||||
|
|
||||||
|
#define STS_HOST_BUSY (1)
|
||||||
|
#define STS_INTR (1<<1)
|
||||||
|
#define STS_DEV_ERR (1<<2)
|
||||||
|
#define STS_BUS_ERR (1<<3)
|
||||||
|
#define STS_FAILED (1<<4)
|
||||||
|
#define STS_SMBALERT (1<<5)
|
||||||
|
#define STS_INUSE_STS (1<<6)
|
||||||
|
#define STS_BYTE_DONE (1<<7)
|
||||||
|
/* Signs of successfully transaction end :
|
||||||
|
* ByteDoneStatus = 1 (STS_BYTE_DONE) and INTR = 1 (STS_INTR )
|
||||||
|
*/
|
||||||
|
|
||||||
//#define DEBUG
|
//#define DEBUG
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
@ -50,9 +62,14 @@ static void smb_transaction(PMSMBus *s)
|
||||||
i2c_bus *bus = s->smbus;
|
i2c_bus *bus = s->smbus;
|
||||||
|
|
||||||
SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot);
|
SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot);
|
||||||
|
/* Transaction isn't exec if STS_DEV_ERR bit set */
|
||||||
|
if ((s->smb_stat & STS_DEV_ERR) != 0) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
switch(prot) {
|
switch(prot) {
|
||||||
case 0x0:
|
case 0x0:
|
||||||
smbus_quick_command(bus, addr, read);
|
smbus_quick_command(bus, addr, read);
|
||||||
|
s->smb_stat |= STS_BYTE_DONE | STS_INTR;
|
||||||
break;
|
break;
|
||||||
case 0x1:
|
case 0x1:
|
||||||
if (read) {
|
if (read) {
|
||||||
|
@ -60,6 +77,7 @@ static void smb_transaction(PMSMBus *s)
|
||||||
} else {
|
} else {
|
||||||
smbus_send_byte(bus, addr, cmd);
|
smbus_send_byte(bus, addr, cmd);
|
||||||
}
|
}
|
||||||
|
s->smb_stat |= STS_BYTE_DONE | STS_INTR;
|
||||||
break;
|
break;
|
||||||
case 0x2:
|
case 0x2:
|
||||||
if (read) {
|
if (read) {
|
||||||
|
@ -67,6 +85,7 @@ static void smb_transaction(PMSMBus *s)
|
||||||
} else {
|
} else {
|
||||||
smbus_write_byte(bus, addr, cmd, s->smb_data0);
|
smbus_write_byte(bus, addr, cmd, s->smb_data0);
|
||||||
}
|
}
|
||||||
|
s->smb_stat |= STS_BYTE_DONE | STS_INTR;
|
||||||
break;
|
break;
|
||||||
case 0x3:
|
case 0x3:
|
||||||
if (read) {
|
if (read) {
|
||||||
|
@ -77,6 +96,7 @@ static void smb_transaction(PMSMBus *s)
|
||||||
} else {
|
} else {
|
||||||
smbus_write_word(bus, addr, cmd, (s->smb_data1 << 8) | s->smb_data0);
|
smbus_write_word(bus, addr, cmd, (s->smb_data1 << 8) | s->smb_data0);
|
||||||
}
|
}
|
||||||
|
s->smb_stat |= STS_BYTE_DONE | STS_INTR;
|
||||||
break;
|
break;
|
||||||
case 0x5:
|
case 0x5:
|
||||||
if (read) {
|
if (read) {
|
||||||
|
@ -84,6 +104,7 @@ static void smb_transaction(PMSMBus *s)
|
||||||
} else {
|
} else {
|
||||||
smbus_write_block(bus, addr, cmd, s->smb_data, s->smb_data0);
|
smbus_write_block(bus, addr, cmd, s->smb_data, s->smb_data0);
|
||||||
}
|
}
|
||||||
|
s->smb_stat |= STS_BYTE_DONE | STS_INTR;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -91,7 +112,7 @@ static void smb_transaction(PMSMBus *s)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
s->smb_stat |= 0x04;
|
s->smb_stat |= STS_DEV_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
|
static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
|
||||||
|
@ -102,7 +123,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
|
||||||
SMBUS_DPRINTF("SMB writeb port=0x%04x val=0x%02x\n", addr, val);
|
SMBUS_DPRINTF("SMB writeb port=0x%04x val=0x%02x\n", addr, val);
|
||||||
switch(addr) {
|
switch(addr) {
|
||||||
case SMBHSTSTS:
|
case SMBHSTSTS:
|
||||||
s->smb_stat = 0;
|
s->smb_stat = (~(val & 0xff)) & s->smb_stat;
|
||||||
s->smb_index = 0;
|
s->smb_index = 0;
|
||||||
break;
|
break;
|
||||||
case SMBHSTCNT:
|
case SMBHSTCNT:
|
||||||
|
|
Loading…
Reference in a new issue