From owner-svn-soc-all@FreeBSD.ORG  Sun Sep 15 09:48:50 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9DB2A1A1
 for <svn-soc-all@FreeBSD.org>; Sun, 15 Sep 2013 09:48:50 +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 89BAD285F
 for <svn-soc-all@FreeBSD.org>; Sun, 15 Sep 2013 09:48:50 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F9mo43011437
 for <svn-soc-all@FreeBSD.org>; Sun, 15 Sep 2013 09:48:50 GMT
 (envelope-from zcore@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8F9moDd011432
 for svn-soc-all@FreeBSD.org; Sun, 15 Sep 2013 09:48:50 GMT
 (envelope-from zcore@FreeBSD.org)
Date: Sun, 15 Sep 2013 09:48:50 GMT
Message-Id: <201309150948.r8F9moDd011432@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: r257359 - 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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 09:48:50 -0000

Author: zcore
Date: Sun Sep 15 09:48:50 2013
New Revision: 257359
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257359

Log:
  support ATAPI_REQUEST_SENSE

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	Sun Sep 15 09:48:15 2013	(r257358)
+++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sun Sep 15 09:48:50 2013	(r257359)
@@ -857,6 +857,26 @@
 }
 
 static void
+atapi_request_sense(struct ahci_port *p, int slot, uint8_t *cfis)
+{
+	int len;
+	uint8_t buf[64];
+	uint8_t *acmd = cfis + 0x40;
+
+	len = acmd[4];
+	if (len > sizeof(buf))
+		len = sizeof(buf);
+	memset(buf, 0, len);
+	buf[0] = 0x70 | (1 << 7);
+	buf[2] = p->sense_key;
+	buf[7] = 10;
+	buf[12] = p->asc;
+	write_prdt(p, slot, cfis, buf, len);
+	cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN;
+	ahci_write_fis_d2h(p, slot, cfis, ATA_S_READY | ATA_S_DSC);
+}
+
+static void
 handle_packet_cmd(struct ahci_port *p, int slot, uint8_t *cfis)
 {
 	uint8_t *acmd = cfis + 0x40;
@@ -890,6 +910,9 @@
 	case ATAPI_READ_BIG:
 		atapi_read(p, slot, cfis);
 		break;
+	case ATAPI_REQUEST_SENSE:
+		atapi_request_sense(p, slot, cfis);
+		break;
 	default:
 		break;
 	}