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

Commit 679395fd authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: use default route value for CPS switches 



Fix to use correct default value for routing table entries.

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

drivers/rapidio/switches/idtcps.c

+10 −8
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/rio_ids.h>

#include "../rio.h"



#define CPS_DEFAULT_ROUTE	0xde

#define CPS_NO_ROUTE		0xdf



#define IDTCPS_RIO_DOMAIN 0xf20020
@@ -53,9 +54,10 @@ 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;



		if (CPS_DEFAULT_ROUTE == (u8)result ||

		    CPS_NO_ROUTE == (u8)result)

			*route_port = RIO_INVALID_ROUTE;

		else

			*route_port = (u8)result;

	}
@@ -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;

		}

	}