From patchwork Wed Dec 1 19:17:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 73879 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 C8A28B6F14 for ; Thu, 2 Dec 2010 06:19:27 +1100 (EST) Received: from localhost ([127.0.0.1]:34848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNsD6-00038Z-Bk for incoming@patchwork.ozlabs.org; Wed, 01 Dec 2010 14:19:24 -0500 Received: from [140.186.70.92] (port=47394 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNsB5-000302-2B for qemu-devel@nongnu.org; Wed, 01 Dec 2010 14:17:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNsB3-0004tN-23 for qemu-devel@nongnu.org; Wed, 01 Dec 2010 14:17:18 -0500 Received: from cantor.suse.de ([195.135.220.2]:52604 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNsB2-0004sS-Kl for qemu-devel@nongnu.org; Wed, 01 Dec 2010 14:17:16 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 269C4965B9; Wed, 1 Dec 2010 20:17:14 +0100 (CET) From: Alexander Graf To: QEMU-devel Developers Date: Wed, 1 Dec 2010 20:17:07 +0100 Message-Id: <1291231032-21150-6-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1291231032-21150-1-git-send-email-agraf@suse.de> References: <1291231032-21150-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Kevin Wolf , Joerg Roedel , Paul Brook , Blue Swirl , Gerd Hoffmann , Stefan Hajnoczi , tj@kernel.org, Roland Elek , Sebastian Herbszt Subject: [Qemu-devel] [PATCH 05/10] ide: add ncq identify data for ahci sata drives 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 From: Roland Elek I modified ide_identify() to include the zero-based queue length value in word 75, and set bit 8 in word 76 to signal NCQ support in the identify data for AHCI SATA drives. Signed-off-by: Roland Elek Reviewed-by: Stefan Hajnoczi --- hw/ide/core.c | 7 +++++++ hw/ide/internal.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 1680a38..cac209e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -147,6 +147,13 @@ static void ide_identify(IDEState *s) put_le16(p + 66, 120); put_le16(p + 67, 120); put_le16(p + 68, 120); + + if (s->ncq_queues) { + put_le16(p + 75, s->ncq_queues - 1); + /* NCQ supported */ + put_le16(p + 76, (1 << 8)); + } + put_le16(p + 80, 0xf0); /* ata3 -> ata6 supported */ put_le16(p + 81, 0x16); /* conforms to ata5 */ /* 14=NOP supported, 5=WCACHE supported, 0=SMART supported */ diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 1b5e738..85cb938 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -452,6 +452,8 @@ struct IDEState { int smart_errors; uint8_t smart_selftest_count; uint8_t *smart_selftest_data; + /* AHCI */ + int ncq_queues; }; /* This struct represents a device that uses an IDE bus, but requires