From patchwork Wed Jul 3 21:51:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 256763 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7D6C02C00A3 for ; Thu, 4 Jul 2013 07:51:37 +1000 (EST) Received: from localhost ([::1]:46370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuUxb-0000UI-Aw for incoming@patchwork.ozlabs.org; Wed, 03 Jul 2013 17:51:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuUxA-0000Tm-VY for qemu-devel@nongnu.org; Wed, 03 Jul 2013 17:51:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UuUx9-00057m-06 for qemu-devel@nongnu.org; Wed, 03 Jul 2013 17:51:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuUx8-000578-Pc for qemu-devel@nongnu.org; Wed, 03 Jul 2013 17:51:06 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r63Lp6ab017270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Jul 2013 17:51:06 -0400 Received: from [10.3.113.13] ([10.3.113.13]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r63Lp52C026579; Wed, 3 Jul 2013 17:51:05 -0400 Message-ID: <1372888265.2883.218.camel@ul30vt.home> From: Alex Williamson To: Stefan Hajnoczi Date: Wed, 03 Jul 2013 15:51:05 -0600 In-Reply-To: <1372887676.2883.216.camel@ul30vt.home> References: <1372065035-19601-1-git-send-email-stefanha@redhat.com> <1372065035-19601-13-git-send-email-stefanha@redhat.com> <1372887676.2883.216.camel@ul30vt.home> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Anthony Liguori , qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH 12/23] ide: Convert FLUSH CACHE to ide_cmd_table handler 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 On Wed, 2013-07-03 at 15:41 -0600, Alex Williamson wrote: > On Mon, 2013-06-24 at 11:10 +0200, Stefan Hajnoczi wrote: > > From: Kevin Wolf > > > > Signed-off-by: Kevin Wolf > > Signed-off-by: Stefan Hajnoczi > > --- > > hw/ide/core.c | 14 ++++++++------ > > 1 file changed, 8 insertions(+), 6 deletions(-) > > > > diff --git a/hw/ide/core.c b/hw/ide/core.c > > index 8789758..83e86aa 100644 > > --- a/hw/ide/core.c > > +++ b/hw/ide/core.c > > @@ -1184,6 +1184,12 @@ static bool cmd_write_dma(IDEState *s, uint8_t cmd) > > return false; > > } > > > > +static bool cmd_flush_cache(IDEState *s, uint8_t cmd) > > +{ > > + ide_flush_cache(s); > > + return false; > > +} > > + > > static bool cmd_read_native_max(IDEState *s, uint8_t cmd) > > { > > bool lba48 = (cmd == WIN_READ_NATIVE_MAX_EXT); > > @@ -1345,8 +1351,8 @@ static const struct { > > [WIN_SETIDLE1] = { cmd_nop, ALL_OK }, > > [WIN_CHECKPOWERMODE1] = { cmd_check_power_mode, ALL_OK | SET_DSC }, > > [WIN_SLEEPNOW1] = { cmd_nop, ALL_OK }, > > - [WIN_FLUSH_CACHE] = { NULL, ALL_OK }, > > - [WIN_FLUSH_CACHE_EXT] = { NULL, HD_CFA_OK }, > > + [WIN_FLUSH_CACHE] = { cmd_flush_cache, ALL_OK }, > > + [WIN_FLUSH_CACHE_EXT] = { cmd_flush_cache, HD_CFA_OK }, > > [WIN_IDENTIFY] = { cmd_identify, ALL_OK }, > > [WIN_SETFEATURES] = { cmd_set_features, ALL_OK | SET_DSC }, > > [IBM_SENSE_CONDITION] = { NULL, CFA_OK }, > > @@ -1403,10 +1409,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) > > } > > > > switch(val) { > > - case WIN_FLUSH_CACHE: > > - case WIN_FLUSH_CACHE_EXT: > > - ide_flush_cache(s); > > - break; > > case WIN_SEEK: > > /* XXX: Check that seek is within bounds */ > > s->status = READY_STAT | SEEK_STAT; > > This also breaks win7 x64 q35 IDE. Note that while this change looks > like a no-op, filling in a handler now means that we do: > > s->status = READY_STAT | BUSY_STAT; > > before calling the handler and don't clear it on the way out since the > function statically returns false. This then introduces the same bug as > f68ec837. Thanks, This seems to work around the bug, but I'll leave it to those of you who actually know how IDE works for a proper fix: diff --git a/hw/ide/core.c b/hw/ide/core.c index 96b468c..8893849 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1186,6 +1186,7 @@ static bool cmd_write_dma(IDEState *s, uint8_t cmd) static bool cmd_flush_cache(IDEState *s, uint8_t cmd) { ide_flush_cache(s); + s->status &= ~BUSY_STAT; return false; }