linux-kernel - Re: [PATCH v4 01/30] PCI: Rip out pci_bus_add_devices() from pci_scan

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <54F50A77.7040703@huawei.com>
Date:	Tue, 3 Mar 2015 09:12:23 +0800
From:	Yijing Wang <wangyijing@...wei.com>
To:	Bjorn Helgaas <bhelgaas@...gle.com>
CC:	Jiang Liu <jiang.liu@...ux.intel.com>, <linux-pci@...r.kernel.org>,
	Yinghai Lu <yinghai@...nel.org>,
	<linux-kernel@...r.kernel.org>,
	Marc Zyngier <marc.zyngier@....com>,
	<linux-arm-kernel@...ts.infradead.org>,
	Russell King <linux@....linux.org.uk>, <x86@...nel.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Tony Luck <tony.luck@...el.com>, <linux-ia64@...r.kernel.org>,
	"David S. Miller" <davem@...emloft.net>,
	"Guan Xuetao" <gxt@...c.pku.edu.cn>, <linux-alpha@...r.kernel.org>,
	<linux-m68k@...ts.linux-m68k.org>, Liviu Dudau <liviu@...au.co.uk>,
	"Arnd Bergmann" <arnd@...db.de>,
	Geert Uytterhoeven <geert@...ux-m68k.org>,
	"Richard Henderson" <rth@...ddle.net>,
	Ivan Kokshaysky <ink@...assic.park.msu.ru>,
	"Matt Turner" <mattst88@...il.com>, <sparclinux@...r.kernel.org>
Subject: Re: [PATCH v4 01/30] PCI: Rip out pci_bus_add_devices() from pci_scan_bus()

>>  	pbm->pci_bus = pci_scan_bus(pbm->pci_first_busno, &pcic_ops, pbm);
>> +	if (pbm->pci_bus)
>> +		pci_bus_add_devices(pbm->pci_bus);
>>  #if 0 /* deadwood transplanted from sparc64 */
>>  	pci_fill_in_pbm_cookies(pbm->pci_bus, pbm, pbm->prom_node);
>>  	pci_record_assignments(pbm, pbm->pci_bus);
> 
> This is correct, but it should look like this instead:
> 
>     if (!pbm->pci_bus)
>       return;
>   #if 0 /* deadwood ... */
>   ...
>   #endif
>     pci_bus_add_devices(pbm->pci_bus);
>   }
> 
> That way the mainline code is the normal path, and pci_bus_add_devices() is
> in the correct place even if the "deadwood" code is resurrected.
> 

Yes, you are right, thanks!

> 
>> diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
>> index 374a055..3d82024 100644
>> --- a/arch/unicore32/kernel/pci.c
>> +++ b/arch/unicore32/kernel/pci.c
>> @@ -266,17 +266,12 @@ static int __init pci_common_init(void)
>>  	pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
>>  
>>  	if (!pci_has_flag(PCI_PROBE_ONLY)) {
>> -		/*
>> -		 * Size the bridge windows.
>> -		 */
>> +		/* Size the bridge windows. */
>>  		pci_bus_size_bridges(puv3_bus);
>> -
>> -		/*
>> -		 * Assign resources.
>> -		 */
>> +		/* Assign resources. */
>>  		pci_bus_assign_resources(puv3_bus);
>>  	}
>> -
>> +	pci_bus_add_devices(puv3_bus);
>>  	return 0;
>>  }
>>  subsys_initcall(pci_common_init);
>> diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
>> index 96c5c72..86e3bfd 100644
>> --- a/drivers/pci/hotplug/ibmphp_core.c
>> +++ b/drivers/pci/hotplug/ibmphp_core.c
>> @@ -738,7 +738,7 @@ static void ibm_unconfigure_device(struct pci_func *func)
>>   */
>>  static u8 bus_structure_fixup(u8 busno)
>>  {
>> -	struct pci_bus *bus;
>> +	struct pci_bus *bus, *b;
>>  	struct pci_dev *dev;
>>  	u16 l;
>>  
>> @@ -765,7 +765,9 @@ static u8 bus_structure_fixup(u8 busno)
>>  					(l != 0x0000) && (l != 0xffff)) {
>>  			debug("%s - Inside bus_structure_fixup()\n",
>>  							__func__);
>> -			pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL);
>> +			b = pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL);
>> +			if (b)
>> +				pci_bus_add_devices(b);
> 
> Use this:
> 
>     if (!b)
>       continue;
>     pci_bus_add_devices(b);
> 
> for the same reason as above.


Will update, thanks!

Thanks!
Yijing.

> 
>>  			break;
>>  		}
>>  	}
>> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
>> index 8d2f400..88604f2 100644
>> --- a/drivers/pci/probe.c
>> +++ b/drivers/pci/probe.c
>> @@ -2123,7 +2123,6 @@ struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
>>  	b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources);
>>  	if (b) {
>>  		pci_scan_child_bus(b);
>> -		pci_bus_add_devices(b);
>>  	} else {
>>  		pci_free_resource_list(&resources);
>>  	}
>> -- 
>> 1.7.1
>>
> 
> .
> 


-- 
Thanks!
Yijing

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/