kernel/3.1[02]: move MTD root device setup code to mtdcore
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 003-11-003-of-pci-Add-of_pci_get_devfn-function.patch
1 From 45ab9702fb47d18dca116b3a0509efa19fbcb27a Mon Sep 17 00:00:00 2001
2 From: Thierry Reding <thierry.reding@avionic-design.de>
3 Date: Thu, 16 May 2013 17:55:18 +0200
4 Subject: [PATCH] of/pci: Add of_pci_get_devfn() function
5
6 commit 45ab9702fb47d18dca116b3a0509efa19fbcb27a upstream.
7
8 This function can be used to parse the device and function number from a
9 standard 5-cell PCI resource. PCI_SLOT() and PCI_FUNC() can be used on
10 the returned value obtain the device and function numbers respectively.
11
12 Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
13 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
14 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
15 ---
16 drivers/of/of_pci.c | 34 +++++++++++++++++++++++++++++-----
17 include/linux/of_pci.h | 1 +
18 2 files changed, 30 insertions(+), 5 deletions(-)
19
20 --- a/drivers/of/of_pci.c
21 +++ b/drivers/of/of_pci.c
22 @@ -5,14 +5,15 @@
23 #include <asm/prom.h>
24
25 static inline int __of_pci_pci_compare(struct device_node *node,
26 - unsigned int devfn)
27 + unsigned int data)
28 {
29 - unsigned int size;
30 - const __be32 *reg = of_get_property(node, "reg", &size);
31 + int devfn;
32
33 - if (!reg || size < 5 * sizeof(__be32))
34 + devfn = of_pci_get_devfn(node);
35 + if (devfn < 0)
36 return 0;
37 - return ((be32_to_cpup(&reg[0]) >> 8) & 0xff) == devfn;
38 +
39 + return devfn == data;
40 }
41
42 struct device_node *of_pci_find_child_device(struct device_node *parent,
43 @@ -40,3 +41,26 @@ struct device_node *of_pci_find_child_de
44 return NULL;
45 }
46 EXPORT_SYMBOL_GPL(of_pci_find_child_device);
47 +
48 +/**
49 + * of_pci_get_devfn() - Get device and function numbers for a device node
50 + * @np: device node
51 + *
52 + * Parses a standard 5-cell PCI resource and returns an 8-bit value that can
53 + * be passed to the PCI_SLOT() and PCI_FUNC() macros to extract the device
54 + * and function numbers respectively. On error a negative error code is
55 + * returned.
56 + */
57 +int of_pci_get_devfn(struct device_node *np)
58 +{
59 + unsigned int size;
60 + const __be32 *reg;
61 +
62 + reg = of_get_property(np, "reg", &size);
63 +
64 + if (!reg || size < 5 * sizeof(__be32))
65 + return -EINVAL;
66 +
67 + return (be32_to_cpup(reg) >> 8) & 0xff;
68 +}
69 +EXPORT_SYMBOL_GPL(of_pci_get_devfn);
70 --- a/include/linux/of_pci.h
71 +++ b/include/linux/of_pci.h
72 @@ -10,5 +10,6 @@ int of_irq_map_pci(const struct pci_dev
73 struct device_node;
74 struct device_node *of_pci_find_child_device(struct device_node *parent,
75 unsigned int devfn);
76 +int of_pci_get_devfn(struct device_node *np);
77
78 #endif