Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bf2461f authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: fix default routing initialization 



Fix switch initialization to ensure that all switches have default routing
disabled.  This guarantees that no unexpected RapidIO packets arrive to
the default port set by reset and there is no default routing destination
until it is properly configured by software.

This update also unifies handling of unmapped destinations by tsi57x, IDT
Gen1 and IDT Gen2 switches.

Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: <stable@kernel.org>		[2.6.37+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a085963a

drivers/rapidio/switches/idt_gen2.c

+9 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ idtg2_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount, 
	else

		table++;



	if (route_port == RIO_INVALID_ROUTE)

		route_port = IDT_DEFAULT_ROUTE;



	rio_mport_write_config_32(mport, destid, hopcount,

				  LOCAL_RTE_CONF_DESTID_SEL, table);
@@ -411,6 +414,12 @@ static int idtg2_switch_init(struct rio_dev *rdev, int do_enum) 
	rdev->rswitch->em_handle = idtg2_em_handler;

	rdev->rswitch->sw_sysfs = idtg2_sysfs;



	if (do_enum) {

		/* Ensure that default routing is disabled on startup */

		rio_write_config_32(rdev,

				    RIO_STD_RTE_DEFAULT_PORT, IDT_NO_ROUTE);

	}



	return 0;

}

drivers/rapidio/switches/idtcps.c

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ idtcps_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount, 
{

	u32 result;



	if (route_port == RIO_INVALID_ROUTE)

		route_port = CPS_DEFAULT_ROUTE;



	if (table == RIO_GLOBAL_TABLE) {

		rio_mport_write_config_32(mport, destid, hopcount,

				RIO_STD_RTE_CONF_DESTID_SEL_CSR, route_destid);
@@ -130,6 +133,9 @@ static int idtcps_switch_init(struct rio_dev *rdev, int do_enum) 
		/* set TVAL = ~50us */

		rio_write_config_32(rdev,

			rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x8e << 8);

		/* Ensure that default routing is disabled on startup */

		rio_write_config_32(rdev,

				    RIO_STD_RTE_DEFAULT_PORT, CPS_NO_ROUTE);

	}



	return 0;

drivers/rapidio/switches/tsi57x.c

+6 −0
Original line number Diff line number Diff line
@@ -303,6 +303,12 @@ static int tsi57x_switch_init(struct rio_dev *rdev, int do_enum) 
	rdev->rswitch->em_init = tsi57x_em_init;

	rdev->rswitch->em_handle = tsi57x_em_handler;



	if (do_enum) {

		/* Ensure that default routing is disabled on startup */

		rio_write_config_32(rdev, RIO_STD_RTE_DEFAULT_PORT,

				    RIO_INVALID_ROUTE);

	}



	return 0;

}