Re: [PATCH 19/21] tile/PCI: Use pci_scan_root_bus instead pci_scan_bus
From: Yinghai Lu
Date: Wed May 09 2012 - 15:45:52 EST
On Wed, May 9, 2012 at 12:32 PM, Chris Metcalf <cmetcalf@xxxxxxxxxx> wrote:
> On 5/7/2012 4:30 PM, Yinghai Lu wrote:
>> It will update busn_res accordingly, so we get that for last_busno.
>>
>> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
>> Cc: Chris Metcalf <cmetcalf@xxxxxxxxxx>
>> ---
>> arch/tile/kernel/pci.c | 5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
>> index 7aa2743..4a951b87 100644
>> --- a/arch/tile/kernel/pci.c
>> +++ b/arch/tile/kernel/pci.c
>> @@ -310,6 +310,7 @@ int __devinit pcibios_init(void)
>> if (pci_scan_flags[i] == 0 && controllers[i].ops != NULL) {
>> struct pci_controller *controller = &controllers[i];
>> struct pci_bus *bus;
>> + LIST_HEAD(resources);
>>
>> if (tile_init_irqs(i, controller)) {
>> pr_err("PCI: Could not initialize IRQs\n");
>> @@ -327,7 +328,9 @@ int __devinit pcibios_init(void)
>> * This is inlined in linux/pci.h and calls into
>> * pci_scan_bus_parented() in probe.c.
>> */
>> - bus = pci_scan_bus(0, controller->ops, controller);
>> + pci_add_resource(&resources, &ioport_resource);
>> + pci_add_resource(&resources, &iomem_resource);
>> + bus = pci_scan_root_bus(NULL, 0, controller->ops, controller, &resources);
>> controller->root_bus = bus;
>> controller->last_busno = bus->busn_res.end;
>> }
>
> We don't want ioport_resource on tilepro, since we don't support accessing
> I/O port space.
>
> With that one line removed:
>
> Acked-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Thanks.
>
> Or, I can queue this change to take through the tile tree when the merge
> window opens. Which would you prefer?
have to go through pci-next tree. because other change like
controller->last_busno = bus->busn_res.end;
is in pci-next.
Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/