From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux, pci-probe-only"
Date: Fri, 14 Aug 2015 17:19:16 +0100 [thread overview]
Message-ID: <1439569159-10051-2-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1439569159-10051-1-git-send-email-marc.zyngier@arm.com>
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
next prev parent reply other threads:[~2015-08-14 16:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 16:19 [PATCH v2 0/4] PCI: arm64/powerpc: Fix parsing of linux, pci-probe-only Marc Zyngier
2015-08-14 16:19 ` Marc Zyngier [this message]
2015-08-14 21:08 ` [PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux, pci-probe-only" Rob Herring
2015-09-02 22:23 ` [PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only" Bjorn Helgaas
2015-09-03 8:18 ` [PATCH v2 1/4] of/pci: Add of_pci_check_probe_only to parse "linux, pci-probe-only" Marc Zyngier
2015-08-14 16:19 ` [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux, pci-probe-only property Marc Zyngier
2015-08-14 16:40 ` [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux,pci-probe-only property Bjorn Helgaas
2015-08-14 16:43 ` Will Deacon
2015-08-14 16:50 ` [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux, pci-probe-only property Alexander Graf
2015-08-14 20:26 ` [PATCH v2 2/4] PCI: pci-host-generic: Fix lookup of linux,pci-probe-only property Bjorn Helgaas
2015-08-17 9:01 ` Will Deacon
2015-08-14 16:45 ` Will Deacon
2015-08-14 16:19 ` [PATCH v2 3/4] powerpc: PCI: Fix lookup of linux, pci-probe-only property Marc Zyngier
2015-08-14 16:19 ` [PATCH v2 4/4] arm64: dts: Drop linux, pci-probe-only from the Seattle DTS Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439569159-10051-2-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).