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

Groups > linux.kernel > #1207603

[PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only"

Show all headers | View raw

Both pci-host-generic and Pseries parse the "linux,pci-probe-only"
to engage the PCI_PROBE_ONLY mode, and both have a subtle bug that
can be triggered if the property has no parameter.

Provide a generic implementation that can be used by both.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/of/of_pci.c    | 30 ++++++++++++++++++++++++++++++
 include/linux/of_pci.h |  3 +++
 2 files changed, 33 insertions(+)

diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 5751dc5..a4e29ff 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -118,6 +118,36 @@ int of_get_pci_domain_nr(struct device_node *node)
 EXPORT_SYMBOL_GPL(of_get_pci_domain_nr);
 
 /**
+ * of_pci_check_probe_only - Setup probe only mode if linux,pci-probe-only
+ *                           is present and valid
+ *
+ * @node: device tree node that may contain the property (usually "chosen")
+ *
+ */
+void of_pci_check_probe_only(struct device_node *node)
+{
+	const int *prop;
+	int len;
+
+	if (!node)
+		return;
+
+	prop = of_get_property(node, "linux,pci-probe-only", &len);
+	if (prop) {
+		if (!len) {
+			pr_warn("linux,pci-probe-only set without value, ignoring\n");
+			return;
+		}
+
+		if (be32_to_cpup(prop))
+			pci_add_flags(PCI_PROBE_ONLY);
+		else
+			pci_clear_flags(PCI_PROBE_ONLY);
+	}
+}
+EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
+
+/**
  * of_pci_dma_configure - Setup DMA configuration
  * @dev: ptr to pci_dev struct of the PCI device
  *
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index 29fd3fe..4c0a617 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -17,6 +17,7 @@ int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
 int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
 int of_get_pci_domain_nr(struct device_node *node);
 void of_pci_dma_configure(struct pci_dev *pci_dev);
+void of_pci_check_probe_only(struct device_node *node);
 #else
 static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
 {
@@ -53,6 +54,8 @@ of_get_pci_domain_nr(struct device_node *node)
 }
 
 static inline void of_pci_dma_configure(struct pci_dev *pci_dev) { }
+
+static inline void of_pci_check_probe_only(struct device_node *node) { }
 #endif
 
 #if defined(CONFIG_OF_ADDRESS)
-- 
2.1.4

--
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