rapidio: add Port-Write handling for EM
Add RapidIO Port-Write message handling in the context of Error Management Extensions Specification Rev.1.3. Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Tested-by: 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
818a04a0bb
commit
e5cabeb3d6
@@ -25,6 +25,9 @@
|
||||
#define SPP_ROUTE_CFG_DESTID(n) (0x11070 + 0x100*n)
|
||||
#define SPP_ROUTE_CFG_PORT(n) (0x11074 + 0x100*n)
|
||||
|
||||
#define TSI568_SP_MODE_BC 0x10004
|
||||
#define TSI568_SP_MODE_PW_DIS 0x08000000
|
||||
|
||||
static int
|
||||
tsi568_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
|
||||
u16 table, u16 route_destid, u8 route_port)
|
||||
@@ -104,3 +107,24 @@ tsi568_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
struct rio_mport *mport = rdev->net->hport;
|
||||
u16 destid = rdev->rswitch->destid;
|
||||
u8 hopcount = rdev->rswitch->hopcount;
|
||||
u32 regval;
|
||||
|
||||
pr_debug("TSI568 %s [%d:%d]\n", __func__, destid, hopcount);
|
||||
|
||||
/* Make sure that Port-Writes are disabled (for all ports) */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
TSI568_SP_MODE_BC, ®val);
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
TSI568_SP_MODE_BC, regval | TSI568_SP_MODE_PW_DIS);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
DECLARE_RIO_EM_OPS(RIO_VID_TUNDRA, RIO_DID_TSI568, tsi568_em_init, NULL);
|
||||
|
@@ -25,6 +25,14 @@
|
||||
#define SPP_ROUTE_CFG_DESTID(n) (0x11070 + 0x100*n)
|
||||
#define SPP_ROUTE_CFG_PORT(n) (0x11074 + 0x100*n)
|
||||
|
||||
#define TSI578_SP_MODE(n) (0x11004 + n*0x100)
|
||||
#define TSI578_SP_MODE_PW_DIS 0x08000000
|
||||
|
||||
#define TSI578_SP_CTL_INDEP(n) (0x13004 + n*0x100)
|
||||
#define TSI578_SP_LUT_PEINF(n) (0x13010 + n*0x100)
|
||||
#define TSI578_SP_CS_TX(n) (0x13014 + n*0x100)
|
||||
#define TSI578_SP_INT_STATUS(n) (0x13018 + n*0x100)
|
||||
|
||||
static int
|
||||
tsi57x_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
|
||||
u16 table, u16 route_destid, u8 route_port)
|
||||
@@ -104,3 +112,148 @@ DECLARE_RIO_ROUTE_OPS(RIO_VID_TUNDRA, RIO_DID_TSI572, tsi57x_route_add_entry, ts
|
||||
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)
|
||||
{
|
||||
struct rio_mport *mport = rdev->net->hport;
|
||||
u16 destid = rdev->rswitch->destid;
|
||||
u8 hopcount = rdev->rswitch->hopcount;
|
||||
u32 regval;
|
||||
int portnum;
|
||||
|
||||
pr_debug("TSI578 %s [%d:%d]\n", __func__, destid, hopcount);
|
||||
|
||||
for (portnum = 0; portnum < 16; portnum++) {
|
||||
/* Make sure that Port-Writes are enabled (for all ports) */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_MODE(portnum), ®val);
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_MODE(portnum),
|
||||
regval & ~TSI578_SP_MODE_PW_DIS);
|
||||
|
||||
/* Clear all pending interrupts */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr +
|
||||
RIO_PORT_N_ERR_STS_CSR(portnum),
|
||||
®val);
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr +
|
||||
RIO_PORT_N_ERR_STS_CSR(portnum),
|
||||
regval & 0x07120214);
|
||||
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_INT_STATUS(portnum), ®val);
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_INT_STATUS(portnum),
|
||||
regval & 0x000700bd);
|
||||
|
||||
/* Enable all interrupts to allow ports to send a port-write */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_CTL_INDEP(portnum), ®val);
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_CTL_INDEP(portnum),
|
||||
regval | 0x000b0000);
|
||||
|
||||
/* Skip next (odd) port if the current port is in x4 mode */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
|
||||
®val);
|
||||
if ((regval & RIO_PORT_N_CTL_PWIDTH) == RIO_PORT_N_CTL_PWIDTH_4)
|
||||
portnum++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
tsi57x_em_handler(struct rio_dev *rdev, u8 portnum)
|
||||
{
|
||||
struct rio_mport *mport = rdev->net->hport;
|
||||
u16 destid = rdev->rswitch->destid;
|
||||
u8 hopcount = rdev->rswitch->hopcount;
|
||||
u32 intstat, err_status;
|
||||
int sendcount, checkcount;
|
||||
u8 route_port;
|
||||
u32 regval;
|
||||
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
|
||||
&err_status);
|
||||
|
||||
if ((err_status & RIO_PORT_N_ERR_STS_PORT_OK) &&
|
||||
(err_status & (RIO_PORT_N_ERR_STS_PW_OUT_ES |
|
||||
RIO_PORT_N_ERR_STS_PW_INP_ES))) {
|
||||
/* Remove any queued packets by locking/unlocking port */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
|
||||
®val);
|
||||
if (!(regval & RIO_PORT_N_CTL_LOCKOUT)) {
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
|
||||
regval | RIO_PORT_N_CTL_LOCKOUT);
|
||||
udelay(50);
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
|
||||
regval);
|
||||
}
|
||||
|
||||
/* Read from link maintenance response register to clear
|
||||
* valid bit
|
||||
*/
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
rdev->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(portnum),
|
||||
®val);
|
||||
|
||||
/* Send a Packet-Not-Accepted/Link-Request-Input-Status control
|
||||
* symbol to recover from IES/OES
|
||||
*/
|
||||
sendcount = 3;
|
||||
while (sendcount) {
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_CS_TX(portnum), 0x40fc8000);
|
||||
checkcount = 3;
|
||||
while (checkcount--) {
|
||||
udelay(50);
|
||||
rio_mport_read_config_32(
|
||||
mport, destid, hopcount,
|
||||
rdev->phys_efptr +
|
||||
RIO_PORT_N_MNT_RSP_CSR(portnum),
|
||||
®val);
|
||||
if (regval & RIO_PORT_N_MNT_RSP_RVAL)
|
||||
goto exit_es;
|
||||
}
|
||||
|
||||
sendcount--;
|
||||
}
|
||||
}
|
||||
|
||||
exit_es:
|
||||
/* Clear implementation specific error status bits */
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_INT_STATUS(portnum), &intstat);
|
||||
pr_debug("TSI578[%x:%x] SP%d_INT_STATUS=0x%08x\n",
|
||||
destid, hopcount, portnum, intstat);
|
||||
|
||||
if (intstat & 0x10000) {
|
||||
rio_mport_read_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_LUT_PEINF(portnum), ®val);
|
||||
regval = (mport->sys_size) ? (regval >> 16) : (regval >> 24);
|
||||
route_port = rdev->rswitch->route_table[regval];
|
||||
pr_debug("RIO: TSI578[%s] P%d LUT Parity Error (destID=%d)\n",
|
||||
rio_name(rdev), portnum, regval);
|
||||
tsi57x_route_add_entry(mport, destid, hopcount,
|
||||
RIO_GLOBAL_TABLE, regval, route_port);
|
||||
}
|
||||
|
||||
rio_mport_write_config_32(mport, destid, hopcount,
|
||||
TSI578_SP_INT_STATUS(portnum),
|
||||
intstat & 0x000700bd);
|
||||
|
||||
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);
|
||||
|
Reference in New Issue
Block a user