aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-07-06 10:58:03 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-07-06 10:36:27 -0500
commit680a34eeb8f2d455121c67697fca146440e61612 (patch)
tree15fa978d5287cdf45ca44884afa7922a8499fcef
parent262ea18e890d51b8f86157f8e4aeb162b9ef2ad8 (diff)
scsi: Fix SCSI bus reset
When the controller raises the SCSI reset line, we have to perform the requested reset on all disks attached to the controller's bus. Moreover, reset is edge triggered, so avoid repeating it if the line was already high. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/lsi53c895a.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 1bb1caf478..bd7b661426 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -1590,8 +1590,19 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val)
BADF("Immediate Arbritration not implemented\n");
}
if (val & LSI_SCNTL1_RST) {
- s->sstat0 |= LSI_SSTAT0_RST;
- lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0);
+ if (!(s->sstat0 & LSI_SSTAT0_RST)) {
+ DeviceState *dev;
+ int id;
+
+ for (id = 0; id < s->bus.ndev; id++) {
+ if (s->bus.devs[id]) {
+ dev = &s->bus.devs[id]->qdev;
+ dev->info->reset(dev);
+ }
+ }
+ s->sstat0 |= LSI_SSTAT0_RST;
+ lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0);
+ }
} else {
s->sstat0 &= ~LSI_SSTAT0_RST;
}