From owner-svn-soc-all@FreeBSD.ORG Sat Sep 14 15:53:53 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1A11078F for ; Sat, 14 Sep 2013 15:53:53 +0000 (UTC) (envelope-from zcore@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E39AC2D25 for ; Sat, 14 Sep 2013 15:53:52 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EFrqsx046066 for ; Sat, 14 Sep 2013 15:53:52 GMT (envelope-from zcore@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8EFrqVj046060 for svn-soc-all@FreeBSD.org; Sat, 14 Sep 2013 15:53:52 GMT (envelope-from zcore@FreeBSD.org) Date: Sat, 14 Sep 2013 15:53:52 GMT Message-Id: <201309141553.r8EFrqVj046060@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to zcore@FreeBSD.org using -f From: zcore@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257328 - soc2013/zcore/head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 15:53:53 -0000 Author: zcore Date: Sat Sep 14 15:53:52 2013 New Revision: 257328 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257328 Log: ATA_ATA_IDENTIFY: abort if ATAPI or prdtl is wrong Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c Sat Sep 14 13:12:13 2013 (r257327) +++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c Sat Sep 14 15:53:52 2013 (r257328) @@ -433,19 +433,21 @@ } static void -handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis) +handle_identify(struct ahci_port *p, int slot, uint8_t *cfis) { + struct ahci_cmd_hdr *hdr; struct pci_ahci_softc *sc = p->pr_sc; - struct ahci_prdt_entry *prdt = (struct ahci_prdt_entry *)(cfis + 0x80); - switch(cfis[2]) { - case ATA_ATA_IDENTIFY: - { + hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + if (p->atapi || hdr->prdtl == 0) { + p->tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR; + p->is |= AHCI_P_IX_TFE; + } else { uint16_t buf[256]; uint64_t sectors; int i, len; void *from; - struct ahci_cmd_hdr *hdr; + struct ahci_prdt_entry *prdt; sectors = blockif_size(p->bctx) / blockif_sectsz(p->bctx); memset(buf, 0, sizeof(buf)); @@ -489,13 +491,9 @@ buf[101] = (sectors >> 16); buf[102] = (sectors >> 32); buf[103] = (sectors >> 48); - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; - if (hdr->prdtl == 0) { - WPRINTF(("wrong prdtl\n")); - return; - } len = sizeof(buf); from = buf; + prdt = (struct ahci_prdt_entry *)(cfis + 0x80); for (i = 0; i < hdr->prdtl && len; i++) { uint8_t *p = paddr_guest2host(ahci_ctx(sc), prdt->dba, prdt->dbc + 1); @@ -507,10 +505,18 @@ hdr->prdbc = sizeof(buf) - len; p->tfd = ATA_S_DSC | ATA_S_READY; p->is |= AHCI_P_IX_DP; - p->ci &= ~(1 << slot); - ahci_generate_intr(sc); - break; } + p->ci &= ~(1 << slot); + ahci_generate_intr(sc); +} + +static void +handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis) +{ + switch(cfis[2]) { + case ATA_ATA_IDENTIFY: + handle_identify(p, slot, cfis); + break; case ATA_SETFEATURES: { switch (cfis[3]) { @@ -541,7 +547,7 @@ } p->is |= AHCI_P_IX_DP; p->ci &= ~(1 << slot); - ahci_generate_intr(sc); + ahci_generate_intr(p->pr_sc); break; } case ATA_SET_MULTI: @@ -555,7 +561,7 @@ } p->is |= AHCI_P_IX_DP; p->ci &= ~(1 << slot); - ahci_generate_intr(sc); + ahci_generate_intr(p->pr_sc); break; case ATA_READ_DMA: case ATA_WRITE_DMA: @@ -581,7 +587,7 @@ p->tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR; p->is |= AHCI_P_IX_TFE; p->ci &= ~(1 << slot); - ahci_generate_intr(sc); + ahci_generate_intr(p->pr_sc); break; } }