From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnrH5-0004xP-Pw for qemu-devel@nongnu.org; Mon, 10 Nov 2014 10:53:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XnrGz-00011V-MG for qemu-devel@nongnu.org; Mon, 10 Nov 2014 10:53:03 -0500 Received: from cantor2.suse.de ([195.135.220.15]:38951 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnrGz-00011M-FX for qemu-devel@nongnu.org; Mon, 10 Nov 2014 10:52:57 -0500 From: Hannes Reinecke Date: Mon, 10 Nov 2014 16:52:55 +0100 Message-Id: <1415634775-4288-1-git-send-email-hare@suse.de> Subject: [Qemu-devel] [PATCHv2] 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. So we should always return the chip id if ESP_TCHI has never been written to. Signed-off-by: Hannes Reinecke --- hw/scsi/esp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 5ab44d8..2caac1c 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -364,7 +364,6 @@ void esp_hard_reset(ESPState *s) { memset(s->rregs, 0, ESP_REGS); memset(s->wregs, 0, ESP_REGS); - s->rregs[ESP_TCHI] = s->chip_id; s->ti_size = 0; s->ti_rptr = 0; s->ti_wptr = 0; @@ -422,6 +421,11 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) esp_lower_irq(s); return old_val; + case ESP_TCHI: + /* Return the unique id if the value has never been written */ + if (!s->wregs[ESP_TCHI]) { + return s->chip_id; + } default: break; } -- 1.7.12.4