Received: from [140.186.70.92] (port=55606 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVEmS-0001T3-Br for qemu-devel@nongnu.org; Tue, 21 Dec 2010 21:50:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVEmR-00055q-0S for qemu-devel@nongnu.org; Tue, 21 Dec 2010 21:50:20 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:53461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVEmQ-000557-F0 for qemu-devel@nongnu.org; Tue, 21 Dec 2010 21:50:18 -0500 Date: Wed, 22 Dec 2010 11:50:14 +0900 From: Isaku Yamahata Subject: Re: [Qemu-devel] [PATCH, RFC] pci: allow PCI devices to fix address space Message-ID: <20101222025014.GA20337@valinux.co.jp> References: <1292973623-2455-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1292973623-2455-1-git-send-email-andreas.faerber@web.de> Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?utf-8?Q?F=C3=A4rber?= Cc: =?utf-8?B?SGVydsOp?= Poussineau , qemu-devel@nongnu.org, "Michael S. Tsirkin" On Wed, Dec 22, 2010 at 12:20:23AM +0100, Andreas F=C3=A4rber wrote: > From: Herv=C3=A9 Poussineau >=20 > v1: > * Rebased. >=20 > Signed-off-by: Herv=C3=A9 Poussineau > Cc: Michael S. Tsirkin > Signed-off-by: Andreas F=C3=A4rber > --- > =20 > Hello Michael, > =20 > Could you please take a look at this? I'm out of my field here. > =20 > The intention of the first part appears to be to save (val & ~mask), > whereas the inline helper would've returned (val & mask). Such behavior is intended. The returned value is just discarded in this case. test-and-clear means clear the bits return if those cleared bits were really set. > The second part makes existing code conditional on that value. What issue are you addressing? Although the spec doesn't says about the default value of BAR registers after reset, the current code assumes that almost all the pci devices cle= ar those registers. Anyway after cold/warm reset firmware sets up BARs, so it doesn't matter. You, however, seem to want to keep BARs over resets. thanks, > =20 > Regards, > Andreas > =20 > hw/pci.c | 22 ++++++++++++++-------- > 1 files changed, 14 insertions(+), 8 deletions(-) >=20 > diff --git a/hw/pci.c b/hw/pci.c > index ef00d20..4db4b1f 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -140,6 +140,7 @@ static void pci_update_irq_status(PCIDevice *dev) > static void pci_device_reset(PCIDevice *dev) > { > int r; > + uint16_t cmd; > /* TODO: call the below unconditionally once all pci devices > * are qdevified */ > if (dev->qdev.info) { > @@ -149,9 +150,10 @@ static void pci_device_reset(PCIDevice *dev) > dev->irq_state =3D 0; > 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->w1cmask + PCI_COMMA= ND)); > + cmd =3D pci_get_word(dev->config + PCI_COMMAND); > + cmd &=3D ~(pci_get_word(dev->wmask + PCI_COMMAND) | > + pci_get_word(dev->w1cmask + PCI_COMMAND)); > + pci_set_word(dev->config + PCI_COMMAND, cmd); > pci_word_test_and_clear_mask(dev->config + PCI_STATUS, > pci_get_word(dev->wmask + PCI_STATUS)= | > pci_get_word(dev->w1cmask + PCI_STATU= S)); > @@ -163,11 +165,15 @@ static void pci_device_reset(PCIDevice *dev) > continue; > } > =20 > - if (!(region->type & PCI_BASE_ADDRESS_SPACE_IO) && > - region->type & PCI_BASE_ADDRESS_MEM_TYPE_64) { > - pci_set_quad(dev->config + pci_bar(dev, r), region->type); > - } else { > - pci_set_long(dev->config + pci_bar(dev, r), region->type); > + if ((region->type =3D=3D PCI_BASE_ADDRESS_SPACE_IO && !(cmd & = PCI_COMMAND_MEMORY)) || > + (region->type =3D=3D PCI_BASE_ADDRESS_SPACE_MEMORY && !(cm= d & PCI_COMMAND_IO))) { > + /* Reset region address, as it it is not read-only */ > + if (!(region->type & PCI_BASE_ADDRESS_SPACE_IO) && > + region->type & PCI_BASE_ADDRESS_MEM_TYPE_64) { > + pci_set_quad(dev->config + pci_bar(dev, r), region->ty= pe); > + } else { > + pci_set_long(dev->config + pci_bar(dev, r), region->ty= pe); > + } > } > } > pci_update_mappings(dev); > --=20 > 1.7.3.4 >=20 >=20 --=20 yamahata