From patchwork Wed Feb 10 22:37:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 45064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1C9ECB7CE6 for ; Thu, 11 Feb 2010 09:43:36 +1100 (EST) Received: from localhost ([127.0.0.1]:37551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfLHQ-0003mu-HA for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 17:43:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfLBn-0001xt-5i for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:37:43 -0500 Received: from [199.232.76.173] (port=48302 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfLBm-0001xY-O0 for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:37:42 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfLBk-0007PL-3r for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:37:42 -0500 Received: from verein.lst.de ([213.95.11.210]:52373) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1NfLBj-0007P8-IP for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:37:39 -0500 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id o1AMbbWY011466 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Wed, 10 Feb 2010 23:37:37 +0100 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o1AMbbod011463; Wed, 10 Feb 2010 23:37:37 +0100 Date: Wed, 10 Feb 2010 23:37:37 +0100 From: Christoph Hellwig To: qemu-devel@nongnu.org, "Martin K. Petersen" Message-ID: <20100210223737.GD11405@lst.de> References: <20100210223649.GA11405@lst.de> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100210223649.GA11405@lst.de> User-Agent: Mutt/1.3.28i X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 4/5] scsi: add topology support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Export the physical block size in the READ CAPACITY (16) command, and add the new block limits VPD page to export the minimum and optiomal I/O sizes. Note that we also need to bump the scsi revision level to SPC-2 as that is the minimum requirement by at least the Linux kernel to try READ CAPACITY (16) first and look at the block limits VPD page. Signed-off-by: Christoph Hellwig Index: qemu/hw/scsi-disk.c =================================================================== --- qemu.orig/hw/scsi-disk.c 2010-02-10 23:27:55.123255565 +0100 +++ qemu/hw/scsi-disk.c 2010-02-10 23:31:45.355004273 +0100 @@ -349,10 +349,11 @@ static int scsi_disk_emulate_inquiry(SCS case 0x00: /* Supported page codes, mandatory */ DPRINTF("Inquiry EVPD[Supported pages] " "buffer size %zd\n", req->cmd.xfer); - outbuf[buflen++] = 3; // number of pages + outbuf[buflen++] = 4; // number of pages outbuf[buflen++] = 0x00; // list of supported pages (this page) outbuf[buflen++] = 0x80; // unit serial number outbuf[buflen++] = 0x83; // device identification + outbuf[buflen++] = 0xb0; // block device characteristics break; case 0x80: /* Device serial number, optional */ @@ -394,6 +395,27 @@ static int scsi_disk_emulate_inquiry(SCS buflen += id_len; break; } + case 0xb0: /* block device characteristics */ + { + unsigned int min_io_size = s->qdev.conf.min_io_size >> 9; + unsigned int opt_io_size = s->qdev.conf.opt_io_size >> 9; + + /* required VPD size with unmap support */ + outbuf[3] = buflen = 0x3c; + + memset(outbuf + 4, 0, buflen - 4); + + /* optimal transfer length granularity */ + outbuf[6] = (min_io_size >> 8) & 0xff; + outbuf[7] = min_io_size & 0xff; + + /* optimal transfer length */ + outbuf[12] = (opt_io_size >> 24) & 0xff; + outbuf[13] = (opt_io_size >> 16) & 0xff; + outbuf[14] = (opt_io_size >> 8) & 0xff; + outbuf[15] = opt_io_size & 0xff; + break; + } default: BADF("Error: unsupported Inquiry (EVPD[%02X]) " "buffer size %zd\n", page_code, req->cmd.xfer); @@ -440,7 +462,7 @@ static int scsi_disk_emulate_inquiry(SCS memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION, 4); /* Identify device as SCSI-3 rev 1. Some later commands are also implemented. */ - outbuf[2] = 3; + outbuf[2] = 5; outbuf[3] = 2; /* Format 2 */ if (buflen > 36) { @@ -794,6 +816,8 @@ static int scsi_disk_emulate_command(SCS outbuf[9] = 0; outbuf[10] = s->cluster_size * 2; outbuf[11] = 0; + outbuf[12] = 0; + outbuf[13] = get_physical_block_exp(&s->qdev.conf); /* Protection, exponent and lowest lba field left blank. */ buflen = req->cmd.xfer; break;