From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqGrW-0003UH-GE for barebox@lists.infradead.org; Mon, 17 Nov 2014 07:36:39 +0000 Date: Mon, 17 Nov 2014 08:36:16 +0100 From: Sascha Hauer Message-ID: <20141117073616.GZ30369@pengutronix.de> References: <1415823877-7379-1-git-send-email-dev@lynxeye.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1415823877-7379-1-git-send-email-dev@lynxeye.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/3] pci: correct BAR size calculation To: Lucas Stach Cc: barebox@lists.infradead.org On Wed, Nov 12, 2014 at 09:24:35PM +0100, Lucas Stach wrote: > The previous math would return negative sizes > for some BARs. > > Signed-off-by: Lucas Stach Applied all, thanks Sascha > --- > drivers/pci/pci.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index ba9d097..87c2fca 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -154,7 +154,7 @@ static void setup_device(struct pci_dev *dev, int max_bar) > } > > if (mask & 0x01) { /* IO */ > - size = -(mask & 0xfffffffe); > + size = ((~(mask & 0xfffffffe)) & 0xffff) + 1; > DBG(" PCI: pbar%d: mask=%08x io %d bytes\n", bar, mask, size); > if (last_io + size > > dev->bus->resource[PCI_BUS_RESOURCE_IO]->end) { > @@ -167,7 +167,7 @@ static void setup_device(struct pci_dev *dev, int max_bar) > last_io += size; > } else if ((mask & PCI_BASE_ADDRESS_MEM_PREFETCH) && > last_mem_pref) /* prefetchable MEM */ { > - size = -(mask & 0xfffffff0); > + size = (~(mask & 0xfffffff0)) + 1; > DBG(" PCI: pbar%d: mask=%08x P memory %d bytes\n", > bar, mask, size); > if (last_mem_pref + size > > @@ -181,7 +181,7 @@ static void setup_device(struct pci_dev *dev, int max_bar) > last_addr = last_mem_pref; > last_mem_pref += size; > } else { /* non-prefetch MEM */ > - size = -(mask & 0xfffffff0); > + size = (~(mask & 0xfffffff0)) + 1; > DBG(" PCI: pbar%d: mask=%08x NP memory %d bytes\n", > bar, mask, size); > if (last_mem + size > > -- > 1.9.3 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox