Re: [PATCH 4/9] RapidIO: Add relation links between RIO device structures
Bounine, Alexandre wrote: As RapidIO is a switched network, the concept of 'previous' and 'next' devices is invalid. Perhaps it's just the way they were discovered/enumerated, but that does not matter any more at runtime. Or at least, should not matter. Yes, the previous and next have to be considered in context of enumeration/discovery. At runtime, it does not matter for data traffic, but is valuable information for error recovery I agree it's desirable to have this information. Notes: 1) is rio_dev-prev used anywhere? (maybe I missed it) 2) is the nextdev[port] list complete? I mean are all connected switches in the list? My guess is that multiply connected switches are enumerated only once therefore only appear in the nextdev if only one switch, instead of all 3) it would be nice to have all switch connections information. In case ever the network is rerouted, this information will become useful; instead of having a tree representation of the network only. Micha ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH 4/9] RapidIO: Add relation links between RIO device structures
Micha Nelissen wrote: I agree it's desirable to have this information. Notes: 1) is rio_dev-prev used anywhere? (maybe I missed it) It is used to scan route back when servicing an orphaned PW message. I also see its future use when invalidating route(s) in case of device removal. 2) is the nextdev[port] list complete? I mean are all connected switches in the list? My guess is that multiply connected switches are enumerated only once therefore only appear in the nextdev if only one switch, instead of all 3) it would be nice to have all switch connections information. Good catch. I will address this. In case ever the network is rerouted, this information will become useful; instead of having a tree representation of the network only. I consider proposed implementation as transitional until enumeration logic is reworked. It already is an attempt to move towards a tree representation. Making switch support available was given higher priority compared to other things needed for RIO subsystem. Alex. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 4/9] RapidIO: Add relation links between RIO device structures
Alexandre Bounine wrote:
Create back and forward links between RIO devices. These links are intended for
use by error management and hot-plug extensions.
As RapidIO is a switched network, the concept of 'previous' and 'next'
devices is invalid. Perhaps it's just the way they were
discovered/enumerated, but that does not matter any more at runtime. Or
at least, should not matter.
@@ -237,6 +241,7 @@ struct rio_switch {
u16 hopcount;
u16 destid;
u8 inport;
+ u8 nports;
u8 *route_table;
u32 port_ok;
This can be extracted from the swpinfo field (which you removed in
another patch)?
Micha
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH 4/9] RapidIO: Add relation links between RIO device structures
Micha Nelissen wrote:
Alexandre Bounine wrote:
Create back and forward links between RIO devices. These links are
intended for
use by error management and hot-plug extensions.
As RapidIO is a switched network, the concept of 'previous' and 'next'
devices is invalid. Perhaps it's just the way they were
discovered/enumerated, but that does not matter any more at runtime.
Or
at least, should not matter.
Yes, the previous and next have to be considered in context of
enumeration/discovery.
At runtime, it does not matter for data traffic, but is valuable
information for error recovery
And hot-swap. This provides snapshot of device connections. For example,
when servicing
error-stopped state of link between two switches you need to know
ingress port of far switch on
the link. It may be a problem to read it directly from the device.
Searching through the device list
becomes time consuming as a system size grows.
@@ -237,6 +241,7 @@ struct rio_switch {
u16 hopcount;
u16 destid;
u8 inport;
+ u8 nports;
u8 *route_table;
u32 port_ok;
This can be extracted from the swpinfo field (which you removed in
another patch)?
Agreed in response for patch #3
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 4/9] RapidIO: Add relation links between RIO device structures
Create back and forward links between RIO devices. These links are intended for
use by error management and hot-plug extensions.
Signed-off-by: Alexandre Bounine alexandre.boun...@idt.com
Reviewed-by: Thomas Moll thomas.m...@sysgo.com
Cc: Matt Porter mpor...@kernel.crashing.org
Cc: Li Yang le...@freescale.com
Cc: Kumar Gala ga...@kernel.crashing.org
---
drivers/rapidio/rio-scan.c | 55 +--
include/linux/rio.h|6
2 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index efe3519..5dc33d1 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -442,7 +442,10 @@ static struct rio_dev __devinit *rio_setup_device(struct
rio_net *net,
if (rio_is_switch(rdev)) {
rio_mport_read_config_32(port, destid, hopcount,
RIO_SWP_INFO_CAR, swpinfo);
- rswitch = kzalloc(sizeof(struct rio_switch), GFP_KERNEL);
+ rswitch = kzalloc(sizeof(*rswitch) +
+ RIO_GET_TOTAL_PORTS(swpinfo) *
+ sizeof(rswitch-nextdev[0]),
+ GFP_KERNEL);
if (!rswitch)
goto cleanup;
rswitch-switchid = next_switchid;
@@ -450,6 +453,7 @@ static struct rio_dev __devinit *rio_setup_device(struct
rio_net *net,
rswitch-destid = destid;
rswitch-port_ok = 0;
rswitch-inport = (u8)(swpinfo RIO_SWP_INFO_PORT_NUM_MASK);
+ rswitch-nports = (u8)RIO_GET_TOTAL_PORTS(swpinfo);
rswitch-route_table = kzalloc(sizeof(u8)*
RIO_MAX_ROUTE_ENTRIES(port-sys_size),
GFP_KERNEL);
@@ -721,25 +725,6 @@ static u16 rio_get_host_deviceid_lock(struct rio_mport
*port, u8 hopcount)
}
/**
- * rio_get_swpinfo_tports- Gets total number of ports on the switch
- * @mport: Master port to send transaction
- * @destid: Destination ID associated with the switch
- * @hopcount: Number of hops to the device
- *
- * Returns total numbers of ports implemented by the switch device.
- */
-static u8 rio_get_swpinfo_tports(struct rio_mport *mport, u16 destid,
-u8 hopcount)
-{
- u32 result;
-
- rio_mport_read_config_32(mport, destid, hopcount, RIO_SWP_INFO_CAR,
-result);
-
- return RIO_GET_TOTAL_PORTS(result);
-}
-
-/**
* rio_net_add_mport- Add a master port to a RIO network
* @net: RIO network
* @port: Master port to add
@@ -759,15 +744,16 @@ static void rio_net_add_mport(struct rio_net *net, struct
rio_mport *port)
* @net: RIO network being enumerated
* @port: Master port to send transactions
* @hopcount: Number of hops into the network
+ * @prev: Previous RIO device connected to the enumerated one
+ * @prev_port: Port on previous RIO device
*
* Recursively enumerates a RIO network. Transactions are sent via the
* master port passed in @port.
*/
static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
-u8 hopcount)
+u8 hopcount, struct rio_dev *prev, int prev_port)
{
int port_num;
- int num_ports;
int cur_destid;
int sw_destid;
int sw_inport;
@@ -812,6 +798,9 @@ static int __devinit rio_enum_peer(struct rio_net *net,
struct rio_mport *port,
if (rdev) {
/* Add device to the global and bus/net specific list. */
list_add_tail(rdev-net_list, net-devices);
+ rdev-prev = prev;
+ if (prev rio_is_switch(prev))
+ prev-rswitch-nextdev[prev_port] = rdev;
} else
return -1;
@@ -830,14 +819,13 @@ static int __devinit rio_enum_peer(struct rio_net *net,
struct rio_mport *port,
rdev-rswitch-route_table[destid] = sw_inport;
}
- num_ports =
- rio_get_swpinfo_tports(port, RIO_ANY_DESTID(port-sys_size),
- hopcount);
pr_debug(
RIO: found %s (vid %4.4x did %4.4x) with %d ports\n,
- rio_name(rdev), rdev-vid, rdev-did, num_ports);
+ rio_name(rdev), rdev-vid, rdev-did,
+ rdev-rswitch-nports);
sw_destid = next_destid;
- for (port_num = 0; port_num num_ports; port_num++) {
+ for (port_num = 0;
+port_num rdev-rswitch-nports; port_num++) {
/*Enable Input Output Port (transmitter reviever)*/
rio_enable_rx_tx_port(port, 0,
RIO_ANY_DESTID(port-sys_size),
@@ -862,7 +850,8 @@ static int __devinit
