aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/setup-res.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-01-21 05:08:17 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-14 11:44:50 -0500
commita4ac9fea016fc5c09227eb479bd35e34978323a4 (patch)
treefcf35e3d704afc5de48c304dd365880fe03a7bf3 /drivers/pci/setup-res.c
parent0dea210b1769f191d6b2bc3cc86e51481837ec5e (diff)
PCI : Calculate right add_size
During debug of one SRIOV enabled hotplug device, we found found that add_size is not passed properly. The device has devices under two level bridges: +-[0000:80]-+-00.0-[81-8f]-- | +-01.0-[90-9f]-- | +-02.0-[a0-af]----00.0-[a1-a3]--+-02.0-[a2]--+-00.0 Oracle Corporation Device | | \-03.0-[a3]--+-00.0 Oracle Corporation Device Which means later the parent bridge will not try to add a big enough range: [ 557.455077] pci 0000:a0:00.0: BAR 14: assigned [mem 0xf9000000-0xf93fffff] [ 557.461974] pci 0000:a0:00.0: BAR 15: assigned [mem 0xf6000000-0xf61fffff pref] [ 557.469340] pci 0000:a1:02.0: BAR 14: assigned [mem 0xf9000000-0xf91fffff] [ 557.476231] pci 0000:a1:02.0: BAR 15: assigned [mem 0xf6000000-0xf60fffff pref] [ 557.483582] pci 0000:a1:03.0: BAR 14: assigned [mem 0xf9200000-0xf93fffff] [ 557.490468] pci 0000:a1:03.0: BAR 15: assigned [mem 0xf6100000-0xf61fffff pref] [ 557.497833] pci 0000:a1:03.0: BAR 14: can't assign mem (size 0x200000) [ 557.504378] pci 0000:a1:03.0: failed to add optional resources res=[mem 0xf9200000-0xf93fffff] [ 557.513026] pci 0000:a1:02.0: BAR 14: can't assign mem (size 0x200000) [ 557.519578] pci 0000:a1:02.0: failed to add optional resources res=[mem 0xf9000000-0xf91fffff] It turns out we did not calculate size1 properly. static resource_size_t calculate_memsize(resource_size_t size, resource_size_t min_size, resource_size_t size1, resource_size_t old_size, resource_size_t align) { if (size < min_size) size = min_size; if (old_size == 1 ) old_size = 0; if (size < old_size) size = old_size; size = ALIGN(size + size1, align); return size; } We should not pass add_size with min_size in calculate_memsize since that will make add_size not contribute final add_size. So just pass add_size with size1 to calculate_memsize(). With this change, we should have chance to remove extra addon in pci_reassign_resource. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/setup-res.c')
-rw-r--r--drivers/pci/setup-res.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 6923a9bce49e..241de6c2b9cd 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -255,11 +255,12 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
255 return -EINVAL; 255 return -EINVAL;
256 } 256 }
257 257
258 new_size = resource_size(res) + addsize + min_align; 258 /* already aligned with min_align */
259 new_size = resource_size(res) + addsize;
259 ret = _pci_assign_resource(dev, resno, new_size, min_align); 260 ret = _pci_assign_resource(dev, resno, new_size, min_align);
260 if (!ret) { 261 if (!ret) {
261 res->flags &= ~IORESOURCE_STARTALIGN; 262 res->flags &= ~IORESOURCE_STARTALIGN;
262 dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res); 263 dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res);
263 if (resno < PCI_BRIDGE_RESOURCES) 264 if (resno < PCI_BRIDGE_RESOURCES)
264 pci_update_resource(dev, resno); 265 pci_update_resource(dev, resno);
265 } 266 }