RapidIO: Set of patches to current -mm tree
Subsystems (2)
cover RapidIO: Set of patches to current -mm tree
This set of RapidIO patches is applicable to the latest -mm code tree. These patches require series of RapidIO patches submitted earlier.
PATCH 1/5 RapidIO: Fixed typos and minor edits
--- drivers/rapidio/rio.c | 1 - drivers/rapidio/switches/Kconfig | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/rapidio/rio.c +0 -1
@@ -445,7 +445,6 @@ static struct rio_dev *rio_get_comptag(u32 comp_tag, struct rio_dev *from)struct list_head *n;struct rio_dev *rdev; -WARN_ON (in_interrupt ());spin_lock (&rio_global_list_lock); n = from ? from->global_list.next : rio_devices.next;
drivers/rapidio/switches/Kconfig +4 -4
@@ -5,24 +5,24 @@ config RAPIDIO_TSI57X bool "IDT Tsi57x SRIO switches support" depends on RAPIDIO ---help--- - Includes support for ITD Tsi57x family of serial RapidIO switches. + Includes support for IDT Tsi57x family of serial RapidIO switches. config RAPIDIO_CPS_XX bool "IDT CPS-xx SRIO switches support" depends on RAPIDIO ---help--- - Includes support for ITD CPS-16/12/10/8 serial RapidIO switches. + Includes support for IDT CPS-16/12/10/8 serial RapidIO switches. config RAPIDIO_TSI568 bool "Tsi568 SRIO switch support" depends on RAPIDIO default n ---help--- - Includes support for ITD Tsi568 serial RapidIO switch. + Includes support for IDT Tsi568 serial RapidIO switch. config RAPIDIO_TSI500 bool "Tsi500 Parallel RapidIO switch support" depends on RAPIDIO default n ---help--- - Includes support for ITD Tsi500 parallel RapidIO switch. + Includes support for IDT Tsi500 parallel RapidIO switch.
Signature · 1 line
1.7.0.5
PATCH 2/5 RapidIO: Add debug configuration option
In reply to Alexandre BounineAdd debug configuration option for RapidIO subsystem.
--- drivers/rapidio/Kconfig | 11 +++++++++++ drivers/rapidio/Makefile | 4 ++++ drivers/rapidio/switches/Makefile | 4 ++++ 3 files changed, 19 insertions(+), 0 deletions(-)
drivers/rapidio/Kconfig +11 -0
@@ -21,3 +21,14 @@ config RAPIDIO_ENABLE_RX_TX_PORTS than Maintenance transfers. source "drivers/rapidio/switches/Kconfig" + +config RAPIDIO_DEBUG + bool "RapidIO subsystem debug messages" + depends on RAPIDIO + help + Say Y here if you want the RapidIO subsystem to produce a bunch of + debug messages to the system log. Select this if you are having a + problem with the RapidIO subsystem and want to see more of what is + going on. + + If you are unsure about this, say N here.
drivers/rapidio/Makefile +4 -0
@@ -4,3 +4,7 @@ obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o obj-$(CONFIG_RAPIDIO) += switches/ + +ifeq ($(CONFIG_RAPIDIO_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif
drivers/rapidio/switches/Makefile +4 -0
@@ -6,3 +6,7 @@ obj-$(CONFIG_RAPIDIO_TSI57X) += tsi57x.o obj-$(CONFIG_RAPIDIO_CPS_XX) += idtcps.o obj-$(CONFIG_RAPIDIO_TSI568) += tsi568.o obj-$(CONFIG_RAPIDIO_TSI500) += tsi500.o + +ifeq ($(CONFIG_RAPIDIO_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif
Signature · 1 line
1.7.0.5
PATCH 3/5 RapidIO: Modify initialization of switch operations
In reply to Alexandre BounineModified the way how RapidIO switch operations are declared. Multiple assignments through the linker script replaced by single initialization call.
--- drivers/rapidio/rio-scan.c | 49 ++++++++------------------------ drivers/rapidio/rio.h | 56 ++++++++++--------------------------- drivers/rapidio/switches/idtcps.c | 27 +++++++++++++---- drivers/rapidio/switches/tsi500.c | 18 +++++++++++- drivers/rapidio/switches/tsi568.c | 20 +++++++++++-- drivers/rapidio/switches/tsi57x.c | 31 ++++++++++++++------ include/asm-generic/vmlinux.lds.h | 9 ++---- include/linux/rio.h | 35 ++++------------------- 8 files changed, 111 insertions(+), 134 deletions(-)
drivers/rapidio/rio-scan.c +12 -37
@@ -246,24 +246,24 @@ static int rio_is_switch(struct rio_dev *rdev) }/** -* rio_route_set_ops- Sets routing operations for a particular vendor switch +* rio_switch_init - Sets switch operations for a particular vendor switch * @rdev: RIO device +* @do_enum: Enumeration/Discovery mode flag * -* Searches the RIO route ops table for known switch types. If the vid -* and did match a switch table entry, then set the add_entry() and -* get_entry() ops to the table entry values. +* Searches the RIO switch ops table for known switch types. If the vid +* and did match a switch table entry, then call switch initialization +* routine to setup switch-specific routines. */ -static void rio_route_set_ops (struct rio_dev *rdev) +static void rio_switch_init (struct rio_dev *rdev,int do_enum) { -struct rio_route_ops *cur = __start_rio_route_ops; -struct rio_route_ops *end = __end_rio_route_ops; +struct rio_switch_ops *cur = __start_rio_switch_ops; +struct rio_switch_ops *end = __end_rio_switch_ops;while (cur < end) {if ((cur->vid == rdev->vid) && (cur->did == rdev->did)) { -pr_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; +pr_debug ("RIO: calling init routine for %s\n" , +rio_name (rdev)); + cur->init_hook (rdev, do_enum);break ; } cur++;
@@ -283,30 +283,6 @@ static void rio_route_set_ops(struct rio_dev *rdev) }/** -* rio_em_set_ops- Sets Error Managment operations for a particular vendor switch -* @rdev: RIO device -* -* Searches the RIO EM ops table for known switch types. If the vid -* and did match a switch table entry, then set the em_init() and -* em_handle() ops to the table entry values. -*/ -static void rio_em_set_ops (struct rio_dev *rdev) -{ -struct rio_em_ops *cur = __start_rio_em_ops; -struct rio_em_ops *end = __end_rio_em_ops; - -while (cur < end) { -if ((cur->vid == rdev->vid) && (cur->did == rdev->did)) { -pr_debug ("RIO: adding EM ops for %s\n" ,rio_name (rdev)); - rdev->rswitch->em_init = cur->init_hook; - rdev->rswitch->em_handle = cur->handler_hook; -break ; - } - cur++; - } -} - -/** * rio_add_device- Adds a RIO device to the device model * @rdev: RIO device *
@@ -484,8 +460,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net, rdev->rswitch = rswitch;dev_set_name (&rdev->dev,"%02x:s:%04x" , rdev->net->id, rdev->rswitch->switchid); -rio_route_set_ops (rdev); -rio_em_set_ops (rdev); +rio_switch_init (rdev, do_enum);if (do_enum && rdev->rswitch->clr_table) rdev->rswitch->clr_table(port, destid, hopcount,
drivers/rapidio/rio.h +15 -41
70 lines not on this page · raw message
drivers/rapidio/switches/idtcps.c +20 -7
@@ -1,7 +1,8 @@/* * IDT CPS RapidIO switches support * -* Copyright 2009 Integrated Device Technology, Inc. +* Copyright 2009-2010 Integrated Device Technology, Inc. +* Alexandre Bounine <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -81,9 +82,21 @@ idtcps_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,return 0 ; } -DECLARE_RIO_ROUTE_OPS (RIO_VID_IDT ,RIO_DID_IDTCPS6Q , idtcps_route_add_entry, idtcps_route_get_entry, idtcps_route_clr_table); -DECLARE_RIO_ROUTE_OPS (RIO_VID_IDT ,RIO_DID_IDTCPS8 , idtcps_route_add_entry, idtcps_route_get_entry, idtcps_route_clr_table); -DECLARE_RIO_ROUTE_OPS (RIO_VID_IDT ,RIO_DID_IDTCPS10Q , idtcps_route_add_entry, idtcps_route_get_entry, idtcps_route_clr_table); -DECLARE_RIO_ROUTE_OPS (RIO_VID_IDT ,RIO_DID_IDTCPS12 , idtcps_route_add_entry, idtcps_route_get_entry, idtcps_route_clr_table); -DECLARE_RIO_ROUTE_OPS (RIO_VID_IDT ,RIO_DID_IDTCPS16 , idtcps_route_add_entry, idtcps_route_get_entry, idtcps_route_clr_table); -DECLARE_RIO_ROUTE_OPS (RIO_VID_IDT ,RIO_DID_IDT70K200 , idtcps_route_add_entry, idtcps_route_get_entry, idtcps_route_clr_table); +static int idtcps_switch_init (struct rio_dev *rdev,int do_enum) +{ +pr_debug ("RIO: %s for %s\n" , __func__,rio_name (rdev)); + rdev->rswitch->add_entry = idtcps_route_add_entry; + rdev->rswitch->get_entry = idtcps_route_get_entry; + rdev->rswitch->clr_table = idtcps_route_clr_table; + rdev->rswitch->em_init =NULL ; + rdev->rswitch->em_handle =NULL ; + +return 0 ; +} + +DECLARE_RIO_SWITCH_INIT (RIO_VID_IDT ,RIO_DID_IDTCPS6Q , idtcps_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_IDT ,RIO_DID_IDTCPS8 , idtcps_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_IDT ,RIO_DID_IDTCPS10Q , idtcps_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_IDT ,RIO_DID_IDTCPS12 , idtcps_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_IDT ,RIO_DID_IDTCPS16 , idtcps_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_IDT ,RIO_DID_IDT70K200 , idtcps_switch_init);
drivers/rapidio/switches/tsi500.c +17 -1
@@ -1,6 +1,10 @@/* * RapidIO Tsi500 switch support * +* Copyright 2009-2010 Integrated Device Technology, Inc. +* Alexandre Bounine <[email protected]> +* - Modified switch operations initialization. +* * Copyright 2005 MontaVista Software, Inc. * Matt Porter <[email protected]> *
@@ -57,4 +61,16 @@ tsi500_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount, u16 tabreturn ret; } -DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI500 , tsi500_route_add_entry, tsi500_route_get_entry,NULL ); +static int tsi500_switch_init (struct rio_dev *rdev,int do_enum) +{ +pr_debug ("RIO: %s for %s\n" , __func__,rio_name (rdev)); + rdev->rswitch->add_entry = tsi500_route_add_entry; + rdev->rswitch->get_entry = tsi500_route_get_entry; + rdev->rswitch->clr_table =NULL ; + rdev->rswitch->em_init =NULL ; + rdev->rswitch->em_handle =NULL ; + +return 0 ; +} + +DECLARE_RIO_SWITCH_INIT (RIO_VID_TUNDRA ,RIO_DID_TSI500 , tsi500_switch_init);
drivers/rapidio/switches/tsi568.c +17 -3
@@ -2,6 +2,10 @@* RapidIO Tsi568 switch support * * Copyright 2009-2010 Integrated Device Technology, Inc. +* Alexandre Bounine <[email protected]> +* - Added EM support +* - Modified switch operations initialization. +* * Copyright 2005 MontaVista Software, Inc. * Matt Porter <[email protected]> *
@@ -106,8 +110,6 @@ tsi568_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,return 0 ; } -DECLARE_RIO_ROUTE_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI568 , tsi568_route_add_entry, tsi568_route_get_entry, tsi568_route_clr_table); -static int tsi568_em_init (struct rio_dev *rdev) {
@@ -127,4 +129,16 @@ tsi568_em_init(struct rio_dev *rdev)return 0 ; } -DECLARE_RIO_EM_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI568 , tsi568_em_init,NULL ); +static int tsi568_switch_init (struct rio_dev *rdev,int do_enum) +{ +pr_debug ("RIO: %s for %s\n" , __func__,rio_name (rdev)); + rdev->rswitch->add_entry = tsi568_route_add_entry; + rdev->rswitch->get_entry = tsi568_route_get_entry; + rdev->rswitch->clr_table = tsi568_route_clr_table; + rdev->rswitch->em_init = tsi568_em_init; + rdev->rswitch->em_handle =NULL ; + +return 0 ; +} + +DECLARE_RIO_SWITCH_INIT (RIO_VID_TUNDRA ,RIO_DID_TSI568 , tsi568_switch_init);
drivers/rapidio/switches/tsi57x.c +21 -10
@@ -1,7 +1,11 @@/* * RapidIO Tsi57x switch family support * -* Copyright 2009 Integrated Device Technology, Inc. +* Copyright 2009-2010 Integrated Device Technology, Inc. +* Alexandre Bounine <[email protected]> +* - Added EM support +* - Modified switch operations initialization. +* * Copyright 2005 MontaVista Software, Inc. * Matt Porter <[email protected]> *
@@ -108,11 +112,6 @@ tsi57x_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,return 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); -static int tsi57x_em_init (struct rio_dev *rdev) {
@@ -253,7 +252,19 @@ exit_es:return 0 ; } -DECLARE_RIO_EM_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI572 , tsi57x_em_init, tsi57x_em_handler); -DECLARE_RIO_EM_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI574 , tsi57x_em_init, tsi57x_em_handler); -DECLARE_RIO_EM_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI577 , tsi57x_em_init, tsi57x_em_handler); -DECLARE_RIO_EM_OPS (RIO_VID_TUNDRA ,RIO_DID_TSI578 , tsi57x_em_init, tsi57x_em_handler); +static int tsi57x_switch_init (struct rio_dev *rdev,int do_enum) +{ +pr_debug ("RIO: %s for %s\n" , __func__,rio_name (rdev)); + rdev->rswitch->add_entry = tsi57x_route_add_entry; + rdev->rswitch->get_entry = tsi57x_route_get_entry; + rdev->rswitch->clr_table = tsi57x_route_clr_table; + rdev->rswitch->em_init = tsi57x_em_init; + rdev->rswitch->em_handle = tsi57x_em_handler; + +return 0 ; +} + +DECLARE_RIO_SWITCH_INIT (RIO_VID_TUNDRA ,RIO_DID_TSI572 , tsi57x_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_TUNDRA ,RIO_DID_TSI574 , tsi57x_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_TUNDRA ,RIO_DID_TSI577 , tsi57x_switch_init); +DECLARE_RIO_SWITCH_INIT (RIO_VID_TUNDRA ,RIO_DID_TSI578 , tsi57x_switch_init);
include/asm-generic/vmlinux.lds.h +3 -6
@@ -248,12 +248,9 @@ \/* RapidIO route ops */ \ .rio_ops : AT(ADDR(.rio_ops) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_rio_route_ops) = .; \ - *(.rio_route_ops) \ - VMLINUX_SYMBOL(__end_rio_route_ops) = .; \ - VMLINUX_SYMBOL(__start_rio_em_ops) = .; \ - *(.rio_em_ops) \ - VMLINUX_SYMBOL(__end_rio_em_ops) = .; \ + VMLINUX_SYMBOL(__start_rio_switch_ops) = .; \ + *(.rio_switch_ops) \ + VMLINUX_SYMBOL(__end_rio_switch_ops) = .; \ } \ \TRACEDATA \
include/linux/rio.h +6 -29
@@ -320,40 +320,17 @@ struct rio_device_id { };/** -* struct rio_route_ops - Per-switch route operations +* struct rio_switch_ops - Per-switch operations * @vid: RIO vendor 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) +* @init_hook: Callback that performs switch device initialization * -* Defines the operations that are necessary to manipulate the route -* tables for a particular RIO switch device. +* Defines the operations that are necessary to initialize/control +* a particular RIO switch device. */ -struct rio_route_ops { +struct rio_switch_ops {u16 vid, did; -int (*add_hook) (struct rio_mport * mport,u16 destid,u8 hopcount, -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); -}; - -/** -* struct rio_em_ops - Per-switch error management operations -* @vid: RIO vendor ID -* @did: RIO device ID -* @init_hook: Switch specific error management initialization (may be NULL) -* @handler_hook: Switch specific error management handler (may be NULL) -* -* Defines the operations that are necessary to initialize and handle -* error management events for a particular RIO switch device. -*/ -struct rio_em_ops { -u16 vid, did; -int (*init_hook) (struct rio_dev *dev); -int (*handler_hook) (struct rio_dev *dev,u8 swport); +int (*init_hook) (struct rio_dev *rdev,int do_enum); };union rio_pw_msg {
Signature · 1 line
1.7.0.5
PATCH 4/5 RapidIO: Add switch domain routines
In reply to Alexandre BounineAdded switch specific domain routines required for 16-bit routing support in switches with hierarchical implementation of routing tables.
--- drivers/rapidio/switches/idtcps.c | 33 +++++++++++++++++++++++++++ drivers/rapidio/switches/tsi500.c | 2 + drivers/rapidio/switches/tsi568.c | 2 + drivers/rapidio/switches/tsi57x.c | 45 +++++++++++++++++++++++++++++++++++++ include/linux/rio.h | 4 +++ 5 files changed, 86 insertions(+), 0 deletions(-)
drivers/rapidio/switches/idtcps.c +33 -0
@@ -17,6 +17,8 @@#define CPS_NO_ROUTE 0xdf +#define IDTCPS_RIO_DOMAIN 0xf20020 +static int idtcps_route_add_entry (struct rio_mport *mport,u16 destid,u8 hopcount,u16 table,u16 route_destid,u8 route_port)
@@ -82,12 +84,43 @@ idtcps_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,return 0 ; } +static int +idtcps_set_domain (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 sw_domain) +{ +/* +* Switch domain configuration operates only at global level +*/ +rio_mport_write_config_32 (mport, destid, hopcount, +IDTCPS_RIO_DOMAIN , (u32 )sw_domain); +return 0 ; +} + +static int +idtcps_get_domain (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 *sw_domain) +{ +u32 regval; + +/* +* Switch domain configuration operates only at global level +*/ +rio_mport_read_config_32 (mport, destid, hopcount, +IDTCPS_RIO_DOMAIN , ®val); + + *sw_domain = (u8)(regval &0xff ); + +return 0 ; +} +static int idtcps_switch_init (struct rio_dev *rdev,int do_enum) {pr_debug ("RIO: %s for %s\n" , __func__,rio_name (rdev)); rdev->rswitch->add_entry = idtcps_route_add_entry; rdev->rswitch->get_entry = idtcps_route_get_entry; rdev->rswitch->clr_table = idtcps_route_clr_table; + rdev->rswitch->set_domain = idtcps_set_domain; + rdev->rswitch->get_domain = idtcps_get_domain; rdev->rswitch->em_init =NULL ; rdev->rswitch->em_handle =NULL ;
drivers/rapidio/switches/tsi500.c +2 -0
@@ -67,6 +67,8 @@ static int tsi500_switch_init(struct rio_dev *rdev, int do_enum) rdev->rswitch->add_entry = tsi500_route_add_entry; rdev->rswitch->get_entry = tsi500_route_get_entry; rdev->rswitch->clr_table =NULL ; + rdev->rswitch->set_domain =NULL ; + rdev->rswitch->get_domain =NULL ; rdev->rswitch->em_init =NULL ; rdev->rswitch->em_handle =NULL ;
drivers/rapidio/switches/tsi568.c +2 -0
@@ -135,6 +135,8 @@ static int tsi568_switch_init(struct rio_dev *rdev, int do_enum) rdev->rswitch->add_entry = tsi568_route_add_entry; rdev->rswitch->get_entry = tsi568_route_get_entry; rdev->rswitch->clr_table = tsi568_route_clr_table; + rdev->rswitch->set_domain =NULL ; + rdev->rswitch->get_domain =NULL ; rdev->rswitch->em_init = tsi568_em_init; rdev->rswitch->em_handle =NULL ;
drivers/rapidio/switches/tsi57x.c +45 -0
70 lines not on this page · raw message
include/linux/rio.h +4 -0
@@ -238,6 +238,10 @@ struct rio_switch { u16 table, u16 route_destid, u8 * route_port);int (*clr_table) (struct rio_mport *mport,u16 destid,u8 hopcount,u16 table); +int (*set_domain) (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 sw_domain); +int (*get_domain) (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 *sw_domain);int (*em_init) (struct rio_dev *dev);int (*em_handle) (struct rio_dev *dev,u8 swport); };
Signature · 1 line
1.7.0.5
Re: [PATCH -mm 4/5] RapidIO: Add switch domain routines
Quoted 18 lines · On Mon, 3 May 2010 11:45:57 -0400 Alexandre Bounine…
drivers/rapidio/switches/idtcps.c +18
-0+static int +idtcps_set_domain (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 sw_domain) +{ +/* +* Switch domain configuration operates only at global level +*/ +rio_mport_write_config_32 (mport, destid, hopcount, +IDTCPS_RIO_DOMAIN , (u32 )sw_domain); +return 0 ; +} + +static int +idtcps_get_domain (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 *sw_domain) +{ +u32 regval; +
drivers/rapidio/switches/idtcps.c idtcps_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount, · line 114
Quoted 10 lines
drivers/rapidio/switches/idtcps.c +10
-0+/* +* Switch domain configuration operates only at global level +*/ +rio_mport_read_config_32 (mport, destid, hopcount, +IDTCPS_RIO_DOMAIN , ®val); + + *sw_domain = (u8)(regval &0xff ); + +return 0 ; +}
This ignores the return values from rio_mport_write_config_*().
AFACIT these things always return hard-wired 0 anyway. Perhaps we should give up and change ->cread() and friends to return void. That beats the alternative of adding lots of untestable test-n-return unwinding code.
RE: [PATCH -mm 4/5] RapidIO: Add switch domain routines
Quoted 35 lines · On Tuesday, May 04, 2010 7:25 PM Andrew Morton…
Quoted 18 lines · On Mon, 3 May 2010 11:45:57 -0400 Alexandre Bounine…
drivers/rapidio/switches/idtcps.c +18
-0+static int +idtcps_set_domain (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 sw_domain) +{ +/* +* Switch domain configuration operates only at global level +*/ +rio_mport_write_config_32 (mport, destid, hopcount, +IDTCPS_RIO_DOMAIN , (u32 )sw_domain); +return 0 ; +} + +static int +idtcps_get_domain (struct rio_mport *mport,u16 destid,u8 hopcount, +u8 *sw_domain) +{ +u32 regval; +drivers/rapidio/switches/idtcps.c idtcps_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount, · line 114
Quoted 10 lines
drivers/rapidio/switches/idtcps.c +10
-0+/* +* Switch domain configuration operates only at global level +*/ +rio_mport_read_config_32 (mport, destid, hopcount, +IDTCPS_RIO_DOMAIN , ®val); + + *sw_domain = (u8)(regval &0xff ); + +return 0 ; +}This ignores the return values from rio_mport_write_config_*().
Quoted 4 lines
AFACIT these things always return hard-wired 0 anyway. Perhaps we should give up and change ->cread() and friends to return void. That beats the alternative of adding lots of untestable test-n-return unwinding code.
We are planning to address this by properly handling return values of these functions.
This is work in progress and we may see it published later (for entire RapidIO subsystem).
At this moment I simply follow established trend.
PATCH 5/5 RapidIO: Use default route value for CPS switches
In reply to Alexandre BounineFixed to use correct default value for routing table entries.
--- drivers/rapidio/switches/idtcps.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-)
drivers/rapidio/switches/idtcps.c +10 -8
@@ -15,7 +15,8 @@#include <linux/rio_ids.h> #include "../rio.h" -#define CPS_NO_ROUTE 0xdf +#define CPS_DEFAULT_ROUTE 0xde +#define CPS_NO_ROUTE 0xdf#define IDTCPS_RIO_DOMAIN 0xf20020
@@ -53,10 +54,11 @@ idtcps_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount,rio_mport_read_config_32 (mport, destid, hopcount,RIO_STD_RTE_CONF_PORT_SEL_CSR , &result); -if (CPS_NO_ROUTE == (u8 )result) - result =RIO_INVALID_ROUTE ; - - *route_port = (u8 )result; +if (CPS_DEFAULT_ROUTE == (u8 )result || +CPS_NO_ROUTE == (u8 )result) + *route_port =RIO_INVALID_ROUTE ; +else + *route_port = (u8 )result; }return 0 ;
@@ -74,9 +76,9 @@ idtcps_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount, RIO_STD_RTE_CONF_DESTID_SEL_CSR, i);rio_mport_write_config_32 (mport, destid, hopcount,RIO_STD_RTE_CONF_PORT_SEL_CSR , - (RIO_INVALID_ROUTE <<24 ) | - (RIO_INVALID_ROUTE <<16 ) | - (RIO_INVALID_ROUTE <<8 ) |RIO_INVALID_ROUTE ); + (CPS_DEFAULT_ROUTE <<24 ) | + (CPS_DEFAULT_ROUTE <<16 ) | + (CPS_DEFAULT_ROUTE <<8 ) |CPS_DEFAULT_ROUTE ); i +=4 ; } }
Signature · 1 line
1.7.0.5
cover RapidIO: Fix maintenance access to higher memory areas
In reply to Alexandre BounineThe following RapidIO patch is applicable to the latest kernel tree with applied RapidIO patches from Alexandre Bounine. The modification is required for IDT CPS switch devices which will access these memory areas, to setup 16bit routing.