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 <dev@xxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
