From: Thierry Reding <thierry.reding@avionic-design.de>
To: linux-tegra@vger.kernel.org
Cc: Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>,
Russell King <linux@arm.linux.org.uk>,
Stephen Warren <swarren@wwwdotorg.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Andrew Murray <andrew.murray@arm.com>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
Arnd Bergmann <arnd@arndb.de>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org
Subject: [PATCH 02/14] of/pci: Add of_pci_get_devfn() function
Date: Wed, 9 Jan 2013 21:43:02 +0100 [thread overview]
Message-ID: <1357764194-12677-3-git-send-email-thierry.reding@avionic-design.de> (raw)
In-Reply-To: <1357764194-12677-1-git-send-email-thierry.reding@avionic-design.de>
This function can be used to parse the device and function number from a
standard 5-cell PCI resource. PCI_SLOT() and PCI_FUNC() can be used on
the returned value obtain the device and function numbers respectively.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
drivers/of/of_pci.c | 32 ++++++++++++++++++++++++++++----
include/linux/of_pci.h | 1 +
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 13e37e2..0dd52df 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -7,12 +7,13 @@
static inline int __of_pci_pci_compare(struct device_node *node,
unsigned int devfn)
{
- unsigned int size;
- const __be32 *reg = of_get_property(node, "reg", &size);
+ int err;
- if (!reg || size < 5 * sizeof(__be32))
+ err = of_pci_get_devfn(node);
+ if (err < 0)
return 0;
- return ((be32_to_cpup(®[0]) >> 8) & 0xff) == devfn;
+
+ return devfn == err;
}
struct device_node *of_pci_find_child_device(struct device_node *parent,
@@ -40,3 +41,26 @@ struct device_node *of_pci_find_child_device(struct device_node *parent,
return NULL;
}
EXPORT_SYMBOL_GPL(of_pci_find_child_device);
+
+/**
+ * of_pci_get_devfn() - Get device and function numbers for a device node
+ * @np: device node
+ *
+ * Parses a standard 5-cell PCI resource and returns an 8-bit value that can
+ * be passed to the PCI_SLOT() and PCI_FUNC() macros to extract the device
+ * and function numbers respectively. On error a negative error code is
+ * returned.
+ */
+int of_pci_get_devfn(struct device_node *np)
+{
+ unsigned int size;
+ const __be32 *reg;
+
+ reg = of_get_property(np, "reg", &size);
+
+ if (!reg || size < 5 * sizeof(__be32))
+ return -EINVAL;
+
+ return (be32_to_cpup(reg) >> 8) & 0xff;
+}
+EXPORT_SYMBOL_GPL(of_pci_get_devfn);
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index bb115de..91ec484 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -10,5 +10,6 @@ int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq);
struct device_node;
struct device_node *of_pci_find_child_device(struct device_node *parent,
unsigned int devfn);
+int of_pci_get_devfn(struct device_node *np);
#endif
--
1.8.1
next prev parent reply other threads:[~2013-01-09 20:43 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 20:43 [PATCH 00/14] Rewrite Tegra PCIe driver Thierry Reding
2013-01-09 20:43 ` [PATCH 01/14] of/pci: Provide support for parsing PCI DT ranges property Thierry Reding
2013-01-11 0:06 ` Stephen Warren
2013-01-11 4:02 ` Thierry Reding
2013-01-09 20:43 ` Thierry Reding [this message]
2013-01-11 0:09 ` [PATCH 02/14] of/pci: Add of_pci_get_devfn() function Stephen Warren
2013-01-11 4:06 ` Thierry Reding
2013-01-09 20:43 ` [PATCH 03/14] of/pci: Add of_pci_get_bus() function Thierry Reding
2013-01-09 20:43 ` [PATCH 04/14] of/pci: Add of_pci_parse_bus_range() function Thierry Reding
2013-01-09 20:43 ` [PATCH 05/14] lib: Add I/O map cache implementation Thierry Reding
2013-01-09 21:19 ` Arnd Bergmann
2013-01-09 21:54 ` Thierry Reding
2013-01-09 22:10 ` Arnd Bergmann
2013-01-09 23:12 ` Stephen Warren
2013-01-09 23:17 ` Jason Gunthorpe
2013-01-10 7:19 ` Thierry Reding
2013-01-10 9:17 ` Arnd Bergmann
2013-01-10 10:25 ` Thierry Reding
2013-01-10 18:20 ` Jason Gunthorpe
2013-01-10 18:55 ` Thierry Reding
2013-01-10 19:03 ` Thierry Reding
2013-01-10 19:24 ` Jason Gunthorpe
2013-01-10 20:20 ` Thierry Reding
2013-01-10 21:06 ` Jason Gunthorpe
2013-01-16 10:18 ` Thierry Reding
2013-01-16 11:25 ` Russell King - ARM Linux
2013-01-16 11:52 ` Thierry Reding
2013-01-10 18:26 ` Arnd Bergmann
2013-01-10 18:57 ` Thierry Reding
2013-01-10 7:10 ` Thierry Reding
2013-01-09 21:28 ` Russell King - ARM Linux
2013-01-09 21:57 ` Thierry Reding
2013-01-09 20:43 ` [PATCH 06/14] ARM: pci: Keep pci_common_init() around after init Thierry Reding
2013-02-05 20:41 ` Thierry Reding
2013-02-06 16:30 ` Russell King - ARM Linux
2013-02-06 19:35 ` Thierry Reding
2013-02-06 8:36 ` Thomas Petazzoni
2013-02-06 16:38 ` Linus Walleij
2013-02-07 0:54 ` Arnd Bergmann
2013-02-06 17:07 ` Linus Walleij
2013-02-07 1:20 ` Arnd Bergmann
2013-01-09 20:43 ` [PATCH 07/14] ARM: pci: Allow passing per-controller private data Thierry Reding
2013-01-09 20:43 ` [PATCH 08/14] ARM: tegra: Move tegra_pcie_xclk_clamp() to PMC Thierry Reding
2013-01-09 20:43 ` [PATCH 09/14] ARM: tegra: Move pmc.h to include/mach Thierry Reding
2013-01-11 0:15 ` Stephen Warren
2013-01-11 4:08 ` Thierry Reding
2013-01-09 20:43 ` [PATCH 10/14] PCI: tegra: Move PCIe driver to drivers/pci/host Thierry Reding
2013-01-09 21:22 ` Arnd Bergmann
2013-01-09 21:58 ` Thierry Reding
2013-01-09 22:03 ` Arnd Bergmann
2013-01-10 23:54 ` Stephen Warren
2013-01-11 3:40 ` Thierry Reding
2013-01-11 15:36 ` Arnd Bergmann
2013-01-11 15:45 ` Thierry Reding
2013-01-12 12:36 ` Thierry Reding
2013-01-12 21:12 ` Arnd Bergmann
2013-01-13 9:58 ` Thierry Reding
2013-01-14 9:57 ` Andrew Murray
2013-01-15 12:08 ` Thierry Reding
2013-01-15 12:44 ` Arnd Bergmann
2013-01-15 15:40 ` Andrew Murray
2013-01-15 21:14 ` Thierry Reding
2013-01-16 14:00 ` Arnd Bergmann
2013-01-16 16:17 ` Andrew Murray
2013-01-16 18:31 ` Thierry Reding
2013-01-17 15:42 ` Andrew Murray
2013-01-17 16:05 ` Thierry Reding
2013-01-17 16:22 ` Andrew Murray
2013-01-17 20:30 ` Thierry Reding
2013-01-18 9:18 ` Andrew Murray
2013-01-22 19:29 ` Jason Gunthorpe
2013-01-29 13:31 ` Andrew Murray
2013-01-11 0:48 ` Stephen Warren
2013-01-11 3:52 ` Thierry Reding
2013-01-11 20:34 ` Stephen Warren
2013-01-18 9:56 ` Andrew Murray
2013-01-18 10:09 ` Thierry Reding
2013-02-13 23:11 ` Thomas Petazzoni
2013-01-09 20:43 ` [PATCH 11/14] ARM: tegra: tamonten: Add PCIe support Thierry Reding
2013-01-09 21:23 ` Arnd Bergmann
2013-01-10 20:21 ` Thierry Reding
2013-01-09 20:43 ` [PATCH 12/14] ARM: tegra: tec: " Thierry Reding
2013-01-11 0:22 ` Stephen Warren
2013-01-11 4:34 ` Thierry Reding
2013-01-09 20:43 ` [PATCH 13/14] ARM: tegra: harmony: Initialize PCIe from DT Thierry Reding
2013-01-10 23:58 ` Stephen Warren
2013-01-09 20:43 ` [PATCH 14/14] ARM: tegra: trimslice: " Thierry Reding
2013-01-10 23:56 ` Stephen Warren
2013-01-11 18:48 ` Thierry Reding
2013-01-09 21:25 ` [PATCH 00/14] Rewrite Tegra PCIe driver Thomas Petazzoni
2013-01-10 6:55 ` Thierry Reding
2013-01-10 8:34 ` Thomas Petazzoni
2013-01-28 18:15 ` Bjorn Helgaas
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=1357764194-12677-3-git-send-email-thierry.reding@avionic-design.de \
--to=thierry.reding@avionic-design.de \
--cc=andrew.murray@arm.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
--cc=swarren@wwwdotorg.org \
--cc=thomas.petazzoni@free-electrons.com \
/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).