[PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling

[PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling

[Lorenzo Pieralisi]

The PCIe rcar host driver is not used in system configurations
requiring the PCI_PROBE_ONLY flag to be set to prevent resources
assignment, therefore the driver code handling the flag can be
removed from the kernel.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/host/pcie-rcar.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 4edb518..3509218 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -390,9 +390,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
 
 	rcar_pcie_setup(&res, pcie);
 
-	/* Do not reassign resources if probe only */
-	if (!pci_has_flag(PCI_PROBE_ONLY))
-		pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
+	pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
 
 	if (IS_ENABLED(CONFIG_PCI_MSI))
 		bus = pci_scan_root_bus_msi(pcie->dev, pcie->root_bus_nr,
@@ -408,13 +406,11 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
 
 	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
 
-	if (!pci_has_flag(PCI_PROBE_ONLY)) {
-		pci_bus_size_bridges(bus);
-		pci_bus_assign_resources(bus);
+	pci_bus_size_bridges(bus);
+	pci_bus_assign_resources(bus);
 
-		list_for_each_entry(child, &bus->children, node)
-			pcie_bus_configure_settings(child);
-	}
+	list_for_each_entry(child, &bus->children, node)
+		pcie_bus_configure_settings(child);
 
 	pci_bus_add_devices(bus);
 
-- 
2.5.1

[PATCH 2/2] drivers: pci: host: designware: remove PCI_PROBE_ONLY handling

[Lorenzo Pieralisi]

The PCIe designware host driver is not used in system configurations
requiring the PCI_PROBE_ONLY flag to be set to prevent resources
assignment, therefore the driver code handling the flag can be
removed from the kernel.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Pratyush Anand <pratyush.anand@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Gabriele Paoloni <gabriele.paoloni@huawei.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
---
 drivers/pci/host/pcie-designware.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 2171682..a445083 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -551,13 +551,11 @@ int dw_pcie_host_init(struct pcie_port *pp)
 	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
 #endif
 
-	if (!pci_has_flag(PCI_PROBE_ONLY)) {
-		pci_bus_size_bridges(bus);
-		pci_bus_assign_resources(bus);
+	pci_bus_size_bridges(bus);
+	pci_bus_assign_resources(bus);
 
-		list_for_each_entry(child, &bus->children, node)
-			pcie_bus_configure_settings(child);
-	}
+	list_for_each_entry(child, &bus->children, node)
+		pcie_bus_configure_settings(child);
 
 	pci_bus_add_devices(bus);
 	return 0;
-- 
2.5.1

RE: [PATCH 2/2] drivers: pci: host: designware: remove PCI_PROBE_ONLY handling

[Gabriele Paoloni]

TG9va3MgZ29vZCB0byBtZQ0KDQpHYWINCg0KPiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0K
PiBGcm9tOiBMb3JlbnpvIFBpZXJhbGlzaSBbbWFpbHRvOmxvcmVuem8ucGllcmFsaXNpQGFybS5j
b21dDQo+IFNlbnQ6IDI5IEphbnVhcnkgMjAxNiAxMTozMA0KPiBUbzogbGludXgtcGNpQHZnZXIu
a2VybmVsLm9yZw0KPiBDYzogTG9yZW56byBQaWVyYWxpc2k7IFByYXR5dXNoIEFuYW5kOyBBcm5k
IEJlcmdtYW5uOyBKaW5nb28gSGFuOyBCam9ybg0KPiBIZWxnYWFzOyBHYWJyaWVsZSBQYW9sb25p
OyBXYW5nemhvdSAoQikNCj4gU3ViamVjdDogW1BBVENIIDIvMl0gZHJpdmVyczogcGNpOiBob3N0
OiBkZXNpZ253YXJlOiByZW1vdmUgUENJX1BST0JFX09OTFkNCj4gaGFuZGxpbmcNCj4gDQo+IFRo
ZSBQQ0llIGRlc2lnbndhcmUgaG9zdCBkcml2ZXIgaXMgbm90IHVzZWQgaW4gc3lzdGVtIGNvbmZp
Z3VyYXRpb25zDQo+IHJlcXVpcmluZyB0aGUgUENJX1BST0JFX09OTFkgZmxhZyB0byBiZSBzZXQg
dG8gcHJldmVudCByZXNvdXJjZXMNCj4gYXNzaWdubWVudCwgdGhlcmVmb3JlIHRoZSBkcml2ZXIg
Y29kZSBoYW5kbGluZyB0aGUgZmxhZyBjYW4gYmUNCj4gcmVtb3ZlZCBmcm9tIHRoZSBrZXJuZWwu
DQo+IA0KPiBTaWduZWQtb2ZmLWJ5OiBMb3JlbnpvIFBpZXJhbGlzaSA8bG9yZW56by5waWVyYWxp
c2lAYXJtLmNvbT4NCj4gQ2M6IFByYXR5dXNoIEFuYW5kIDxwcmF0eXVzaC5hbmFuZEBnbWFpbC5j
b20+DQo+IENjOiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPg0KPiBDYzogSmluZ29vIEhh
biA8amluZ29vaGFuMUBnbWFpbC5jb20+DQo+IENjOiBCam9ybiBIZWxnYWFzIDxiaGVsZ2Fhc0Bn
b29nbGUuY29tPg0KPiBDYzogR2FicmllbGUgUGFvbG9uaSA8Z2FicmllbGUucGFvbG9uaUBodWF3
ZWkuY29tPg0KPiBDYzogWmhvdSBXYW5nIDx3YW5nemhvdTFAaGlzaWxpY29uLmNvbT4NCj4gLS0t
DQo+ICBkcml2ZXJzL3BjaS9ob3N0L3BjaWUtZGVzaWdud2FyZS5jIHwgMTAgKysrKy0tLS0tLQ0K
PiAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkNCj4gDQo+
IGRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9ob3N0L3BjaWUtZGVzaWdud2FyZS5jIGIvZHJpdmVy
cy9wY2kvaG9zdC9wY2llLQ0KPiBkZXNpZ253YXJlLmMNCj4gaW5kZXggMjE3MTY4Mi4uYTQ0NTA4
MyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9wY2kvaG9zdC9wY2llLWRlc2lnbndhcmUuYw0KPiAr
KysgYi9kcml2ZXJzL3BjaS9ob3N0L3BjaWUtZGVzaWdud2FyZS5jDQo+IEBAIC01NTEsMTMgKzU1
MSwxMSBAQCBpbnQgZHdfcGNpZV9ob3N0X2luaXQoc3RydWN0IHBjaWVfcG9ydCAqcHApDQo+ICAJ
cGNpX2ZpeHVwX2lycXMocGNpX2NvbW1vbl9zd2l6emxlLCBvZl9pcnFfcGFyc2VfYW5kX21hcF9w
Y2kpOw0KPiAgI2VuZGlmDQo+IA0KPiAtCWlmICghcGNpX2hhc19mbGFnKFBDSV9QUk9CRV9PTkxZ
KSkgew0KPiAtCQlwY2lfYnVzX3NpemVfYnJpZGdlcyhidXMpOw0KPiAtCQlwY2lfYnVzX2Fzc2ln
bl9yZXNvdXJjZXMoYnVzKTsNCj4gKwlwY2lfYnVzX3NpemVfYnJpZGdlcyhidXMpOw0KPiArCXBj
aV9idXNfYXNzaWduX3Jlc291cmNlcyhidXMpOw0KPiANCj4gLQkJbGlzdF9mb3JfZWFjaF9lbnRy
eShjaGlsZCwgJmJ1cy0+Y2hpbGRyZW4sIG5vZGUpDQo+IC0JCQlwY2llX2J1c19jb25maWd1cmVf
c2V0dGluZ3MoY2hpbGQpOw0KPiAtCX0NCj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNoaWxkLCAm
YnVzLT5jaGlsZHJlbiwgbm9kZSkNCj4gKwkJcGNpZV9idXNfY29uZmlndXJlX3NldHRpbmdzKGNo
aWxkKTsNCj4gDQo+ICAJcGNpX2J1c19hZGRfZGV2aWNlcyhidXMpOw0KPiAgCXJldHVybiAwOw0K
PiAtLQ0KPiAyLjUuMQ0KDQo=

Re: [PATCH 2/2] drivers: pci: host: designware: remove PCI_PROBE_ONLY handling

[Pratyush Anand]

On Fri, Jan 29, 2016 at 4:59 PM, Lorenzo Pieralisi
<lorenzo.pieralisi@arm.com> wrote:
> The PCIe designware host driver is not used in system configurations
> requiring the PCI_PROBE_ONLY flag to be set to prevent resources
> assignment, therefore the driver code handling the flag can be
> removed from the kernel.
>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Pratyush Anand <pratyush.anand@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jingoo Han <jingoohan1@gmail.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Gabriele Paoloni <gabriele.paoloni@huawei.com>
> Cc: Zhou Wang <wangzhou1@hisilicon.com>


Acked-by: Pratyush Anand <pratyush.anand@gmail.com>

Re: [PATCH 2/2] drivers: pci: host: designware: remove PCI_PROBE_ONLY handling

[Jingoo Han]

On Friday, January 29, 2016 8:30 PM, Lorenzo Pieralisi wrote:
> 
> The PCIe designware host driver is not used in system configurations
> requiring the PCI_PROBE_ONLY flag to be set to prevent resources
> assignment, therefore the driver code handling the flag can be
> removed from the kernel.
> 
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Pratyush Anand <pratyush.anand@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jingoo Han <jingoohan1@gmail.com>

Acked-by: Jingoo Han Jingoo Han <jingoohan1@gmail.com>

Best regards,
Jingoo Han

> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Gabriele Paoloni <gabriele.paoloni@huawei.com>
> Cc: Zhou Wang <wangzhou1@hisilicon.com>
> ---
>  drivers/pci/host/pcie-designware.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index 2171682..a445083 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -551,13 +551,11 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
>  #endif
> 
> -	if (!pci_has_flag(PCI_PROBE_ONLY)) {
> -		pci_bus_size_bridges(bus);
> -		pci_bus_assign_resources(bus);
> +	pci_bus_size_bridges(bus);
> +	pci_bus_assign_resources(bus);
> 
> -		list_for_each_entry(child, &bus->children, node)
> -			pcie_bus_configure_settings(child);
> -	}
> +	list_for_each_entry(child, &bus->children, node)
> +		pcie_bus_configure_settings(child);
> 
>  	pci_bus_add_devices(bus);
>  	return 0;
> --
> 2.5.1

Re: [PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling

[Bjorn Helgaas]

[+cc Simon, R-car maintainer, linux-renesas-soc]

I badly want to merge this, so speak up now if you object :)

On Fri, Jan 29, 2016 at 11:29:31AM +0000, Lorenzo Pieralisi wrote:
> The PCIe rcar host driver is not used in system configurations
> requiring the PCI_PROBE_ONLY flag to be set to prevent resources
> assignment, therefore the driver code handling the flag can be
> removed from the kernel.
> 
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> ---
>  drivers/pci/host/pcie-rcar.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 4edb518..3509218 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -390,9 +390,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
>  
>  	rcar_pcie_setup(&res, pcie);
>  
> -	/* Do not reassign resources if probe only */
> -	if (!pci_has_flag(PCI_PROBE_ONLY))
> -		pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
> +	pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
>  
>  	if (IS_ENABLED(CONFIG_PCI_MSI))
>  		bus = pci_scan_root_bus_msi(pcie->dev, pcie->root_bus_nr,
> @@ -408,13 +406,11 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
>  
>  	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
>  
> -	if (!pci_has_flag(PCI_PROBE_ONLY)) {
> -		pci_bus_size_bridges(bus);
> -		pci_bus_assign_resources(bus);
> +	pci_bus_size_bridges(bus);
> +	pci_bus_assign_resources(bus);
>  
> -		list_for_each_entry(child, &bus->children, node)
> -			pcie_bus_configure_settings(child);
> -	}
> +	list_for_each_entry(child, &bus->children, node)
> +		pcie_bus_configure_settings(child);
>  
>  	pci_bus_add_devices(bus);
>  
> -- 
> 2.5.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling

[Simon Horman]

On Thu, Feb 04, 2016 at 06:27:03PM -0600, Bjorn Helgaas wrote:
> [+cc Simon, R-car maintainer, linux-renesas-soc]
> 
> I badly want to merge this, so speak up now if you object :)

I have no objections.

Acked-by: Simon Horman <horms+renesas@verge.net.au>

Re: [PATCH 1/2] drivers: pci: host: rcar: remove PCI_PROBE_ONLY handling

[Bjorn Helgaas]

[+cc Simon, linux-renesas-soc]

On Fri, Jan 29, 2016 at 11:29:31AM +0000, Lorenzo Pieralisi wrote:
> The PCIe rcar host driver is not used in system configurations
> requiring the PCI_PROBE_ONLY flag to be set to prevent resources
> assignment, therefore the driver code handling the flag can be
> removed from the kernel.
> 
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>

Applied with Simon's ack to pci/host-rcar for v4.6, thanks, Lorenzo!

> ---
>  drivers/pci/host/pcie-rcar.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 4edb518..3509218 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -390,9 +390,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
>  
>  	rcar_pcie_setup(&res, pcie);
>  
> -	/* Do not reassign resources if probe only */
> -	if (!pci_has_flag(PCI_PROBE_ONLY))
> -		pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
> +	pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
>  
>  	if (IS_ENABLED(CONFIG_PCI_MSI))
>  		bus = pci_scan_root_bus_msi(pcie->dev, pcie->root_bus_nr,
> @@ -408,13 +406,11 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
>  
>  	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
>  
> -	if (!pci_has_flag(PCI_PROBE_ONLY)) {
> -		pci_bus_size_bridges(bus);
> -		pci_bus_assign_resources(bus);
> +	pci_bus_size_bridges(bus);
> +	pci_bus_assign_resources(bus);
>  
> -		list_for_each_entry(child, &bus->children, node)
> -			pcie_bus_configure_settings(child);
> -	}
> +	list_for_each_entry(child, &bus->children, node)
> +		pcie_bus_configure_settings(child);
>  
>  	pci_bus_add_devices(bus);
>  
> -- 
> 2.5.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] drivers: pci: host: designware: remove PCI_PROBE_ONLY handling

[Bjorn Helgaas]

On Fri, Jan 29, 2016 at 11:29:32AM +0000, Lorenzo Pieralisi wrote:
> The PCIe designware host driver is not used in system configurations
> requiring the PCI_PROBE_ONLY flag to be set to prevent resources
> assignment, therefore the driver code handling the flag can be
> removed from the kernel.
> 
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Pratyush Anand <pratyush.anand@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jingoo Han <jingoohan1@gmail.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Gabriele Paoloni <gabriele.paoloni@huawei.com>
> Cc: Zhou Wang <wangzhou1@hisilicon.com>

Applied to pci/host-designware for v4.6 with acks from Pratyush and
Jingoo, thanks everybody!

> ---
>  drivers/pci/host/pcie-designware.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index 2171682..a445083 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -551,13 +551,11 @@ int dw_pcie_host_init(struct pcie_port *pp)
>  	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
>  #endif
>  
> -	if (!pci_has_flag(PCI_PROBE_ONLY)) {
> -		pci_bus_size_bridges(bus);
> -		pci_bus_assign_resources(bus);
> +	pci_bus_size_bridges(bus);
> +	pci_bus_assign_resources(bus);
>  
> -		list_for_each_entry(child, &bus->children, node)
> -			pcie_bus_configure_settings(child);
> -	}
> +	list_for_each_entry(child, &bus->children, node)
> +		pcie_bus_configure_settings(child);
>  
>  	pci_bus_add_devices(bus);
>  	return 0;
> -- 
> 2.5.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html