From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40334 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBKaO-0003kN-Uv for qemu-devel@nongnu.org; Thu, 28 Oct 2010 00:59:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBKaN-0005kA-Ms for qemu-devel@nongnu.org; Thu, 28 Oct 2010 00:59:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBKaN-0005k1-G4 for qemu-devel@nongnu.org; Thu, 28 Oct 2010 00:59:35 -0400 Date: Thu, 28 Oct 2010 06:59:31 +0200 From: "Michael S. Tsirkin" Message-ID: <20101028045931.GC5599@redhat.com> References: <20101027140558.GA3380@redhat.com> <20101028020248.GB2243@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101028020248.GB2243@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH] pci: improve w1c mask handling List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Thu, Oct 28, 2010 at 11:02:48AM +0900, Isaku Yamahata wrote: > On Wed, Oct 27, 2010 at 04:05:58PM +0200, Michael S. Tsirkin wrote: > > - save/restore must not check w1c bits > > since they are in fact guest controlled > > - clear w1c bits on reset > > > > Note: for express there are different kinds of > > reset, some leave part of config space alone. > > We will likely need a sticky bit mask to implement this. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > > > Isaku, does the below make sense? > > > > hw/pci.c | 6 ++++-- > > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/hw/pci.c b/hw/pci.c > > index e50de14..1a14a0e 100644 > > --- a/hw/pci.c > > +++ b/hw/pci.c > > @@ -141,7 +141,8 @@ static void pci_device_reset(PCIDevice *dev) > > pci_update_irq_status(dev); > > /* Clear all writeable bits */ > > pci_word_test_and_clear_mask(dev->config + PCI_COMMAND, > > - pci_get_word(dev->wmask + PCI_COMMAND)); > > + pci_get_word(dev->wmask + PCI_COMMAND) | > > + pci_get_word(dev->w1cmask + PCI_COMMAND)); > > dev->config[PCI_CACHE_LINE_SIZE] = 0x0; > > dev->config[PCI_INTERRUPT_LINE] = 0x0; > > for (r = 0; r < PCI_NUM_REGIONS; ++r) { > > @@ -293,7 +294,8 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) > > > > qemu_get_buffer(f, config, size); > > for (i = 0; i < size; ++i) { > > - if ((config[i] ^ s->config[i]) & s->cmask[i] & ~s->wmask[i]) { > > + if ((config[i] ^ s->config[i]) & > > + s->cmask[i] & ~s->wmask[i] & ~s->w1cmask) { > > [i] is needed for w1cmask. > ~s->w1cmask[i] > ^^^ Yes, I sent out a borken patch but it's correct on my branch. > > > > qemu_free(config); > > return -EINVAL; > > } > > -- > > 1.7.3.2.91.g446ac > > > > -- > yamahata