Commit c1256ebe authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds

rapidio: remove mport resource reservation from common RIO code

Removes resource reservation from the common sybsystem initialization code
and make it part of mport driver initialization.  This resolves conflict
with resource reservation by device specific mport drivers.
Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Micha Nelissen <micha@neli.hopto.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 569fccb6
...@@ -1432,6 +1432,14 @@ int fsl_rio_setup(struct platform_device *dev) ...@@ -1432,6 +1432,14 @@ int fsl_rio_setup(struct platform_device *dev)
port->iores.flags = IORESOURCE_MEM; port->iores.flags = IORESOURCE_MEM;
port->iores.name = "rio_io_win"; port->iores.name = "rio_io_win";
if (request_resource(&iomem_resource, &port->iores) < 0) {
dev_err(&dev->dev, "RIO: Error requesting master port region"
" 0x%016llx-0x%016llx\n",
(u64)port->iores.start, (u64)port->iores.end);
rc = -ENOMEM;
goto err_res;
}
priv->pwirq = irq_of_parse_and_map(dev->dev.of_node, 0); priv->pwirq = irq_of_parse_and_map(dev->dev.of_node, 0);
priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2); priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2);
priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3); priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3);
...@@ -1536,6 +1544,7 @@ int fsl_rio_setup(struct platform_device *dev) ...@@ -1536,6 +1544,7 @@ int fsl_rio_setup(struct platform_device *dev)
return 0; return 0;
err: err:
iounmap(priv->regs_win); iounmap(priv->regs_win);
err_res:
kfree(priv); kfree(priv);
err_priv: err_priv:
kfree(port); kfree(port);
......
...@@ -1137,20 +1137,9 @@ static int __devinit rio_init(void) ...@@ -1137,20 +1137,9 @@ static int __devinit rio_init(void)
int __devinit rio_init_mports(void) int __devinit rio_init_mports(void)
{ {
int rc = 0;
struct rio_mport *port; struct rio_mport *port;
list_for_each_entry(port, &rio_mports, node) { list_for_each_entry(port, &rio_mports, node) {
if (!request_mem_region(port->iores.start,
resource_size(&port->iores),
port->name)) {
printk(KERN_ERR
"RIO: Error requesting master port region 0x%016llx-0x%016llx\n",
(u64)port->iores.start, (u64)port->iores.end);
rc = -ENOMEM;
goto out;
}
if (port->host_deviceid >= 0) if (port->host_deviceid >= 0)
rio_enum_mport(port); rio_enum_mport(port);
else else
...@@ -1159,8 +1148,7 @@ int __devinit rio_init_mports(void) ...@@ -1159,8 +1148,7 @@ int __devinit rio_init_mports(void)
rio_init(); rio_init();
out: return 0;
return rc;
} }
device_initcall_sync(rio_init_mports); device_initcall_sync(rio_init_mports);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment