| Message ID | 1358495602-22867-3-git-send-email-yinghai@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
On Thursday, January 17, 2013 11:53:13 PM Yinghai Lu wrote: > We can stop trying according to try_number now and do not need to use > root_bus checking as stop sign. > > In extreme case we could need to reallocate resource for device just > under root bus. For pci root bus hot-add, we need to retry to assign > resources to pci devices just under pci root bus. > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/setup-bus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c > index 6d3591d..7e8739e 100644 > --- a/drivers/pci/setup-bus.c > +++ b/drivers/pci/setup-bus.c > @@ -283,7 +283,7 @@ static void assign_requested_resources_sorted(struct list_head *head, > idx = res - &dev_res->dev->resource[0]; > if (resource_size(res) && > pci_assign_resource(dev_res->dev, idx)) { > - if (fail_head && !pci_is_root_bus(dev_res->dev->bus)) { > + if (fail_head) { > /* > * if the failed res is for ROM BAR, and it will > * be enabled later, don't add it to the list >
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 6d3591d..7e8739e 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -283,7 +283,7 @@ static void assign_requested_resources_sorted(struct list_head *head, idx = res - &dev_res->dev->resource[0]; if (resource_size(res) && pci_assign_resource(dev_res->dev, idx)) { - if (fail_head && !pci_is_root_bus(dev_res->dev->bus)) { + if (fail_head) { /* * if the failed res is for ROM BAR, and it will * be enabled later, don't add it to the list
We can stop trying according to try_number now and do not need to use root_bus checking as stop sign. In extreme case we could need to reallocate resource for device just under root bus. For pci root bus hot-add, we need to retry to assign resources to pci devices just under pci root bus. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/setup-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)