lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rapidio: add device object linking into discovery

Browse Source 
Add setting links between rio_dev objects into the discovery process.
This needed to report device connections on agent (non-host) processors
that perform RIO discovery.  Originally, these links have been introduced
for enumerating host only to support error management.

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>
Cc: Micha Nelissen <micha@neli.hopto.org>
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-01-12 17:00:41 -08:00
committed by Linus Torvalds
parent e6536927e6
commit 17e9620563
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rapidio/rio-scan.c
View File

@@ -947,7 +947,7 @@ static int rio_enum_complete(struct rio_mport *port)
*/ */
static int __devinit static int __devinit
rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid, rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
u8 hopcount) u8 hopcount, struct rio_dev *prev, int prev_port)
{ {
u8 port_num, route_port; u8 port_num, route_port;
struct rio_dev *rdev; struct rio_dev *rdev;
@@ -957,6 +957,9 @@ rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
if ((rdev = rio_setup_device(net, port, destid, hopcount, 0))) { if ((rdev = rio_setup_device(net, port, destid, hopcount, 0))) {
/* Add device to the global and bus/net specific list. */ /* Add device to the global and bus/net specific list. */
list_add_tail(&rdev->net_list, &net->devices); list_add_tail(&rdev->net_list, &net->devices);
rdev->prev = prev;
if (prev && rio_is_switch(prev))
prev->rswitch->nextdev[prev_port] = rdev;
} else } else
return -1; return -1;
@@ -998,8 +1001,8 @@ rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
if (ndestid == RIO_ANY_DESTID(port->sys_size)) if (ndestid == RIO_ANY_DESTID(port->sys_size))
continue; continue;
rio_unlock_device(port, destid, hopcount); rio_unlock_device(port, destid, hopcount);
if (rio_disc_peer if (rio_disc_peer(net, port, ndestid,
(net, port, ndestid, hopcount + 1) < 0) hopcount + 1, rdev, port_num) < 0)
return -1; return -1;
} }
} }
@@ -1291,7 +1294,7 @@ int __devinit rio_disc_mport(struct rio_mport *mport)
mport->host_deviceid); mport->host_deviceid);
if (rio_disc_peer(net, mport, RIO_ANY_DESTID(mport->sys_size), if (rio_disc_peer(net, mport, RIO_ANY_DESTID(mport->sys_size),
0) < 0) { 0, NULL, 0) < 0) {
printk(KERN_INFO printk(KERN_INFO
"RIO: master port %d device has failed discovery\n", "RIO: master port %d device has failed discovery\n",
mport->id); mport->id);