RapidIO: Add IDT CPS/TSI switches
PATCH 1/7 RapidIO: Add IDT CPS/TSI switches
From: Alexandre Bounine <[email protected]>
Extentions to RapidIO switch support:
1. modify switch route operation declarations to allow using single switch-specific file for family of switches that share the same route table operations.
2. add standard route table operations for switches that that support route table manipulation registers as defined in the Rev.1.3 of RapidIO specification.
3. add clear-route-table operation for switches
4. add CPSxx and TSIxxx families of RapidIO switches
---
drivers/rapidio/rio-scan.c | 17 +++++- drivers/rapidio/rio.c | 104 +++++++++++++++++++++++++++++++++++++ drivers/rapidio/rio.h | 20 +++++-- drivers/rapidio/switches/Makefile | 2 drivers/rapidio/switches/idtcps.c | 84 ++++++++++++++++++++++++++++++ drivers/rapidio/switches/tsi500.c | 2 drivers/rapidio/switches/tsi568.c | 106 ++++++++++++++++++++++++++++++++++++++ drivers/rapidio/switches/tsi57x.c | 106 ++++++++++++++++++++++++++++++++++++++ include/linux/rio.h | 6 ++ include/linux/rio_ids.h | 14 +++++ include/linux/rio_regs.h | 14 ++++- 11 files changed, 464 insertions(+), 11 deletions(-)
drivers/rapidio/rio-scan.c +16 -1
@@ -55,6 +55,7 @@ static int rio_mport_phys_table[] = {static int rio_sport_phys_table[] = {RIO_EFB_PAR_EP_FREE_ID ,RIO_EFB_SER_EP_FREE_ID , +RIO_EFB_SER_EP_FREC_ID ,-1 , };
@@ -246,10 +247,20 @@ static void rio_route_set_ops(struct riopr_debug ("RIO: adding routing ops for %s\n" ,rio_name (rdev)); rdev->rswitch->add_entry = cur->add_hook; rdev->rswitch->get_entry = cur->get_hook; + rdev->rswitch->clr_table = cur->clr_hook; +break ; } cur++; } +if ((cur >= end) && (rdev->pef &RIO_PEF_STD_RT )) { +pr_debug ("RIO: adding STD routing ops for %s\n" , +rio_name (rdev)); + rdev->rswitch->add_entry = rio_std_route_add_entry; + rdev->rswitch->get_entry = rio_std_route_get_entry; + rdev->rswitch->clr_table = rio_std_route_clr_table; + } +if (!rdev->rswitch->add_entry || !rdev->rswitch->get_entry)printk (KERN_ERR "RIO: missing routing ops for %s\n" ,rio_name (rdev));
@@ -349,7 +360,7 @@ static struct rio_dev __devinit *rio_setif (rio_is_switch (rdev)) {rio_mport_read_config_32 (port, destid, hopcount,RIO_SWP_INFO_CAR , &rdev->swpinfo); - rswitch =kmalloc (sizeof (struct rio_switch ),GFP_KERNEL ); + rswitch =kzalloc (sizeof (struct rio_switch ),GFP_KERNEL );if (!rswitch) goto cleanup; rswitch->switchid = next_switchid;
@@ -369,6 +380,10 @@ static struct rio_dev __devinit *rio_set rdev->rswitch->switchid);rio_route_set_ops (rdev); +if (do_enum && rdev->rswitch->clr_table) + rdev->rswitch->clr_table (port, destid, hopcount, +RIO_GLOBAL_TABLE ); +list_add_tail (&rswitch->node, &rio_switches); }else
drivers/rapidio/rio.c +104 -0
110 lines not on this page · raw message
drivers/rapidio/rio.h +14 -6
@@ -21,6 +21,14 @@ extern u32 rio_mport_get_feature(structextern int rio_create_sysfs_dev_files (struct rio_dev *rdev);extern int rio_enum_mport (struct rio_mport *mport);extern int rio_disc_mport (struct rio_mport *mport); +extern int rio_std_route_add_entry (struct rio_mport *mport,u16 destid, +u8 hopcount,u16 table,u16 route_destid, +u8 route_port); +extern int rio_std_route_get_entry (struct rio_mport *mport,u16 destid, +u8 hopcount,u16 table,u16 route_destid, +u8 *route_port); +extern int rio_std_route_clr_table (struct rio_mport *mport,u16 destid, +u8 hopcount,u16 table);/* Structures internal to the RIO core code */ extern struct device_attribute rio_dev_attrs[];
@@ -30,9 +38,9 @@ extern struct rio_route_ops __start_rio_extern struct rio_route_ops __end_rio_route_ops[];/* Helpers internal to the RIO core code */ -#define DECLARE_RIO_ROUTE_SECTION (section, vid, did, add_hook, get_hook) \ - static struct rio_route_ops __rio_route_ops __used \ - __section(section)= { vid, did, add_hook, get_hook }; +#define DECLARE_RIO_ROUTE_SECTION (section, name, vid, did, add_hook, get_hook, clr_hook) \ + static const struct rio_route_ops __rio_route_##name __used \ + __section(section) = { vid, did, add_hook, get_hook, clr_hook };/** * DECLARE_RIO_ROUTE_OPS - Registers switch routing operations
@@ -47,9 +55,9 @@ extern struct rio_route_ops __end_rio_ro* rio_route_ops is initialized with the ops and placed into a * RIO-specific kernel section. */ -#define DECLARE_RIO_ROUTE_OPS (vid, did, add_hook, get_hook) \ - DECLARE_RIO_ROUTE_SECTION(.rio_route_ops, \ - vid, did, add_hook, get_hook) +#define DECLARE_RIO_ROUTE_OPS (vid, did, add_hook, get_hook, clr_hook) \ + DECLARE_RIO_ROUTE_SECTION(.rio_route_ops, vid##did, \ + vid, did, add_hook, get_hook, clr_hook)#define RIO_GET_DID (size, x) (size ? (x & 0xffff) : ((x & 0x00ff0000) >> 16))#define RIO_SET_DID (size, x) (size ? (x & 0xffff) : ((x & 0x000000ff) << 16))
drivers/rapidio/switches/Makefile +1 -1
@@ -2,4 +2,4 @@ # Makefile for RIO switches # -obj-$(CONFIG_RAPIDIO) += tsi500.o +obj-$(CONFIG_RAPIDIO) += tsi500.o tsi568.o tsi57x.o idtcps.o
drivers/rapidio/switches/idtcps.c +84 -0
84 lines not on this page · raw message
drivers/rapidio/switches/tsi500.c +1 -1
@@ -57,4 +57,4 @@ tsi500_route_get_entry(struct rio_mportreturn ret; } -DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI500 , tsi500_route_add_entry, tsi500_route_get_entry); +DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI500 , tsi500_route_add_entry, tsi500_route_get_entry,NULL );
drivers/rapidio/switches/tsi568.c +106 -0
106 lines not on this page · raw message
drivers/rapidio/switches/tsi57x.c +106 -0
106 lines not on this page · raw message
include/linux/rio.h +6 -0
@@ -213,6 +213,7 @@ struct rio_net {* @route_table: Copy of switch routing table * @add_entry: Callback for switch-specific route add function * @get_entry: Callback for switch-specific route get function +* @clr_table: Callback for switch-specific clear route table function */ struct rio_switch {struct list_head node;
@@ -224,6 +225,8 @@ struct rio_switch { u16 table, u16 route_destid, u8 route_port);int (*get_entry) (struct rio_mport * mport,u16 destid,u8 hopcount,u16 table,u16 route_destid,u8 * route_port); +int (*clr_table) (struct rio_mport *mport,u16 destid,u8 hopcount, +u16 table); };/* Low-level architecture-dependent routines */
@@ -307,6 +310,7 @@ struct rio_device_id {* @did: RIO device ID * @add_hook: Callback that adds a route entry * @get_hook: Callback that gets a route entry +* @clr_hook: Callback that clears a switch route table (may be NULL) * * Defines the operations that are necessary to manipulate the route * tables for a particular RIO switch device.
@@ -317,6 +321,8 @@ struct rio_route_ops { u16 table, u16 route_destid, u8 route_port);int (*get_hook) (struct rio_mport * mport,u16 destid,u8 hopcount,u16 table,u16 route_destid,u8 * route_port); +int (*clr_hook) (struct rio_mport *mport,u16 destid,u8 hopcount, +u16 table); };/* Architecture and hardware-specific functions */
include/linux/rio_ids.h +14 -0
@@ -20,5 +20,19 @@#define RIO_VID_TUNDRA 0x000d#define RIO_DID_TSI500 0x0500 +#define RIO_DID_TSI568 0x0568 +#define RIO_DID_TSI572 0x0572 +#define RIO_DID_TSI574 0x0574 +#define RIO_DID_TSI576 0x0578/* Same ID as Tsi578 */ +#define RIO_DID_TSI577 0x0577 +#define RIO_DID_TSI578 0x0578 + +#define RIO_VID_IDT 0x0038 +#define RIO_DID_IDT70K200 0x0310 +#define RIO_DID_IDTCPS8 0x035c +#define RIO_DID_IDTCPS12 0x035d +#define RIO_DID_IDTCPS16 0x035b +#define RIO_DID_IDTCPS6Q 0x035f +#define RIO_DID_IDTCPS10Q 0x035e#endif /* LINUX_RIO_IDS_H */
include/linux/rio_regs.h +12 -2
@@ -39,6 +39,8 @@#define RIO_PEF_INB_MBOX2 0x00200000/* [II] Mailbox 2 */ #define RIO_PEF_INB_MBOX3 0x00100000/* [II] Mailbox 3 */ #define RIO_PEF_INB_DOORBELL 0x00080000/* [II] Doorbells */ +#define RIO_PEF_EXT_RT 0x00000200/* [III, 1.3] Extended route table support */ +#define RIO_PEF_STD_RT 0x00000100/* [III, 1.3] Standard route table support */ #define RIO_PEF_CTLS 0x00000010/* [III] CTLS */ #define RIO_PEF_EXT_FEATURES 0x00000008/* [I] EFT_PTR valid */ #define RIO_PEF_ADDR_66 0x00000004/* [I] 66 bits */
@@ -91,7 +93,10 @@#define RIO_OPS_ATOMIC_CLR 0x00000010/* [I] Atomic clr op */ #define RIO_OPS_PORT_WRITE 0x00000004/* [I] Port-write op */ -/* 0x20-0x3c *//* Reserved */ +/* 0x20-0x30 *//* Reserved */ + +#define RIO_SWITCH_RT_LIMIT 0x34/* [III, 1.3] Switch Route Table Destination ID Limit CAR */ +#define RIO_RT_MAX_DESTID 0x0000ffff#define RIO_MBOX_CSR 0x40/* [II] Mailbox CSR */ #define RIO_MBOX0_AVAIL 0x80000000/* [II] Mbox 0 avail */
@@ -153,7 +158,11 @@#define RIO_HOST_DID_LOCK_CSR 0x68/* [III] Host Base Device ID Lock CSR */ #define RIO_COMPONENT_TAG_CSR 0x6c/* [III] Component Tag CSR */ -/* 0x70-0xf8 *//* Reserved */ +#define RIO_STD_RTE_CONF_DESTID_SEL_CSR 0x70 +#define RIO_STD_RTE_CONF_PORT_SEL_CSR 0x74 +#define RIO_STD_RTE_DEFAULT_PORT 0x78 + +/* 0x7c-0xf8 *//* Reserved */ /* 0x100-0xfff8 *//* [I] Extended Features Space */ /* 0x10000-0xfffff8 *//* [I] Implementation-defined Space */
@@ -186,6 +195,7 @@#define RIO_EFB_SER_EP_ID 0x0004/* [VI] LP/Serial EP Devices */ #define RIO_EFB_SER_EP_REC_ID 0x0005/* [VI] LP/Serial EP Recovery Devices */ #define RIO_EFB_SER_EP_FREE_ID 0x0006/* [VI] LP/Serial EP Free Devices */ +#define RIO_EFB_SER_EP_FREC_ID 0x0009/* [VI] LP/Serial EP Free Recovery Devices */ /* * Physical 8/16 LP-LVDS
---
Important Notice: This message is intended for the use of the individual to whom it is addressed and may contain information which is privileged, confidential and/or exempt from disclosure under applicable law. If the reader of this message is not the intended recipient, or is not the employee or agent responsible for delivering the message to the intended recipient, you are hereby notified that any dissemination, distribution, or copying of this communication is strictly prohibited. If you have received this communication in error, please notify the sender immediately by telephone or return e-mail and delete the original message from your systems. Thank you.
drivers/rapidio/rio-scan.c static struct rio_dev __devinit *rio_set · line 389
Quoted 11 lines · Alexandre Bounine
drivers/rapidio/rio-scan.c +4
-0@@ -369,6 +380,10 @@ static struct rio_dev __devinit *rio_set rdev->rswitch->switchid);rio_route_set_ops (rdev); +if (do_enum && rdev->rswitch->clr_table) + rdev->rswitch->clr_table (port, destid, hopcount, +RIO_GLOBAL_TABLE ); +list_add_tail (&rswitch->node, &rio_switches); }else
Why clear the tables here, why not in rio_enum_peer?
drivers/rapidio/switches/tsi57x.c line 106
Quoted 4 lines
drivers/rapidio/switches/tsi57x.c +4
-0+DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI572 , tsi57x_route_add_entry, tsi57x_route_get_entry, tsi57x_route_clr_table); +DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI574 , tsi57x_route_add_entry, tsi57x_route_get_entry, tsi57x_route_clr_table); +DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI577 , tsi57x_route_add_entry, tsi57x_route_get_entry, tsi57x_route_clr_table); +DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI578 , tsi57x_route_add_entry, tsi57x_route_get_entry, tsi57x_route_clr_table);
Can the 568 and 578 driver be shared? Have a 5xx driver?
Micha
Quoted 11 lines · Micha Nelissen
Quoted 10 lines · Alexandre Bounine
drivers/rapidio/rio-scan.c +4
-0@@ -369,6 +380,10 @@ static struct rio_dev __devinit *rio_set rdev->rswitch->switchid);rio_route_set_ops (rdev); +if (do_enum && rdev->rswitch->clr_table) + rdev->rswitch->clr_table (port, destid, hopcount, +RIO_GLOBAL_TABLE ); +list_add_tail (&rswitch->node, &rio_switches);
Quoted 3 lines
Review static struct rio_dev __devinit *rio_set · line 389
Quoted 1 line
(quoted diff) +0
-0} else=20
Why clear the tables here, why not inrio_enum_peer?
I prefer to keep it together with route table image initialization.=20
Quoted 2 lines
=20
Quoted 1 line
+DECLARE_RIO_ROUTE_OPS(RIO_VID_TUNDRA,
RIO_DID_TSI572,
tsi57x_route_add_entry,
Quoted 2 lines
tsi57x_route_get_entry,tsi57x_route_clr_table);Quoted 1 line
+DECLARE_RIO_ROUTE_OPS(RIO_VID_TUNDRA,
RIO_DID_TSI574,
tsi57x_route_add_entry,
Quoted 2 lines
tsi57x_route_get_entry,tsi57x_route_clr_table);Quoted 1 line
+DECLARE_RIO_ROUTE_OPS(RIO_VID_TUNDRA,
RIO_DID_TSI577,
tsi57x_route_add_entry,
Quoted 2 lines
tsi57x_route_get_entry,tsi57x_route_clr_table);Quoted 1 line
+DECLARE_RIO_ROUTE_OPS(RIO_VID_TUNDRA,
RIO_DID_TSI578,
tsi57x_route_add_entry,
Quoted 3 lines
tsi57x_route_get_entry,tsi57x_route_clr_table); =20
Can the 568 and 578 driver be shared? Have a 5xx driver?
For route table operations this will work. But there are Error Management functions added in follow-up patches, which are different for Tsi568. I prefer to keep them in different files to avoid hiding the differences. Plus, it makes easier for end-user to remove from the build drivers for switches that are not used in their system. I do not want to add new configuration options for switch selection at this moment but we may consider it later.=20
Alex.
=20