2c2
< * Copyright (c) 2009 ARM Limited
---
> * Copyright (c) 2009, 2014 ARM Limited
65a66,80
> RealView::initState()
> {
> Addr junk;
> bool has_gen_pci_host;
> has_gen_pci_host = system->kernelSymtab->findAddress("gen_pci_setup", junk);
>
> if (has_gen_pci_host && !params()->pci_cfg_gen_offsets)
> warn("Kernel supports generic PCI host but PCI Config offsets "
> "configured for legacy. Set pci_cfg_gen_offsets to True");
> if (has_gen_pci_host && !params()->pci_io_base)
> warn("Kernel supports generic PCI host but PCI IO base is set "
> "to 0. Set pci_io_base to the start of PCI IO space");
> }
>
> void
103c118,124
< return params()->pci_cfg_base | ((func & 7) << 16) | ((dev & 0x1f) << 19);
---
>
> Addr cfg_offset = 0;
> if (params()->pci_cfg_gen_offsets)
> cfg_offset |= ((func & 7) << 12) | ((dev & 0x1f) << 15);
> else
> cfg_offset |= ((func & 7) << 16) | ((dev & 0x1f) << 19);
> return params()->pci_cfg_base | cfg_offset;
109c130
< return addr;
---
> return params()->pci_io_base + addr;