Liviu Dudau
2014-10-15 09:02:39 UTC
Gitweb: http://git.kernel.org/linus/;a=3Dcommit;h=3D0b0b0893d49=
Commit: 0b0b0893d49b34201a6c4416b1a707b580b91e3d
Parent: 83bbde1cc0ec9d156b9271e29ffe0dc89c687feb
Refname: refs/heads/master
AuthorDate: Mon Sep 29 15:29:25 2014 +0100
CommitDate: Tue Sep 30 17:08:40 2014 -0600
of/pci: Fix the conversion of IO ranges into IO resources
The ranges property for a host bridge controller in DT describe=
Parent: 83bbde1cc0ec9d156b9271e29ffe0dc89c687feb
Refname: refs/heads/master
AuthorDate: Mon Sep 29 15:29:25 2014 +0100
CommitDate: Tue Sep 30 17:08:40 2014 -0600
of/pci: Fix the conversion of IO ranges into IO resources
The ranges property for a host bridge controller in DT describe=
mapping between the PCI bus address and the CPU physical addres=
resources framework however expects that the IO resources start=
"port" address 0 (zero) and have a maximum size of IO_SPACE_LIM=
conversion from PCI ranges to resources failed to take that int=
returning a CPU physical address instead of a port number.
Also fix all the drivers that depend on the old behaviour by fe=
Also fix all the drivers that depend on the old behaviour by fe=
CPU physical address based on the port number where it is being=
=20
Michael just signaled me that this completely breaks IO space on powe=
rpc ...Michael just signaled me that this completely breaks IO space on powe=
Hi Benjamin,
I'm sorry to hear that I've broke powerpc before I've had a chance to a=
ctually
change the code there. I would like to get the details of what function=
ality
get broken.
=20
I hadn't paid enough attention it seems... looking at that and the
previous patches in the series, I must sate I absolutely HATE the way=
itI hadn't paid enough attention it seems... looking at that and the
previous patches in the series, I must sate I absolutely HATE the way=
lazily allocates IO space addresses implicitly/lazily from what looks
like a conversion function.
The lazy allocation is more of a reservation. In order to convert from =like a conversion function.
an OF
range into a resource I need to be able to tell where the IO is likely =
to
be placed in the CPU address space. My understanding is that Linux PCI =
code
implicitly assumes that CPU view of the IO addresses is based on a "mag=
ical
IO port 0." Of course, each architecture decides its own view of that, =
and
the abstraction can be leaky, the PCI core doesn't really care, it only=
provides
the scaffolding.
I understand you might dislike the behaviour of the function and I'm op=
en to
suggestions on how to resolve the problem of converting from OF ranges =
to
IO resources in an architectural independent way.
=20
It also doesn't work. The powerpc arch has very different and well
defined conversions to IO space which may or may not look like someth=
ingIt also doesn't work. The powerpc arch has very different and well
defined conversions to IO space which may or may not look like someth=
allocated from a magical "IO port 0".
And there might be good reasons for doing that, but I would like to und=erstand
them and to also understand if a more unified view is possible.
=20
It is somewhat like that on ppc64 but we have our own allocator which=
isIt is somewhat like that on ppc64 but we have our own allocator which=
completely out of sync here as far as I can tell, and on ppc32, we ha=
vesomething a *bit* like that but we allow full pointer arithmetic for =
IOports so that they can be negative in case the physical address of th=
eresource ends up below IO BASE.
The pci_register_io_range() function (the "allocator" for IO space) is =a
weak function. It takes the CPU physical address of the range and its s=
ize
and makes sure that it can fit that area in the arch's space for PCI IO=
=2E
The main purpose of that function is to be a helper to pci_address_to_p=
io()
in order to help return the correct answer in that function. pci_addres=
s_to_pio()
is also weak and can be overwritten.
=20
In any case, this whole approach looks terminally broken to us, and i=
nIn any case, this whole approach looks terminally broken to us, and i=
fact doesn't even look that nice for ARM, I would having a much clear=
erAPI to explicitly establish the relationship between IO ports PCI vs.
physical addresses separate from the conversion functions.
I am open to suggestions and guidance here.physical addresses separate from the conversion functions.
=20
For now I'm not sure how to fix it without asking Linus to revert the
whole lot.... I don't have time to dive and untangle that whole serie=
s,For now I'm not sure how to fix it without asking Linus to revert the
whole lot.... I don't have time to dive and untangle that whole serie=
maybe Michael can tomorrow, otherwise I'll need you guys to help, or =
arevert.
I am happy to help if I understand where the problem resides. Details a=re
most welcome.
Best regards,
Liviu
=20
Cheers,
Ben.
=20
=20
++++++++----Cheers,
Ben.
=20
=20
---
arch/arm/mach-integrator/pci_v3.c | 23 ++++++++++----------
drivers/of/address.c | 44 +++++++++++++++++++++++++++=
arch/arm/mach-integrator/pci_v3.c | 23 ++++++++++----------
drivers/of/address.c | 44 +++++++++++++++++++++++++++=
drivers/pci/host/pci-tegra.c | 10 ++++++---
drivers/pci/host/pcie-rcar.c | 21 +++++++++++++------
include/linux/of_address.h | 12 +++++------
5 files changed, 80 insertions(+), 30 deletions(-)
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-inte=
drivers/pci/host/pcie-rcar.c | 21 +++++++++++++------
include/linux/of_address.h | 12 +++++------
5 files changed, 80 insertions(+), 30 deletions(-)
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-inte=
index 05e1f73..c186a17 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void)
{
unsigned long flags;
unsigned int temp;
+ phys_addr_t io_address =3D pci_pio_to_address(io_mem.start);
pcibios_min_mem =3D 0x00100000;
@@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void)
/*
* Setup window 2 - PCI IO
*/
- v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) |
+ v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) |
V3_LB_BASE_ENABLE);
v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0));
@@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void)
static void __init pci_v3_postinit(void)
{
unsigned int pci_cmd;
+ phys_addr_t io_address =3D pci_pio_to_address(io_mem.start);
pci_cmd =3D PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE;
@@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void)
"interrupt: %d\n", ret);
#endif
- register_isa_ports(non_mem.start, io_mem.start, 0);
+ register_isa_ports(non_mem.start, io_address, 0);
}
/*
@@ -867,33 +869,32 @@ static int __init pci_v3_probe(struct platfor=
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void)
{
unsigned long flags;
unsigned int temp;
+ phys_addr_t io_address =3D pci_pio_to_address(io_mem.start);
pcibios_min_mem =3D 0x00100000;
@@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void)
/*
* Setup window 2 - PCI IO
*/
- v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) |
+ v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) |
V3_LB_BASE_ENABLE);
v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0));
@@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void)
static void __init pci_v3_postinit(void)
{
unsigned int pci_cmd;
+ phys_addr_t io_address =3D pci_pio_to_address(io_mem.start);
pci_cmd =3D PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE;
@@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void)
"interrupt: %d\n", ret);
#endif
- register_isa_ports(non_mem.start, io_mem.start, 0);
+ register_isa_ports(non_mem.start, io_address, 0);
}
/*
@@ -867,33 +869,32 @@ static int __init pci_v3_probe(struct platfor=
for_each_of_pci_range(&parser, &range) {
if (!range.flags) {
- of_pci_range_to_resource(&range, np, &conf_me=
if (!range.flags) {
- of_pci_range_to_resource(&range, np, &conf_me=
+ ret =3D of_pci_range_to_resource(&range, np, =
conf_mem.name =3D "PCIv3 config";
}
if (range.flags & IORESOURCE_IO) {
- of_pci_range_to_resource(&range, np, &io_mem)=
}
if (range.flags & IORESOURCE_IO) {
- of_pci_range_to_resource(&range, np, &io_mem)=
+ ret =3D of_pci_range_to_resource(&range, np, =
io_mem.name =3D "PCIv3 I/O";
}
if ((range.flags & IORESOURCE_MEM) &&
!(range.flags & IORESOURCE_PREFETCH)) {
non_mem_pci =3D range.pci_addr;
non_mem_pci_sz =3D range.size;
- of_pci_range_to_resource(&range, np, &non_mem=
}
if ((range.flags & IORESOURCE_MEM) &&
!(range.flags & IORESOURCE_PREFETCH)) {
non_mem_pci =3D range.pci_addr;
non_mem_pci_sz =3D range.size;
- of_pci_range_to_resource(&range, np, &non_mem=
+ ret =3D of_pci_range_to_resource(&range, np, =
non_mem.name =3D "PCIv3 non-prefetched mem";
}
if ((range.flags & IORESOURCE_MEM) &&
(range.flags & IORESOURCE_PREFETCH)) {
pre_mem_pci =3D range.pci_addr;
pre_mem_pci_sz =3D range.size;
- of_pci_range_to_resource(&range, np, &pre_mem=
}
if ((range.flags & IORESOURCE_MEM) &&
(range.flags & IORESOURCE_PREFETCH)) {
pre_mem_pci =3D range.pci_addr;
pre_mem_pci_sz =3D range.size;
- of_pci_range_to_resource(&range, np, &pre_mem=
+ ret =3D of_pci_range_to_resource(&range, np, =
pre_mem.name =3D "PCIv3 prefetched mem";
}
- }
- if (!conf_mem.start || !io_mem.start ||
- !non_mem.start || !pre_mem.start) {
- dev_err(&pdev->dev, "missing ranges in device node\n"=
}
- }
- if (!conf_mem.start || !io_mem.start ||
- !non_mem.start || !pre_mem.start) {
- dev_err(&pdev->dev, "missing ranges in device node\n"=
- return -EINVAL;
+ if (ret < 0) {
+ dev_err(&pdev->dev, "missing ranges in device=
+ if (ret < 0) {
+ dev_err(&pdev->dev, "missing ranges in device=
+ return ret;
+ }
}
pci_v3.map_irq =3D of_irq_parse_and_map_pci;
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 327a574..afdb782 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -295,14 +295,50 @@ struct of_pci_range *of_pci_range_parser_one(=
+ }
}
pci_v3.map_irq =3D of_irq_parse_and_map_pci;
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 327a574..afdb782 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -295,14 +295,50 @@ struct of_pci_range *of_pci_range_parser_one(=
}
EXPORT_SYMBOL_GPL(of_pci_range_parser_one);
-void of_pci_range_to_resource(struct of_pci_range *range,
- struct device_node *np, struct resource=
EXPORT_SYMBOL_GPL(of_pci_range_parser_one);
-void of_pci_range_to_resource(struct of_pci_range *range,
- struct device_node *np, struct resource=
+/*
+ * of_pci_range_to_resource - Create a resource from an of_pci_ran=
+ * of_pci_range_to_resource - Create a resource from an of_pci_ran=
+ * reflect the values contained in the range.
+ *
+ * Returns EINVAL if the range cannot be converted to resource.
+ *
+ * Note that if the range is an IO range, the resource will be con=
+ *
+ * Returns EINVAL if the range cannot be converted to resource.
+ *
+ * Note that if the range is an IO range, the resource will be con=
+ * using pci_address_to_pio() which can fail if it is called too e=
+ * if the range cannot be matched to any host bridge IO space (our=
+ * To guard against that we try to register the IO range first.
+ * If that fails we know that pci_address_to_pio() will do too.
+ */
+int of_pci_range_to_resource(struct of_pci_range *range,
+ struct device_node *np, struct resource =
+ * If that fails we know that pci_address_to_pio() will do too.
+ */
+int of_pci_range_to_resource(struct of_pci_range *range,
+ struct device_node *np, struct resource =
{
+ int err;
res->flags =3D range->flags;
- res->start =3D range->cpu_addr;
- res->end =3D range->cpu_addr + range->size - 1;
res->parent =3D res->child =3D res->sibling =3D NULL;
res->name =3D np->full_name;
+
+ if (res->flags & IORESOURCE_IO) {
+ unsigned long port;
+ err =3D pci_register_io_range(range->cpu_addr, range-=
size);+ int err;
res->flags =3D range->flags;
- res->start =3D range->cpu_addr;
- res->end =3D range->cpu_addr + range->size - 1;
res->parent =3D res->child =3D res->sibling =3D NULL;
res->name =3D np->full_name;
+
+ if (res->flags & IORESOURCE_IO) {
+ unsigned long port;
+ err =3D pci_register_io_range(range->cpu_addr, range-=
+ if (err)
+ goto invalid_range;
+ port =3D pci_address_to_pio(range->cpu_addr);
+ if (port =3D=3D (unsigned long)-1) {
+ err =3D -EINVAL;
+ goto invalid_range;
+ }
+ res->start =3D port;
+ } else {
+ res->start =3D range->cpu_addr;
+ }
+ res->end =3D res->start + range->size - 1;
+ return 0;
+
+ res->start =3D (resource_size_t)OF_BAD_ADDR;
+ res->end =3D (resource_size_t)OF_BAD_ADDR;
+ return err;
}
#endif /* CONFIG_PCI */
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-te=
+ goto invalid_range;
+ port =3D pci_address_to_pio(range->cpu_addr);
+ if (port =3D=3D (unsigned long)-1) {
+ err =3D -EINVAL;
+ goto invalid_range;
+ }
+ res->start =3D port;
+ } else {
+ res->start =3D range->cpu_addr;
+ }
+ res->end =3D res->start + range->size - 1;
+ return 0;
+
+ res->start =3D (resource_size_t)OF_BAD_ADDR;
+ res->end =3D (resource_size_t)OF_BAD_ADDR;
+ return err;
}
#endif /* CONFIG_PCI */
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-te=
index 0fb0fdb..946935d 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -626,13 +626,14 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_I=
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -626,13 +626,14 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_I=
static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
{
struct tegra_pcie *pcie =3D sys_to_pcie(sys);
+ phys_addr_t io_start =3D pci_pio_to_address(pcie->io.start);
pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem=
{
struct tegra_pcie *pcie =3D sys_to_pcie(sys);
+ phys_addr_t io_start =3D pci_pio_to_address(pcie->io.start);
pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem=
pci_add_resource_offset(&sys->resources, &pcie->prefetch,
sys->mem_offset);
pci_add_resource(&sys->resources, &pcie->busn);
- pci_ioremap_io(nr * SZ_64K, pcie->io.start);
+ pci_ioremap_io(nr * SZ_64K, io_start);
return 1;
}
@@ -737,6 +738,7 @@ static irqreturn_t tegra_pcie_isr(int irq, void=
sys->mem_offset);
pci_add_resource(&sys->resources, &pcie->busn);
- pci_ioremap_io(nr * SZ_64K, pcie->io.start);
+ pci_ioremap_io(nr * SZ_64K, io_start);
return 1;
}
@@ -737,6 +738,7 @@ static irqreturn_t tegra_pcie_isr(int irq, void=
static void tegra_pcie_setup_translations(struct tegra_pcie *pcie)
{
u32 fpci_bar, size, axi_address;
+ phys_addr_t io_start =3D pci_pio_to_address(pcie->io.start);
/* Bar 0: type 1 extended configuration space */
fpci_bar =3D 0xfe100000;
@@ -749,7 +751,7 @@ static void tegra_pcie_setup_translations(struc=
{
u32 fpci_bar, size, axi_address;
+ phys_addr_t io_start =3D pci_pio_to_address(pcie->io.start);
/* Bar 0: type 1 extended configuration space */
fpci_bar =3D 0xfe100000;
@@ -749,7 +751,7 @@ static void tegra_pcie_setup_translations(struc=
/* Bar 1: downstream IO bar */
fpci_bar =3D 0xfdfc0000;
size =3D resource_size(&pcie->io);
- axi_address =3D pcie->io.start;
+ axi_address =3D io_start;
afi_writel(pcie, axi_address, AFI_AXI_BAR1_START);
afi_writel(pcie, size >> 12, AFI_AXI_BAR1_SZ);
afi_writel(pcie, fpci_bar, AFI_FPCI_BAR1);
@@ -1520,7 +1522,9 @@ static int tegra_pcie_parse_dt(struct tegra_p=
fpci_bar =3D 0xfdfc0000;
size =3D resource_size(&pcie->io);
- axi_address =3D pcie->io.start;
+ axi_address =3D io_start;
afi_writel(pcie, axi_address, AFI_AXI_BAR1_START);
afi_writel(pcie, size >> 12, AFI_AXI_BAR1_SZ);
afi_writel(pcie, fpci_bar, AFI_FPCI_BAR1);
@@ -1520,7 +1522,9 @@ static int tegra_pcie_parse_dt(struct tegra_p=
}
for_each_of_pci_range(&parser, &range) {
- of_pci_range_to_resource(&range, np, &res);
+ err =3D of_pci_range_to_resource(&range, np, &res);
+ if (err < 0)
+ return err;
switch (res.flags & IORESOURCE_TYPE_BITS) {
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-r=
for_each_of_pci_range(&parser, &range) {
- of_pci_range_to_resource(&range, np, &res);
+ err =3D of_pci_range_to_resource(&range, np, &res);
+ if (err < 0)
+ return err;
switch (res.flags & IORESOURCE_TYPE_BITS) {
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-r=
index 4884ee5..61158e0 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -323,6 +323,7 @@ static void rcar_pcie_setup_window(int win, str=
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -323,6 +323,7 @@ static void rcar_pcie_setup_window(int win, str=
/* Setup PCIe address space mappings for each resource */
resource_size_t size;
+ resource_size_t res_start;
u32 mask;
rcar_pci_write_reg(pcie, 0x00000000, PCIEPTCTLR(win));
@@ -335,8 +336,13 @@ static void rcar_pcie_setup_window(int win, st=
resource_size_t size;
+ resource_size_t res_start;
u32 mask;
rcar_pci_write_reg(pcie, 0x00000000, PCIEPTCTLR(win));
@@ -335,8 +336,13 @@ static void rcar_pcie_setup_window(int win, st=
mask =3D (roundup_pow_of_two(size) / SZ_128) - 1;
rcar_pci_write_reg(pcie, mask << 7, PCIEPAMR(win));
- rcar_pci_write_reg(pcie, upper_32_bits(res->start), PCIEPARH(=
rcar_pci_write_reg(pcie, mask << 7, PCIEPAMR(win));
- rcar_pci_write_reg(pcie, upper_32_bits(res->start), PCIEPARH(=
- rcar_pci_write_reg(pcie, lower_32_bits(res->start), PCIEPARL(=
+ if (res->flags & IORESOURCE_IO)
+ res_start =3D pci_pio_to_address(res->start);
+ else
+ res_start =3D res->start;
+
+ rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(w=
+ res_start =3D pci_pio_to_address(res->start);
+ else
+ res_start =3D res->start;
+
+ rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(w=
+ rcar_pci_write_reg(pcie, lower_32_bits(res_start), PCIEPARL(w=
/* First resource is for IO */
mask =3D PAR_ENABLE;
@@ -363,9 +369,10 @@ static int rcar_pcie_setup(int nr, struct pci_=
mask =3D PAR_ENABLE;
@@ -363,9 +369,10 @@ static int rcar_pcie_setup(int nr, struct pci_=
rcar_pcie_setup_window(i, pcie);
- if (res->flags & IORESOURCE_IO)
- pci_ioremap_io(nr * SZ_64K, res->start);
- else
+ if (res->flags & IORESOURCE_IO) {
+ phys_addr_t io_start =3D pci_pio_to_address(r=
- if (res->flags & IORESOURCE_IO)
- pci_ioremap_io(nr * SZ_64K, res->start);
- else
+ if (res->flags & IORESOURCE_IO) {
+ phys_addr_t io_start =3D pci_pio_to_address(r=
+ pci_ioremap_io(nr * SZ_64K, io_start);
+ } else
pci_add_resource(&sys->resources, res);
}
pci_add_resource(&sys->resources, &pcie->busn);
@@ -935,8 +942,10 @@ static int rcar_pcie_probe(struct platform_dev=
+ } else
pci_add_resource(&sys->resources, res);
}
pci_add_resource(&sys->resources, &pcie->busn);
@@ -935,8 +942,10 @@ static int rcar_pcie_probe(struct platform_dev=
}
for_each_of_pci_range(&parser, &range) {
- of_pci_range_to_resource(&range, pdev->dev.of_node,
+ err =3D of_pci_range_to_resource(&range, pdev->dev.of=
for_each_of_pci_range(&parser, &range) {
- of_pci_range_to_resource(&range, pdev->dev.of_node,
+ err =3D of_pci_range_to_resource(&range, pdev->dev.of=
&pcie->res[win++]);
+ if (err < 0)
+ return err;
if (win > RCAR_PCI_MAX_RESOURCES)
break;
diff --git a/include/linux/of_address.h b/include/linux/of_address.=
+ if (err < 0)
+ return err;
if (win > RCAR_PCI_MAX_RESOURCES)
break;
diff --git a/include/linux/of_address.h b/include/linux/of_address.=
index a38e1c8..8cb14eb 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -134,9 +134,9 @@ extern const __be32 *of_get_pci_address(struct =
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -134,9 +134,9 @@ extern const __be32 *of_get_pci_address(struct =
u64 *size, unsigned int *flags);
extern int of_pci_address_to_resource(struct device_node *dev, int=
extern int of_pci_address_to_resource(struct device_node *dev, int=
struct resource *r);
-extern void of_pci_range_to_resource(struct of_pci_range *range,
- struct device_node *np,
- struct resource *res);
+extern int of_pci_range_to_resource(struct of_pci_range *range,
+ struct device_node *np,
+ struct resource *res);
#else /* CONFIG_OF_ADDRESS && CONFIG_PCI */
static inline int of_pci_address_to_resource(struct device_node *d=
-extern void of_pci_range_to_resource(struct of_pci_range *range,
- struct device_node *np,
- struct resource *res);
+extern int of_pci_range_to_resource(struct of_pci_range *range,
+ struct device_node *np,
+ struct resource *res);
#else /* CONFIG_OF_ADDRESS && CONFIG_PCI */
static inline int of_pci_address_to_resource(struct device_node *d=
struct resource *r)
@@ -149,9 +149,9 @@ static inline const __be32 *of_get_pci_address(=
@@ -149,9 +149,9 @@ static inline const __be32 *of_get_pci_address(=
{
return NULL;
}
-static inline void of_pci_range_to_resource(struct of_pci_range *r=
return NULL;
}
-static inline void of_pci_range_to_resource(struct of_pci_range *r=
- struct device_node *np,
- struct resource *res)
+static inline int of_pci_range_to_resource(struct of_pci_range *ra=
- struct resource *res)
+static inline int of_pci_range_to_resource(struct of_pci_range *ra=
+ struct device_node *np,
+ struct resource *res)
{
return -ENOSYS;
}
--
To unsubscribe from this list: send the line "unsubscribe git-commi=
+ struct resource *res)
{
return -ENOSYS;
}
--
To unsubscribe from this list: send the line "unsubscribe git-commi=
More majordomo info at http://vger.kernel.org/majordomo-info.html
=20=20
=20
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
=C2=AF\_(=E3=83=84)_/=C2=AF