From patchwork Sun Sep 15 06:35:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 275003 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 416992C009D for ; Sun, 15 Sep 2013 16:34:10 +1000 (EST) Received: from localhost ([::1]:55564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL5uK-0007LN-DG for incoming@patchwork.ozlabs.org; Sun, 15 Sep 2013 02:34:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL5tQ-0006Rg-O5 for qemu-devel@nongnu.org; Sun, 15 Sep 2013 02:33:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VL5tL-0004e6-Sy for qemu-devel@nongnu.org; Sun, 15 Sep 2013 02:33:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VL5tL-0004e1-La for qemu-devel@nongnu.org; Sun, 15 Sep 2013 02:33:07 -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 r8F6X69V025265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 15 Sep 2013 02:33:06 -0400 Received: from redhat.com (vpn1-4-98.ams2.redhat.com [10.36.4.98]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r8F6X4rl019295; Sun, 15 Sep 2013 02:33:05 -0400 Date: Sun, 15 Sep 2013 09:35:15 +0300 From: "Michael S. Tsirkin" To: =?iso-8859-1?Q?Herv=E9?= Poussineau Message-ID: <20130915063515.GA29086@redhat.com> References: <1379073525-20995-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1379073525-20995-1-git-send-email-hpoussin@reactos.org> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id r8F6X69V025265 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH] pci: remove explicit check to 64K ioport size 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 Fri, Sep 13, 2013 at 01:58:44PM +0200, Hervé 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é 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 = pci_get_long(d->config + bar) & ~(size - 1); > last_addr = new_addr + size - 1; > - /* NOTE: we have only 64K ioports on PC */ > - if (last_addr <= new_addr || new_addr == 0 || last_addr > UINT16_MAX) { > + if (last_addr <= new_addr || new_addr == 0) { > return PCI_BAR_UNMAPPED; > } > return new_addr; > -- > 1.7.10.4 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? 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 = pci_get_long(d->config + bar) & ~(size - 1); last_addr = new_addr + size - 1; - if (last_addr <= new_addr || new_addr == 0) { + /* Check if BAR is being sized explicitly. + * TODO: make priorities correct and remove this work around. + */ + if (last_addr <= new_addr || new_addr == 0 || last_addr >= UINT32_MAX) { return PCI_BAR_UNMAPPED; } return new_addr;