diff options
author | Alexandre Bounine <alexandre.bounine@idt.com> | 2010-10-27 18:34:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:03:16 -0400 |
commit | af84ca38aff94061dd0711edbb99b0900a9c28fd (patch) | |
tree | 31f51e9106c0a0944ec168dc25399f12ab2fa527 /include/linux/rio.h | |
parent | a3725c45c114bd06e091802f90533332d1e93819 (diff) |
rapidio: add handling of redundant routes
Detects RIO link to the already enumerated device and properly sets links
between device objects. Changes to the enumeration/discovery logic:
1. Use Master Enable bit to signal end of the enumeration - agents may
start their discovery process as soon as they see this bit set
(Component Tag register was used before for this purpose).
2. Enumerator sets Component Tag (!= 0) immediately during device
setup. This allows to identify the device if the redundant route
exists in a RIO system.
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/linux/rio.h')
-rw-r--r-- | include/linux/rio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rio.h b/include/linux/rio.h index 4fa5e3d2b117..0bed941f9b13 100644 --- a/include/linux/rio.h +++ b/include/linux/rio.h | |||
@@ -177,6 +177,7 @@ enum rio_phy_type { | |||
177 | * @index: Port index, unique among all port interfaces of the same type | 177 | * @index: Port index, unique among all port interfaces of the same type |
178 | * @sys_size: RapidIO common transport system size | 178 | * @sys_size: RapidIO common transport system size |
179 | * @phy_type: RapidIO phy type | 179 | * @phy_type: RapidIO phy type |
180 | * @phys_efptr: RIO port extended features pointer | ||
180 | * @name: Port name string | 181 | * @name: Port name string |
181 | * @priv: Master port private data | 182 | * @priv: Master port private data |
182 | */ | 183 | */ |
@@ -198,6 +199,7 @@ struct rio_mport { | |||
198 | * 1 - Large size, 65536 devices. | 199 | * 1 - Large size, 65536 devices. |
199 | */ | 200 | */ |
200 | enum rio_phy_type phy_type; /* RapidIO phy type */ | 201 | enum rio_phy_type phy_type; /* RapidIO phy type */ |
202 | u32 phys_efptr; | ||
201 | unsigned char name[40]; | 203 | unsigned char name[40]; |
202 | void *priv; /* Master port private data */ | 204 | void *priv; /* Master port private data */ |
203 | }; | 205 | }; |