From patchwork Sat Jun 20 01:50:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 486952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6775B140157 for ; Sat, 20 Jun 2015 11:53:30 +1000 (AEST) Received: from localhost ([::1]:60381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z67yK-0007rC-KE for incoming@patchwork.ozlabs.org; Fri, 19 Jun 2015 21:53:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z67vw-0002zQ-Eq for qemu-devel@nongnu.org; Fri, 19 Jun 2015 21:51:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z67vv-0004GC-HH for qemu-devel@nongnu.org; Fri, 19 Jun 2015 21:51:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z67vs-0004E3-6t; Fri, 19 Jun 2015 21:50:56 -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 (Postfix) with ESMTPS id C59B33070BB; Sat, 20 Jun 2015 01:50:55 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-29.bos.redhat.com [10.18.17.29]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5K1on2x011200; Fri, 19 Jun 2015 21:50:54 -0400 From: John Snow To: qemu-block@nongnu.org Date: Fri, 19 Jun 2015 21:50:37 -0400 Message-Id: <1434765047-29333-7-git-send-email-jsnow@redhat.com> In-Reply-To: <1434765047-29333-1-git-send-email-jsnow@redhat.com> References: <1434765047-29333-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, John Snow , qemu-devel@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 06/16] ahci: add ncq debug checks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Most of the time, these bits can be safely ignored. For the purposes of debugging however, it's nice to know that they're not being used. Signed-off-by: John Snow --- hw/ide/ahci.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 14961a0..8fcea18 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1003,6 +1003,27 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, (uint64_t)ncq_fis->lba0; ncq_tfs->tag = tag; +#ifdef DEBUG_AHCI + /* Sanity-check the NCQ packet */ + if (tag != slot) { + DPRINTF(port, "Warn: NCQ slot (%d) did not match the given tag (%d)\n", + slot, tag); + } + + if (ncq_fis->aux0 || ncq_fis->aux1 || ncq_fis->aux2 || ncq_fis->aux3) { + DPRINTF(port, "Warn: Attempt to use NCQ auxiliary fields.\n"); + } + if (ncq_fis->prio || ncq_fis->icc) { + DPRINTF(port, "Warn: Unsupported attempt to use PRIO/ICC fields\n"); + } + if (ncq_fis->fua & NCQ_FIS_FUA_MASK) { + DPRINTF(port, "Warn: Unsupported attempt to use Force Unit Access\n"); + } + if (ncq_fis->tag & NCQ_FIS_RARC_MASK) { + DPRINTF(port, "Warn: Unsupported attempt to use Rebuild Assist\n"); + } +#endif + ncq_tfs->sector_count = ((uint16_t)ncq_fis->sector_count_high << 8) | ncq_fis->sector_count_low; ahci_populate_sglist(ad, &ncq_tfs->sglist, 0); @@ -1016,6 +1037,10 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, ncq_err(ncq_tfs); ahci_trigger_irq(ad->hba, ad, PORT_IRQ_OVERFLOW); return; + } else if (ncq_tfs->sglist.size != size) { + DPRINTF(port, "Warn: PRDTL (0x%zx)" + " does not match requested size (0x%zx)", + ncq_tfs->sglist.size, size); } DPRINTF(port, "NCQ transfer LBA from %"PRId64" to %"PRId64", "