From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSf2r-0005l8-I6 for qemu-devel@nongnu.org; Sat, 13 Sep 2014 00:34:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSf2k-0005oH-O4 for qemu-devel@nongnu.org; Sat, 13 Sep 2014 00:34:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSf2k-0005o7-FU for qemu-devel@nongnu.org; Sat, 13 Sep 2014 00:34:38 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8D4YbtE018420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sat, 13 Sep 2014 00:34:38 -0400 From: John Snow Date: Sat, 13 Sep 2014 00:34:15 -0400 Message-Id: <1410582855-21870-11-git-send-email-jsnow@redhat.com> In-Reply-To: <1410582855-21870-1-git-send-email-jsnow@redhat.com> References: <1410582855-21870-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [RFC 10/10] AHCI: Fix SDB FIS Construction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, stefanha@redhat.com, mst@redhat.com The SDB FIS creation was mangled; We were writing the error byte to byte 0, and omitting the SDB FIS magic byte. Though the SDB packet layout states that: byte 0: Must be 0xA1 to indicate SDB FIS. byte 1: Port multiplier select & other flags byte 2: status byte. byte 3: error byte. This patch adds an SDB FIS structure with human-readable names, and ensures that we are filling the structure appropriately. Signed-off-by: John Snow --- hw/ide/ahci.c | 23 ++++++++++++----------- hw/ide/ahci.h | 8 ++++++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 5bc5a92..c2662fa 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -567,26 +567,27 @@ static void debug_print_fis(uint8_t *fis, int cmd_len) static void ahci_write_fis_sdb(AHCIState *s, int port, uint32_t finished) { - AHCIPortRegs *pr = &s->dev[port].port_regs; + AHCIDevice *ad = &s->dev[port]; + AHCIPortRegs *pr = &ad->port_regs; IDEState *ide_state; - uint8_t *sdb_fis; + SDBFIS *sdb_fis; if (!s->dev[port].res_fis || !(pr->cmd & PORT_CMD_FIS_RX)) { return; } - sdb_fis = &s->dev[port].res_fis[RES_FIS_SDBFIS]; - ide_state = &s->dev[port].port.ifs[0]; - - /* clear memory */ - *(uint32_t*)sdb_fis = 0; + sdb_fis = (SDBFIS *)&ad->res_fis[RES_FIS_SDBFIS]; + ide_state = &ad->port.ifs[0]; - /* write values */ - sdb_fis[0] = ide_state->error; - sdb_fis[2] = ide_state->status & 0x77; + sdb_fis->type = 0xA1; + /* Interrupt pending & Notification bit */ + sdb_fis->flags = (ad->hba->control_regs.irqstatus ? (1 << 6) : 0); + sdb_fis->status = ide_state->status & 0x77; + sdb_fis->error = ide_state->error; + /* update SAct field in SDB_FIS */ s->dev[port].finished |= finished; - *(uint32_t*)(sdb_fis + 4) = cpu_to_le32(s->dev[port].finished); + sdb_fis->payload = cpu_to_le32(ad->finished); ahci_trigger_irq(s, &s->dev[port], PORT_IRQ_SDB_FIS); } diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 8745848..a1c107e 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -348,6 +348,14 @@ typedef struct NCQFrame { uint8_t aux3; } QEMU_PACKED NCQFrame; +typedef struct SDBFIS { + uint8_t type; + uint8_t flags; + uint8_t status; + uint8_t error; + uint32_t payload; +} QEMU_PACKED SDBFIS; + void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports); void ahci_uninit(AHCIState *s); -- 1.9.3