From patchwork Mon Sep 12 14:19:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 114383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 987EDB6F76 for ; Tue, 13 Sep 2011 01:20:31 +1000 (EST) Received: from localhost ([::1]:37909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37K8-0001sD-TG for incoming@patchwork.ozlabs.org; Mon, 12 Sep 2011 10:17:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jb-0000fC-Lc for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37JV-0006hS-Nb for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37JV-0006hL-Dg for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:45 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8CEGhYa006795 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2011 10:16:43 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8CEGa2Z030698; Mon, 12 Sep 2011 10:16:42 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 12 Sep 2011 16:19:03 +0200 Message-Id: <1315837174-15327-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 04/35] ide: Reject ATA commands specific to drive kinds 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 From: Markus Armbruster ACS-2 Table B.2 explicitly prohibits ATAPI devices from implementing WIN_RECAL, WIN_READ_EXT, WIN_READDMA_EXT, WIN_READ_NATIVE_MAX, WIN_MULTREAD_EXT, WIN_WRITE, WIN_WRITE_ONCE, WIN_WRITE_EXT, WIN_WRITEDMA_EXT, WIN_MULTWRITE_EXT, WIN_WRITE_VERIFY, WIN_VERIFY, WIN_VERIFY_ONCE, WIN_VERIFY_EXT, WIN_SPECIFY, WIN_MULTREAD, WIN_MULTWRITE, WIN_SETMULT, WIN_READDMA, WIN_READDMA_ONCE, WIN_WRITEDMA, WIN_WRITEDMA_ONCE, WIN_FLUSH_CACHE_EXT. Restrict them to IDE_HD and IDE_CFATA. Same for CFA_WRITE_SECT_WO_ERASE, CFA_WRITE_MULTI_WO_ERASE. Restrict them to IDE_CFATA, like the other CFA_ commands. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/ide/core.c | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 4a45b3e..b33f84e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -913,27 +913,27 @@ static const uint8_t ide_cmd_table[0x100] = { [CFA_REQ_EXT_ERROR_CODE] = CFA_OK, [WIN_DSM] = ALL_OK, [WIN_DEVICE_RESET] = CD_OK, - [WIN_RECAL] = ALL_OK, + [WIN_RECAL] = HD_CFA_OK, [WIN_READ] = ALL_OK, [WIN_READ_ONCE] = ALL_OK, - [WIN_READ_EXT] = ALL_OK, - [WIN_READDMA_EXT] = ALL_OK, - [WIN_READ_NATIVE_MAX_EXT] = ALL_OK, - [WIN_MULTREAD_EXT] = ALL_OK, - [WIN_WRITE] = ALL_OK, - [WIN_WRITE_ONCE] = ALL_OK, - [WIN_WRITE_EXT] = ALL_OK, - [WIN_WRITEDMA_EXT] = ALL_OK, - [CFA_WRITE_SECT_WO_ERASE] = ALL_OK, - [WIN_MULTWRITE_EXT] = ALL_OK, - [WIN_WRITE_VERIFY] = ALL_OK, - [WIN_VERIFY] = ALL_OK, - [WIN_VERIFY_ONCE] = ALL_OK, - [WIN_VERIFY_EXT] = ALL_OK, + [WIN_READ_EXT] = HD_CFA_OK, + [WIN_READDMA_EXT] = HD_CFA_OK, + [WIN_READ_NATIVE_MAX_EXT] = HD_CFA_OK, + [WIN_MULTREAD_EXT] = HD_CFA_OK, + [WIN_WRITE] = HD_CFA_OK, + [WIN_WRITE_ONCE] = HD_CFA_OK, + [WIN_WRITE_EXT] = HD_CFA_OK, + [WIN_WRITEDMA_EXT] = HD_CFA_OK, + [CFA_WRITE_SECT_WO_ERASE] = CFA_OK, + [WIN_MULTWRITE_EXT] = HD_CFA_OK, + [WIN_WRITE_VERIFY] = HD_CFA_OK, + [WIN_VERIFY] = HD_CFA_OK, + [WIN_VERIFY_ONCE] = HD_CFA_OK, + [WIN_VERIFY_EXT] = HD_CFA_OK, [WIN_SEEK] = HD_CFA_OK, [CFA_TRANSLATE_SECTOR] = CFA_OK, [WIN_DIAGNOSE] = ALL_OK, - [WIN_SPECIFY] = ALL_OK, + [WIN_SPECIFY] = HD_CFA_OK, [WIN_STANDBYNOW2] = ALL_OK, [WIN_IDLEIMMEDIATE2] = ALL_OK, [WIN_STANDBY2] = ALL_OK, @@ -945,14 +945,14 @@ static const uint8_t ide_cmd_table[0x100] = { [WIN_SMART] = HD_CFA_OK, [CFA_ACCESS_METADATA_STORAGE] = CFA_OK, [CFA_ERASE_SECTORS] = CFA_OK, - [WIN_MULTREAD] = ALL_OK, - [WIN_MULTWRITE] = ALL_OK, - [WIN_SETMULT] = ALL_OK, - [WIN_READDMA] = ALL_OK, - [WIN_READDMA_ONCE] = ALL_OK, - [WIN_WRITEDMA] = ALL_OK, - [WIN_WRITEDMA_ONCE] = ALL_OK, - [CFA_WRITE_MULTI_WO_ERASE] = ALL_OK, + [WIN_MULTREAD] = HD_CFA_OK, + [WIN_MULTWRITE] = HD_CFA_OK, + [WIN_SETMULT] = HD_CFA_OK, + [WIN_READDMA] = HD_CFA_OK, + [WIN_READDMA_ONCE] = HD_CFA_OK, + [WIN_WRITEDMA] = HD_CFA_OK, + [WIN_WRITEDMA_ONCE] = HD_CFA_OK, + [CFA_WRITE_MULTI_WO_ERASE] = CFA_OK, [WIN_STANDBYNOW1] = ALL_OK, [WIN_IDLEIMMEDIATE] = ALL_OK, [WIN_STANDBY] = ALL_OK, @@ -960,7 +960,7 @@ static const uint8_t ide_cmd_table[0x100] = { [WIN_CHECKPOWERMODE1] = ALL_OK, [WIN_SLEEPNOW1] = ALL_OK, [WIN_FLUSH_CACHE] = ALL_OK, - [WIN_FLUSH_CACHE_EXT] = ALL_OK, + [WIN_FLUSH_CACHE_EXT] = HD_CFA_OK, [WIN_IDENTIFY] = ALL_OK, [WIN_SETFEATURES] = ALL_OK, [IBM_SENSE_CONDITION] = CFA_OK,