Re: [git pull] PCI fixes

Yinghai Lu
2011-12-18T02:33:39Z

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

On Sat, Dec 17, 2011 at 9:29 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Ram Pai (1):
>      PCI: defer enablement of SRIOV BARS

oh, no!

It seems you let the old version slip into linus tree.

Now we need attached patch get into linus tree.

Thanks

Yinghai Lu

[-- Attachment #2: fix_sriov_late.patch --]
[-- Type: text/x-patch, Size: 1660 bytes --]

[PATCH] pci: Fix hotplug of Express Module with pci bridges

Found hotplug of one setup does not work with recent change in pci tree.

After checking the bridge conf setup, found bridges get assigned, but not get enabled.

Finally found following commit, simplely ignore bridge resource when enabling pci device.

| commit bbef98ab0f019f1b0c25c1acdf1683c68933d41b
| Author: Ram Pai <linuxram@us.ibm.com>
| Date: Sun Nov 6 10:33:10 2011 +0800
|
| PCI: defer enablement of SRIOV BARS
|...
| NOTE: Note, there is subtle change in the pci_enable_device() API. Any
| driver that depends on SRIOV BARS to be enabled in pci_enable_device()
| can fail.

Put back bridge resource and ROM resource checking to fix the problem.

That should fix regression like BIOS does not assign correct resource to bridge.

Discussion can be found at:
http://www.spinics.net/lists/linux-pci/msg12874.html

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
drivers/pci/pci.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/pci.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci.c
+++ linux-2.6/drivers/pci/pci.c
@@ -1139,7 +1139,11 @@ static int __pci_enable_device_flags(str
if (atomic_add_return(1, &dev->enable_cnt) > 1)
return 0; /* already enabled */

- for (i = 0; i < PCI_ROM_RESOURCE; i++)
+ /* only skip sriov related */
+ for (i = 0; i <= PCI_ROM_RESOURCE; i++)
+ if (dev->resource[i].flags & flags)
+ bars |= (1 << i);
+ for (i = PCI_BRIDGE_RESOURCES; i < DEVICE_COUNT_RESOURCE; i++)
if (dev->resource[i].flags & flags)
bars |= (1 << i);