aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2010-10-27 18:34:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 21:03:15 -0400
commit68fe4df5d21294401959fa61d5a7094705ed8f6f (patch)
tree28cd3609514f3a7b1e78e627b069aa5669bc7fd0 /include
parentae05cbd5adef897d405ce8f90484c1239f79e086 (diff)
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. Links for redundant RIO connections between switches are not set (will be fixed in a separate patch). Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Thomas Moll <thomas.moll@sysgo.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Li Yang <leoli@freescale.com> Cc: Kumar Gala <galak@kernel.crashing.org> 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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/rio.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/rio.h b/include/linux/rio.h
index ffdfe5ad43bf..8d9e66dc7969 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -99,6 +99,7 @@ union rio_pw_msg;
99 * @riores: RIO resources this device owns 99 * @riores: RIO resources this device owns
100 * @pwcback: port-write callback function for this device 100 * @pwcback: port-write callback function for this device
101 * @destid: Network destination ID 101 * @destid: Network destination ID
102 * @prev: Previous RIO device connected to the current one
102 */ 103 */
103struct rio_dev { 104struct rio_dev {
104 struct list_head global_list; /* node in list of all RIO devices */ 105 struct list_head global_list; /* node in list of all RIO devices */
@@ -125,6 +126,7 @@ struct rio_dev {
125 struct resource riores[RIO_MAX_DEV_RESOURCES]; 126 struct resource riores[RIO_MAX_DEV_RESOURCES];
126 int (*pwcback) (struct rio_dev *rdev, union rio_pw_msg *msg, int step); 127 int (*pwcback) (struct rio_dev *rdev, union rio_pw_msg *msg, int step);
127 u16 destid; 128 u16 destid;
129 struct rio_dev *prev;
128}; 130};
129 131
130#define rio_dev_g(n) list_entry(n, struct rio_dev, global_list) 132#define rio_dev_g(n) list_entry(n, struct rio_dev, global_list)
@@ -232,6 +234,7 @@ struct rio_net {
232 * @get_domain: Callback for switch-specific domain get function 234 * @get_domain: Callback for switch-specific domain get function
233 * @em_init: Callback for switch-specific error management initialization function 235 * @em_init: Callback for switch-specific error management initialization function
234 * @em_handle: Callback for switch-specific error management handler function 236 * @em_handle: Callback for switch-specific error management handler function
237 * @nextdev: Array of per-port pointers to the next attached device
235 */ 238 */
236struct rio_switch { 239struct rio_switch {
237 struct list_head node; 240 struct list_head node;
@@ -253,6 +256,7 @@ struct rio_switch {
253 u8 *sw_domain); 256 u8 *sw_domain);
254 int (*em_init) (struct rio_dev *dev); 257 int (*em_init) (struct rio_dev *dev);
255 int (*em_handle) (struct rio_dev *dev, u8 swport); 258 int (*em_handle) (struct rio_dev *dev, u8 swport);
259 struct rio_dev *nextdev[0];
256}; 260};
257 261
258/* Low-level architecture-dependent routines */ 262/* Low-level architecture-dependent routines */