git: a9bab712eb10 - stable/14 - ichsmb: fix block read operation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 17 Feb 2024 15:12:28 UTC
The branch stable/14 has been updated by avg:
URL: https://cgit.FreeBSD.org/src/commit/?id=a9bab712eb10de15d28ada67e369e75dcbd09d9e
commit a9bab712eb10de15d28ada67e369e75dcbd09d9e
Author: Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2022-09-13 21:26:35 +0000
Commit: Andriy Gapon <avg@FreeBSD.org>
CommitDate: 2024-02-17 14:15:11 +0000
ichsmb: fix block read operation
First of all and unlike I2C, it's not the master that dictates how many
bytes to read in block read operation. It's the device that informs the
master how many bytes it's sending back.
Thus, for ichsmb_bread() the count parameter is purely an output
parameter. The code has been changed to reflect that.
The sanity checking of the response length is now done once it (the
first byte of the response) is received.
While here, handling of ICH_HST_STA_FAILED status bit has been added.
Plus some code style improvements and some new code comments in the
vicinity of the changed code.
(cherry picked from commit cbf7c81b608bb9311e50df9481447dc843083a0e)
---
sys/dev/ichsmb/ichsmb.c | 61 ++++++++++++++++++++++++++++++++-------------
sys/dev/ichsmb/ichsmb_var.h | 5 ++--
2 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 7405f625e69f..94fc03d2bc67 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -389,8 +389,8 @@ ichsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf)
return (SMB_EINVAL);
bcopy(buf, sc->block_data, count);
sc->block_count = count;
- sc->block_index = 1;
- sc->block_write = 1;
+ sc->block_index = 1; /* buf[0] is written here */
+ sc->block_write = true;
mtx_lock(&sc->mutex);
sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK;
@@ -413,26 +413,23 @@ ichsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf)
const sc_p sc = device_get_softc(dev);
int smb_error;
- DBG("slave=0x%02x cmd=0x%02x count=%d\n", slave, (u_char)cmd, count);
+ DBG("slave=0x%02x cmd=0x%02x\n", slave, (u_char)cmd);
KASSERT(sc->ich_cmd == -1,
("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd));
- if (*count < 1 || *count > 32)
- return (SMB_EINVAL);
bzero(sc->block_data, sizeof(sc->block_data));
sc->block_count = 0;
sc->block_index = 0;
- sc->block_write = 0;
+ sc->block_write = false;
mtx_lock(&sc->mutex);
sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK;
bus_write_1(sc->io_res, ICH_XMIT_SLVA,
slave | ICH_XMIT_SLVA_READ);
bus_write_1(sc->io_res, ICH_HST_CMD, cmd);
- bus_write_1(sc->io_res, ICH_D0, *count); /* XXX? */
bus_write_1(sc->io_res, ICH_HST_CNT,
ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd);
if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR) {
- bcopy(sc->block_data, buf, min(sc->block_count, *count));
+ bcopy(sc->block_data, buf, sc->block_count);
*count = sc->block_count;
}
mtx_unlock(&sc->mutex);
@@ -515,21 +512,35 @@ ichsmb_device_intr(void *cookie)
/* Check for unexpected interrupt */
ok_bits = ICH_HST_STA_SMBALERT_STS;
- cmd_index = sc->ich_cmd >> 2;
+
+ if (sc->killed) {
+ sc->killed = 0;
+ ok_bits |= ICH_HST_STA_FAILED;
+ bus_write_1(sc->io_res, ICH_HST_CNT,
+ ICH_HST_CNT_INTREN);
+ }
+
if (sc->ich_cmd != -1) {
+ cmd_index = sc->ich_cmd >> 2;
KASSERT(cmd_index < sizeof(ichsmb_state_irqs),
("%s: ich_cmd=%d", device_get_nameunit(dev),
sc->ich_cmd));
ok_bits |= ichsmb_state_irqs[cmd_index];
}
if ((status & ~ok_bits) != 0) {
- device_printf(dev, "irq 0x%02x during %d\n", status,
- cmd_index);
+ device_printf(dev, "irq 0x%02x during 0x%02x\n", status,
+ sc->ich_cmd);
bus_write_1(sc->io_res,
ICH_HST_STA, (status & ~ok_bits));
continue;
}
+ /* Check for killed / aborted command */
+ if (status & ICH_HST_STA_FAILED) {
+ sc->smb_error = SMB_EABORT;
+ goto finished;
+ }
+
/* Check for bus error */
if (status & ICH_HST_STA_BUS_ERR) {
sc->smb_error = SMB_ECOLLI; /* XXX SMB_EBUSERR? */
@@ -558,6 +569,18 @@ ichsmb_device_intr(void *cookie)
if (sc->block_index == 0) {
sc->block_count = bus_read_1(
sc->io_res, ICH_D0);
+ if (sc->block_count < 1 ||
+ sc->block_count > 32) {
+ device_printf(dev, "block read "
+ "wrong length: %d\n",
+ sc->block_count);
+ bus_write_1(sc->io_res,
+ ICH_HST_CNT,
+ ICH_HST_CNT_KILL |
+ ICH_HST_CNT_INTREN);
+ sc->block_count = 0;
+ sc->killed = true;
+ }
}
/* Get next byte, if any */
@@ -568,15 +591,17 @@ ichsmb_device_intr(void *cookie)
bus_read_1(sc->io_res,
ICH_BLOCK_DB);
- /* Set "LAST_BYTE" bit before reading
- the last byte of block data */
- if (sc->block_index
- >= sc->block_count - 1) {
+ /*
+ * Set "LAST_BYTE" bit before reading
+ * the last byte of block data
+ */
+ if (sc->block_index ==
+ sc->block_count - 1) {
bus_write_1(sc->io_res,
ICH_HST_CNT,
- ICH_HST_CNT_LAST_BYTE
- | ICH_HST_CNT_INTREN
- | sc->ich_cmd);
+ ICH_HST_CNT_LAST_BYTE |
+ ICH_HST_CNT_INTREN |
+ sc->ich_cmd);
}
}
}
diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h
index abef219465e6..7fb14804d3c4 100644
--- a/sys/dev/ichsmb/ichsmb_var.h
+++ b/sys/dev/ichsmb/ichsmb_var.h
@@ -58,8 +58,9 @@ struct ichsmb_softc {
int smb_error; /* result of smb command */
int block_count; /* count for block read/write */
int block_index; /* index for block read/write */
- u_char block_write; /* 0=read, 1=write */
- u_char block_data[32]; /* block read/write data */
+ bool block_write; /* block write or block read */
+ uint8_t block_data[32]; /* block read/write data */
+ bool killed; /* killed current transfer */
struct mtx mutex; /* device mutex */
};
typedef struct ichsmb_softc *sc_p;