a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RapidIO/mpc85xx: fix possible mport registration problems

Browse Source 
Fix a possible problem with mport registration left non-cleared after
fsl_rio_setup() exits on link error.  Abort mport initialization if
registration failed.

This patch is applicable to 2.6.39-rc1 only.  The problem does not exist
for earlier versions.

Signed-off-by: Alexandre 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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexandre Bounine 2011-04-14 15:22:14 -07:00 committed by Linus Torvalds
parent 13209c2a52
commit 59f9996555
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/sysdev/fsl_rio.c
View File

@ -1457,7 +1457,6 @@ int fsl_rio_setup(struct platform_device *dev)
port->ops = ops; port->ops = ops;
port->priv = priv; port->priv = priv;
port->phys_efptr = 0x100; port->phys_efptr = 0x100;
rio_register_mport(port);
priv->regs_win = ioremap(regs.start, regs.end - regs.start + 1); priv->regs_win = ioremap(regs.start, regs.end - regs.start + 1);
rio_regs_win = priv->regs_win; rio_regs_win = priv->regs_win;
@ -1504,6 +1503,9 @@ int fsl_rio_setup(struct platform_device *dev)
dev_info(&dev->dev, "RapidIO Common Transport System size: %d\n", dev_info(&dev->dev, "RapidIO Common Transport System size: %d\n",
port->sys_size ? 65536 : 256); port->sys_size ? 65536 : 256);
if (rio_register_mport(port))
goto err;
if (port->host_deviceid >= 0) if (port->host_deviceid >= 0)
out_be32(priv->regs_win + RIO_GCCSR, RIO_PORT_GEN_HOST | out_be32(priv->regs_win + RIO_GCCSR, RIO_PORT_GEN_HOST |
RIO_PORT_GEN_MASTER | RIO_PORT_GEN_DISCOVERED); RIO_PORT_GEN_MASTER | RIO_PORT_GEN_DISCOVERED);

5
drivers/rapidio/rio.c
View File

@ -1171,16 +1171,17 @@ static int rio_hdid_setup(char *str)
__setup("riohdid=", rio_hdid_setup); __setup("riohdid=", rio_hdid_setup);
void rio_register_mport(struct rio_mport *port) int rio_register_mport(struct rio_mport *port)
{ {
if (next_portid >= RIO_MAX_MPORTS) { if (next_portid >= RIO_MAX_MPORTS) {
pr_err("RIO: reached specified max number of mports\n"); pr_err("RIO: reached specified max number of mports\n");
return; return 1;
} }
port->id = next_portid++; port->id = next_portid++;
port->host_deviceid = rio_get_hdid(port->id); port->host_deviceid = rio_get_hdid(port->id);
list_add_tail(&port->node, &rio_mports); list_add_tail(&port->node, &rio_mports);
return 0;
} }
EXPORT_SYMBOL_GPL(rio_local_get_device_id); EXPORT_SYMBOL_GPL(rio_local_get_device_id);

2
include/linux/rio.h
View File

@ -396,7 +396,7 @@ union rio_pw_msg {
}; };
/* Architecture and hardware-specific functions */ /* Architecture and hardware-specific functions */
extern void rio_register_mport(struct rio_mport *); extern int rio_register_mport(struct rio_mport *);
extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int); extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int);
extern void rio_close_inb_mbox(struct rio_mport *, int); extern void rio_close_inb_mbox(struct rio_mport *, int);
extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int); extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int);