From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL78o-000399-B4 for qemu-devel@nongnu.org; Sun, 15 Sep 2013 03:53:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VL78i-0007ca-PV for qemu-devel@nongnu.org; Sun, 15 Sep 2013 03:53:10 -0400 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:51124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL78i-0007cF-5c for qemu-devel@nongnu.org; Sun, 15 Sep 2013 03:53:04 -0400 Message-ID: <52356757.4010303@reactos.org> Date: Sun, 15 Sep 2013 09:52:55 +0200 From: =?ISO-8859-1?Q?Herv=E9_Poussineau?= MIME-Version: 1.0 References: <1379073525-20995-1-git-send-email-hpoussin@reactos.org> <20130915063515.GA29086@redhat.com> In-Reply-To: <20130915063515.GA29086@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] pci: remove explicit check to 64K ioport size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org Michael S. Tsirkin a =E9crit : > On Fri, Sep 13, 2013 at 01:58:44PM +0200, Herv=E9 Poussineau wrote: >> This check is useless, as bigger addresses will be ignored when >> added to 'io' MemoryRegion, which has a size of 64K. >> >> However, some architectures don't use the 'io' MemoryRegion, like >> the alpha and versatile platforms. They create a PCI I/O region >> bigger than 64K, so let them handle PCI I/O BARs in the higher range. >> >> Signed-off-by: Herv=E9 Poussineau >> --- >> hw/pci/pci.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/hw/pci/pci.c b/hw/pci/pci.c >> index d00682e..a8e2b29 100644 >> --- a/hw/pci/pci.c >> +++ b/hw/pci/pci.c >> @@ -1028,8 +1028,7 @@ static pcibus_t pci_bar_address(PCIDevice *d, >> } >> new_addr =3D pci_get_long(d->config + bar) & ~(size - 1); >> last_addr =3D new_addr + size - 1; >> - /* NOTE: we have only 64K ioports on PC */ >> - if (last_addr <=3D new_addr || new_addr =3D=3D 0 || last_addr= > UINT16_MAX) { >> + if (last_addr <=3D new_addr || new_addr =3D=3D 0) { >> return PCI_BAR_UNMAPPED; >> } >> return new_addr; >> --=20 >> 1.7.10.4 >=20 > We still didn't fix the overlap for PCI BARs properly > so it looks like the following is needed on top. > Could you please check whether this works for you on versatile/alpha? Yes, alpha and versatile still seem to work. Herv=E9 >=20 > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index d452135..3118854 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1028,7 +1028,10 @@ static pcibus_t pci_bar_address(PCIDevice *d, > } > new_addr =3D pci_get_long(d->config + bar) & ~(size - 1); > last_addr =3D new_addr + size - 1; > - if (last_addr <=3D new_addr || new_addr =3D=3D 0) { > + /* Check if BAR is being sized explicitly. > + * TODO: make priorities correct and remove this work around. > + */ > + if (last_addr <=3D new_addr || new_addr =3D=3D 0 || last_addr = >=3D UINT32_MAX) { > return PCI_BAR_UNMAPPED; > } > return new_addr; >=20