From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xnr24-0000uP-Lo for qemu-devel@nongnu.org; Mon, 10 Nov 2014 10:37:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xnr1y-0004ek-K5 for qemu-devel@nongnu.org; Mon, 10 Nov 2014 10:37:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:38585 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xnr1y-0004eU-DL for qemu-devel@nongnu.org; Mon, 10 Nov 2014 10:37:26 -0500 From: Hannes Reinecke Date: Mon, 10 Nov 2014 16:37:23 +0100 Message-Id: <1415633843-4130-1-git-send-email-hare@suse.de> Subject: [Qemu-devel] [PATCH] esp: Do not overwrite ESP_TCHI after reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, Hannes Reinecke After a reset ESP_TCHI should contain the unique ID of the chip. This value will be overwritten with the current tranfer count if the transfer count has previously been set. The code never checks if the transfer count has been set, so the unique ID will always be overwritten if the driver sends a DMA NOP after reset. Signed-off-by: Hannes Reinecke --- hw/scsi/esp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 5ab44d8..9798180 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -454,7 +454,9 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val) /* Reload DMA counter. */ s->rregs[ESP_TCLO] = s->wregs[ESP_TCLO]; s->rregs[ESP_TCMID] = s->wregs[ESP_TCMID]; - s->rregs[ESP_TCHI] = s->wregs[ESP_TCHI]; + if (s->wregs[ESP_TCHI]) { + s->rregs[ESP_TCHI] = s->wregs[ESP_TCHI]; + } } else { s->dma = 0; } -- 1.7.12.4