2005-12-14 01:49:26

by Kristen Carlson Accardi

Subject: [PATCH] acpiphp: only size new bus

Only size the bus that has been added.

Signed-off-by: Kristen Carlson Accardi <[email protected]>

drivers/pci/hotplug/acpiphp_glue.c | 4 +++-
drivers/pci/hotplug/acpiphp_glue.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

--- linux-2.6.15-rc5.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-2.6.15-rc5/drivers/pci/hotplug/acpiphp_glue.c
@@ -794,12 +794,15 @@ static int enable_device(struct acpiphp_
if (PCI_SLOT(dev->devfn) != slot->device)
continue;
if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
- dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+ dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
max = pci_scan_bridge(bus, dev, max, pass);
+ if (pass)
+ if (dev->subordinate)
+ pci_bus_size_bridges(dev->subordinate);
+ }
}
}

- pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus);
acpiphp_sanitize_bus(bus);
pci_enable_bridges(bus);

2005-12-14 04:23:16

by Kenji Kaneshige

Subject: Re: [Pcihpd-discuss] [PATCH] acpiphp: only size new bus

Hi Kristen,

> + if (pass)
> + if (dev->subordinate)
> + pci_bus_size_bridges(dev->subordinate);

How about doing as follows. This also satisfies 80 columns rule.

if (pass && dev->subordinate)
pci_bus_size_bridges(dev->subordinate);

Thanks,
Kenji Kaneshige


Kristen Accardi wrote:
> Only size the bus that has been added.
>
> Signed-off-by: Kristen Carlson Accardi <[email protected]>
>
> drivers/pci/hotplug/acpiphp_glue.c | 4 +++-
> drivers/pci/hotplug/acpiphp_glue.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> --- linux-2.6.15-rc5.orig/drivers/pci/hotplug/acpiphp_glue.c
> +++ linux-2.6.15-rc5/drivers/pci/hotplug/acpiphp_glue.c
> @@ -794,12 +794,15 @@ static int enable_device(struct acpiphp_
> if (PCI_SLOT(dev->devfn) != slot->device)
> continue;
> if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
> - dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
> + dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
> max = pci_scan_bridge(bus, dev, max, pass);
> + if (pass)
> + if (dev->subordinate)
> + pci_bus_size_bridges(dev->subordinate);
> + }
> }
> }
>
> - pci_bus_size_bridges(bus);
> pci_bus_assign_resources(bus);
> acpiphp_sanitize_bus(bus);
> pci_enable_bridges(bus);
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
> for problems? Stop! Download the new AJAX search engine that makes
> searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
> http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
> _______________________________________________
> Pcihpd-discuss mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/pcihpd-discuss
>

2005-12-14 17:37:04

by Kristen Carlson Accardi

Subject: Re: [Pcihpd-discuss] [PATCH] acpiphp: only size new bus

Only size the bus that has been added.

Signed-off-by: Kristen Carlson Accardi <[email protected]>

drivers/pci/hotplug/acpiphp_glue.c | 4 +++-
drivers/pci/hotplug/acpiphp_glue.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

--- linux-2.6.15-rc5.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-2.6.15-rc5/drivers/pci/hotplug/acpiphp_glue.c
@@ -794,12 +794,14 @@ static int enable_device(struct acpiphp_
if (PCI_SLOT(dev->devfn) != slot->device)
continue;
if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
- dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+ dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
max = pci_scan_bridge(bus, dev, max, pass);
+ if (pass && dev->subordinate)
+ pci_bus_size_bridges(dev->subordinate);
+ }
}
}

- pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus);
acpiphp_sanitize_bus(bus);
pci_enable_bridges(bus);