aboutsummaryrefslogtreecommitdiffstats
path: root/src/fw/pciinit.c
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2014-04-10 21:55:21 +0300
committerKevin O'Connor <kevin@koconnor.net>2014-04-16 10:49:20 -0400
commitc6e298e1f12e0f4ca02b6da5e42919ae055f6830 (patch)
tree66f82014173389a4475dc4367051add4fb77d8e9 /src/fw/pciinit.c
parentfe2cbf6d606e138055b00b0aac6162503a5fb38d (diff)
downloadseabios-c6e298e1f12e0f4ca02b6da5e42919ae055f6830.tar.gz
hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached
If a pci-2-pci bridge supports hot-plug functionality but there are no devices connected to it, reserve IO/mem in order to be able to attach devices later. Do not waste space, use minimum allowed. Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Diffstat (limited to 'src/fw/pciinit.c')
-rw-r--r--src/fw/pciinit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c
index 64f1d414..9b5d7adc 100644
--- a/src/fw/pciinit.c
+++ b/src/fw/pciinit.c
@@ -677,12 +677,15 @@ static int pci_bios_check_devices(struct pci_bus *busses)
continue;
struct pci_bus *parent = &busses[pci_bdf_to_bus(s->bus_dev->bdf)];
int type;
+ u8 shpc_cap = pci_find_capability(s->bus_dev, PCI_CAP_ID_SHPC);
for (type = 0; type < PCI_REGION_TYPE_COUNT; type++) {
u64 align = (type == PCI_REGION_TYPE_IO) ?
PCI_BRIDGE_IO_MIN : PCI_BRIDGE_MEM_MIN;
if (pci_region_align(&s->r[type]) > align)
align = pci_region_align(&s->r[type]);
u64 sum = pci_region_sum(&s->r[type]);
+ if (!sum && shpc_cap)
+ sum = align; /* reserve min size for hot-plug */
u64 size = ALIGN(sum, align);
int is64 = pci_bios_bridge_region_is64(&s->r[type],
s->bus_dev, type);