Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1207617

Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux,pci-probe-only property

Show all headers | View raw

On Fri, Aug 14, 2015 at 05:19:17PM +0100, Marc Zyngier wrote:
> When pci-host-generic looks for the probe-only property, it seems
> to trust the DT to be correctly written, and assumes that there
> is a parameter to the property.
> 
> Unfortunately, this is not always the case, and some firmware expose
> this property naked. The driver ends up making a decision based on
> whatever the property pointer points to, which is likely to be junk.
> 
> Switch to the common of_pci.c implementation that doesn't suffer
> from this problem.
> 
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
>  drivers/pci/host/pci-host-generic.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
> index 265dd25..545ff4e 100644
> --- a/drivers/pci/host/pci-host-generic.c
> +++ b/drivers/pci/host/pci-host-generic.c
> @@ -210,7 +210,6 @@ static int gen_pci_probe(struct platform_device *pdev)
>  	int err;
>  	const char *type;
>  	const struct of_device_id *of_id;
> -	const int *prop;
>  	struct device *dev = &pdev->dev;
>  	struct device_node *np = dev->of_node;
>  	struct gen_pci *pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
> @@ -225,13 +224,7 @@ static int gen_pci_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> -	prop = of_get_property(of_chosen, "linux,pci-probe-only", NULL);
> -	if (prop) {
> -		if (*prop)
> -			pci_add_flags(PCI_PROBE_ONLY);
> -		else
> -			pci_clear_flags(PCI_PROBE_ONLY);
> -	}
> +	of_pci_check_probe_only(of_chosen);

You could probably just make this take void, as the probe-only property
is always in the /chosen node.

Either way:

  Acked-by: Will Deacon <will.deacon@arm.com>

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/4] PCI: arm64/powerpc: Fix parsing of linux,pci-probe-only Marc Zyngier <marc.zyngier@arm.com> - 2015-08-14 18:20 +0200
  [PATCH v2 4/4] arm64: dts: Drop linux,pci-probe-only from the Seattle DTS Marc Zyngier <marc.zyngier@arm.com> - 2015-08-14 18:20 +0200
  [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux,pci-probe-only property Marc Zyngier <marc.zyngier@arm.com> - 2015-08-14 18:20 +0200
    Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of  linux,pci-probe-only property Will Deacon <will.deacon@arm.com> - 2015-08-14 18:50 +0200
    Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of  linux,pci-probe-only property Bjorn Helgaas <bhelgaas@google.com> - 2015-08-14 18:50 +0200
      Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of  linux,pci-probe-only property Will Deacon <will.deacon@arm.com> - 2015-08-14 18:50 +0200
        Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux,pci-probe-only property Alexander Graf <agraf@suse.de> - 2015-08-14 19:00 +0200
        Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of  linux,pci-probe-only property Bjorn Helgaas <bhelgaas@google.com> - 2015-08-14 22:30 +0200
          Re: [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of  linux,pci-probe-only property Will Deacon <will.deacon@arm.com> - 2015-08-17 11:10 +0200
  [PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only" Marc Zyngier <marc.zyngier@arm.com> - 2015-08-14 18:20 +0200
    Re: [PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only" Rob Herring <robherring2@gmail.com> - 2015-08-14 23:10 +0200
  [PATCH v2 3/4] powerpc: PCI: Fix lookup of linux,pci-probe-only property Marc Zyngier <marc.zyngier@arm.com> - 2015-08-14 18:30 +0200

csiph-web