6 files changed, 481 insertions, 6 deletions

diff --git a/drivers/rapidio/switches/Kconfig b/drivers/rapidio/switches/Kconfig
index 2b4e9b2b6631..f47fee5d4563 100644
--- a/drivers/rapidio/switches/Kconfig
+++ b/drivers/rapidio/switches/Kconfig
@@ -20,6 +20,13 @@ config RAPIDIO_TSI568
         ---help---
           Includes support for IDT Tsi568 serial RapidIO switch.
 
+config RAPIDIO_CPS_GEN2
+        bool "IDT CPS Gen.2 SRIO switch support"
+        depends on RAPIDIO
+        default n
+        ---help---
+          Includes support for ITD CPS Gen.2 serial RapidIO switches.
+
 config RAPIDIO_TSI500
         bool "Tsi500 Parallel RapidIO switch support"
         depends on RAPIDIO
diff --git a/drivers/rapidio/switches/Makefile b/drivers/rapidio/switches/Makefile
index fe4adc3e8d5f..48d67a6b98c8 100644
--- a/drivers/rapidio/switches/Makefile
+++ b/drivers/rapidio/switches/Makefile
@@ -6,6 +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
+obj-$(CONFIG_RAPIDIO_CPS_GEN2)  += idt_gen2.o
 
 ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/rapidio/switches/idt_gen2.c b/drivers/rapidio/switches/idt_gen2.c
new file mode 100644
index 000000000000..0bb871cb5c40
--- /dev/null
+++ b/drivers/rapidio/switches/idt_gen2.c
@@ -0,0 +1,447 @@
+/*
+ * IDT CPS Gen.2 Serial RapidIO switch family support
+ *
+ * Copyright 2010 Integrated Device Technology, Inc.
+ * Alexandre Bounine <alexandre.bounine@idt.com>
+ *
+ * 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
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/rio_ids.h>
+#include <linux/delay.h>
+#include "../rio.h"
+
+#define LOCAL_RTE_CONF_DESTID_SEL       0x010070
+#define LOCAL_RTE_CONF_DESTID_SEL_PSEL  0x0000001f
+
+#define IDT_LT_ERR_REPORT_EN    0x03100c
+
+#define IDT_PORT_ERR_REPORT_EN(n)       (0x031044 + (n)*0x40)
+#define IDT_PORT_ERR_REPORT_EN_BC       0x03ff04
+
+#define IDT_PORT_ISERR_REPORT_EN(n)     (0x03104C + (n)*0x40)
+#define IDT_PORT_ISERR_REPORT_EN_BC     0x03ff0c
+#define IDT_PORT_INIT_TX_ACQUIRED       0x00000020
+
+#define IDT_LANE_ERR_REPORT_EN(n)       (0x038010 + (n)*0x100)
+#define IDT_LANE_ERR_REPORT_EN_BC       0x03ff10
+
+#define IDT_DEV_CTRL_1          0xf2000c
+#define IDT_DEV_CTRL_1_GENPW            0x02000000
+#define IDT_DEV_CTRL_1_PRSTBEH          0x00000001
+
+#define IDT_CFGBLK_ERR_CAPTURE_EN       0x020008
+#define IDT_CFGBLK_ERR_REPORT           0xf20014
+#define IDT_CFGBLK_ERR_REPORT_GENPW             0x00000002
+
+#define IDT_AUX_PORT_ERR_CAP_EN 0x020000
+#define IDT_AUX_ERR_REPORT_EN   0xf20018
+#define IDT_AUX_PORT_ERR_LOG_I2C        0x00000002
+#define IDT_AUX_PORT_ERR_LOG_JTAG       0x00000001
+
+#define IDT_ISLTL_ADDRESS_CAP   0x021014
+
+#define IDT_RIO_DOMAIN          0xf20020
+#define IDT_RIO_DOMAIN_MASK             0x000000ff
+
+#define IDT_PW_INFO_CSR         0xf20024
+
+#define IDT_SOFT_RESET          0xf20040
+#define IDT_SOFT_RESET_REQ              0x00030097
+
+#define IDT_I2C_MCTRL           0xf20050
+#define IDT_I2C_MCTRL_GENPW             0x04000000
+
+#define IDT_JTAG_CTRL           0xf2005c
+#define IDT_JTAG_CTRL_GENPW             0x00000002
+
+#define IDT_LANE_CTRL(n)        (0xff8000 + (n)*0x100)
+#define IDT_LANE_CTRL_BC        0xffff00
+#define IDT_LANE_CTRL_GENPW             0x00200000
+#define IDT_LANE_DFE_1_BC       0xffff18
+#define IDT_LANE_DFE_2_BC       0xffff1c
+
+#define IDT_PORT_OPS(n)         (0xf40004 + (n)*0x100)
+#define IDT_PORT_OPS_GENPW              0x08000000
+#define IDT_PORT_OPS_PL_ELOG            0x00000040
+#define IDT_PORT_OPS_LL_ELOG            0x00000020
+#define IDT_PORT_OPS_LT_ELOG            0x00000010
+#define IDT_PORT_OPS_BC         0xf4ff04
+
+#define IDT_PORT_ISERR_DET(n)   (0xf40008 + (n)*0x100)
+
+#define IDT_ERR_CAP             0xfd0000
+#define IDT_ERR_CAP_LOG_OVERWR          0x00000004
+
+#define IDT_ERR_RD              0xfd0004
+
+#define IDT_DEFAULT_ROUTE       0xde
+#define IDT_NO_ROUTE            0xdf
+
+static int
+idtg2_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
+                       u16 table, u16 route_destid, u8 route_port)
+{
+        /*
+         * Select routing table to update
+         */
+        if (table == RIO_GLOBAL_TABLE)
+                table = 0;
+        else
+                table++;
+
+        rio_mport_write_config_32(mport, destid, hopcount,
+                                  LOCAL_RTE_CONF_DESTID_SEL, table);
+
+        /*
+         * Program destination port for the specified destID
+         */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                                  RIO_STD_RTE_CONF_DESTID_SEL_CSR,
+                                  (u32)route_destid);
+
+        rio_mport_write_config_32(mport, destid, hopcount,
+                                  RIO_STD_RTE_CONF_PORT_SEL_CSR,
+                                  (u32)route_port);
+        udelay(10);
+
+        return 0;
+}
+
+static int
+idtg2_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
+                       u16 table, u16 route_destid, u8 *route_port)
+{
+        u32 result;
+
+        /*
+         * Select routing table to read
+         */
+        if (table == RIO_GLOBAL_TABLE)
+                table = 0;
+        else
+                table++;
+
+        rio_mport_write_config_32(mport, destid, hopcount,
+                                  LOCAL_RTE_CONF_DESTID_SEL, table);
+
+        rio_mport_write_config_32(mport, destid, hopcount,
+                                  RIO_STD_RTE_CONF_DESTID_SEL_CSR,
+                                  route_destid);
+
+        rio_mport_read_config_32(mport, destid, hopcount,
+                                 RIO_STD_RTE_CONF_PORT_SEL_CSR, &result);
+
+        if (IDT_DEFAULT_ROUTE == (u8)result || IDT_NO_ROUTE == (u8)result)
+                *route_port = RIO_INVALID_ROUTE;
+        else
+                *route_port = (u8)result;
+
+        return 0;
+}
+
+static int
+idtg2_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
+                       u16 table)
+{
+        u32 i;
+
+        /*
+         * Select routing table to read
+         */
+        if (table == RIO_GLOBAL_TABLE)
+                table = 0;
+        else
+                table++;
+
+        rio_mport_write_config_32(mport, destid, hopcount,
+                                  LOCAL_RTE_CONF_DESTID_SEL, table);
+
+        for (i = RIO_STD_RTE_CONF_EXTCFGEN;
+             i <= (RIO_STD_RTE_CONF_EXTCFGEN | 0xff);) {
+                rio_mport_write_config_32(mport, destid, hopcount,
+                        RIO_STD_RTE_CONF_DESTID_SEL_CSR, i);
+                rio_mport_write_config_32(mport, destid, hopcount,
+                        RIO_STD_RTE_CONF_PORT_SEL_CSR,
+                        (IDT_DEFAULT_ROUTE << 24) | (IDT_DEFAULT_ROUTE << 16) |
+                        (IDT_DEFAULT_ROUTE << 8) | IDT_DEFAULT_ROUTE);
+                i += 4;
+        }
+
+        return 0;
+}
+
+
+static int
+idtg2_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,
+                                  IDT_RIO_DOMAIN, (u32)sw_domain);
+        return 0;
+}
+
+static int
+idtg2_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,
+                                IDT_RIO_DOMAIN, &regval);
+
+        *sw_domain = (u8)(regval & 0xff);
+
+        return 0;
+}
+
+static int
+idtg2_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 i, tmp;
+
+        /*
+         * This routine performs device-specific initialization only.
+         * All standard EM configuration should be performed at upper level.
+         */
+
+        pr_debug("RIO: %s [%d:%d]\n", __func__, destid, hopcount);
+
+        /* Set Port-Write info CSR: PRIO=3 and CRF=1 */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_PW_INFO_CSR, 0x0000e000);
+
+        /*
+         * Configure LT LAYER error reporting.
+         */
+
+        /* Enable standard (RIO.p8) error reporting */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_LT_ERR_REPORT_EN,
+                        REM_LTL_ERR_ILLTRAN | REM_LTL_ERR_UNSOLR |
+                        REM_LTL_ERR_UNSUPTR);
+
+        /* Use Port-Writes for LT layer error reporting.
+         * Enable per-port reset
+         */
+        rio_mport_read_config_32(mport, destid, hopcount,
+                        IDT_DEV_CTRL_1, &regval);
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_DEV_CTRL_1,
+                        regval | IDT_DEV_CTRL_1_GENPW | IDT_DEV_CTRL_1_PRSTBEH);
+
+        /*
+         * Configure PORT error reporting.
+         */
+
+        /* Report all RIO.p8 errors supported by device */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_PORT_ERR_REPORT_EN_BC, 0x807e8037);
+
+        /* Configure reporting of implementation specific errors/events */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_PORT_ISERR_REPORT_EN_BC, IDT_PORT_INIT_TX_ACQUIRED);
+
+        /* Use Port-Writes for port error reporting and enable error logging */
+        tmp = RIO_GET_TOTAL_PORTS(rdev->swpinfo);
+        for (i = 0; i < tmp; i++) {
+                rio_mport_read_config_32(mport, destid, hopcount,
+                                IDT_PORT_OPS(i), &regval);
+                rio_mport_write_config_32(mport, destid, hopcount,
+                                IDT_PORT_OPS(i), regval | IDT_PORT_OPS_GENPW |
+                                IDT_PORT_OPS_PL_ELOG |
+                                IDT_PORT_OPS_LL_ELOG |
+                                IDT_PORT_OPS_LT_ELOG);
+        }
+        /* Overwrite error log if full */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_ERR_CAP, IDT_ERR_CAP_LOG_OVERWR);
+
+        /*
+         * Configure LANE error reporting.
+         */
+
+        /* Disable line error reporting */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_LANE_ERR_REPORT_EN_BC, 0);
+
+        /* Use Port-Writes for lane error reporting (when enabled)
+         * (do per-lane update because lanes may have different configuration)
+         */
+        tmp = (rdev->did == RIO_DID_IDTCPS1848) ? 48 : 16;
+        for (i = 0; i < tmp; i++) {
+                rio_mport_read_config_32(mport, destid, hopcount,
+                                IDT_LANE_CTRL(i), &regval);
+                rio_mport_write_config_32(mport, destid, hopcount,
+                                IDT_LANE_CTRL(i), regval | IDT_LANE_CTRL_GENPW);
+        }
+
+        /*
+         * Configure AUX error reporting.
+         */
+
+        /* Disable JTAG and I2C Error capture */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_AUX_PORT_ERR_CAP_EN, 0);
+
+        /* Disable JTAG and I2C Error reporting/logging */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_AUX_ERR_REPORT_EN, 0);
+
+        /* Disable Port-Write notification from JTAG */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_JTAG_CTRL, 0);
+
+        /* Disable Port-Write notification from I2C */
+        rio_mport_read_config_32(mport, destid, hopcount,
+                        IDT_I2C_MCTRL, &regval);
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_I2C_MCTRL,
+                        regval & ~IDT_I2C_MCTRL_GENPW);
+
+        /*
+         * Configure CFG_BLK error reporting.
+         */
+
+        /* Disable Configuration Block error capture */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_CFGBLK_ERR_CAPTURE_EN, 0);
+
+        /* Disable Port-Writes for Configuration Block error reporting */
+        rio_mport_read_config_32(mport, destid, hopcount,
+                        IDT_CFGBLK_ERR_REPORT, &regval);
+        rio_mport_write_config_32(mport, destid, hopcount,
+                        IDT_CFGBLK_ERR_REPORT,
+                        regval & ~IDT_CFGBLK_ERR_REPORT_GENPW);
+
+        /* set TVAL = ~50us */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x8e << 8);
+
+        return 0;
+}
+
+static int
+idtg2_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 regval, em_perrdet, em_ltlerrdet;
+
+        rio_mport_read_config_32(mport, destid, hopcount,
+                rdev->em_efptr + RIO_EM_LTL_ERR_DETECT, &em_ltlerrdet);
+        if (em_ltlerrdet) {
+                /* Service Logical/Transport Layer Error(s) */
+                if (em_ltlerrdet & REM_LTL_ERR_IMPSPEC) {
+                        /* Implementation specific error reported */
+                        rio_mport_read_config_32(mport, destid, hopcount,
+                                        IDT_ISLTL_ADDRESS_CAP, &regval);
+
+                        pr_debug("RIO: %s Implementation Specific LTL errors" \
+                                 " 0x%x @(0x%x)\n",
+                                 rio_name(rdev), em_ltlerrdet, regval);
+
+                        /* Clear implementation specific address capture CSR */
+                        rio_mport_write_config_32(mport, destid, hopcount,
+                                        IDT_ISLTL_ADDRESS_CAP, 0);
+
+                }
+        }
+
+        rio_mport_read_config_32(mport, destid, hopcount,
+                rdev->em_efptr + RIO_EM_PN_ERR_DETECT(portnum), &em_perrdet);
+        if (em_perrdet) {
+                /* Service Port-Level Error(s) */
+                if (em_perrdet & REM_PED_IMPL_SPEC) {
+                        /* Implementation Specific port error reported */
+
+                        /* Get IS errors reported */
+                        rio_mport_read_config_32(mport, destid, hopcount,
+                                        IDT_PORT_ISERR_DET(portnum), &regval);
+
+                        pr_debug("RIO: %s Implementation Specific Port" \
+                                 " errors 0x%x\n", rio_name(rdev), regval);
+
+                        /* Clear all implementation specific events */
+                        rio_mport_write_config_32(mport, destid, hopcount,
+                                        IDT_PORT_ISERR_DET(portnum), 0);
+                }
+        }
+
+        return 0;
+}
+
+static ssize_t
+idtg2_show_errlog(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct rio_dev *rdev = to_rio_dev(dev);
+        struct rio_mport *mport = rdev->net->hport;
+        u16 destid = rdev->rswitch->destid;
+        u8 hopcount = rdev->rswitch->hopcount;
+        ssize_t len = 0;
+        u32 regval;
+
+        while (!rio_mport_read_config_32(mport, destid, hopcount,
+                                         IDT_ERR_RD, &regval)) {
+                if (!regval)    /* 0 = end of log */
+                        break;
+                len += snprintf(buf + len, PAGE_SIZE - len,
+                                        "%08x\n", regval);
+                if (len >= (PAGE_SIZE - 10))
+                        break;
+        }
+
+        return len;
+}
+
+static DEVICE_ATTR(errlog, S_IRUGO, idtg2_show_errlog, NULL);
+
+static int idtg2_sysfs(struct rio_dev *rdev, int create)
+{
+        struct device *dev = &rdev->dev;
+        int err = 0;
+
+        if (create == RIO_SW_SYSFS_CREATE) {
+                /* Initialize sysfs entries */
+                err = device_create_file(dev, &dev_attr_errlog);
+                if (err)
+                        dev_err(dev, "Unable create sysfs errlog file\n");
+        } else
+                device_remove_file(dev, &dev_attr_errlog);
+
+        return err;
+}
+
+static int idtg2_switch_init(struct rio_dev *rdev, int do_enum)
+{
+        pr_debug("RIO: %s for %s\n", __func__, rio_name(rdev));
+        rdev->rswitch->add_entry = idtg2_route_add_entry;
+        rdev->rswitch->get_entry = idtg2_route_get_entry;
+        rdev->rswitch->clr_table = idtg2_route_clr_table;
+        rdev->rswitch->set_domain = idtg2_set_domain;
+        rdev->rswitch->get_domain = idtg2_get_domain;
+        rdev->rswitch->em_init = idtg2_em_init;
+        rdev->rswitch->em_handle = idtg2_em_handler;
+        rdev->rswitch->sw_sysfs = idtg2_sysfs;
+
+        return 0;
+}
+
+DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS1848, idtg2_switch_init);
+DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTCPS1616, idtg2_switch_init);
diff --git a/drivers/rapidio/switches/idtcps.c b/drivers/rapidio/switches/idtcps.c
index 2c790c144f89..fc9f6374f759 100644
--- a/drivers/rapidio/switches/idtcps.c
+++ b/drivers/rapidio/switches/idtcps.c
@@ -117,6 +117,10 @@ idtcps_get_domain(struct rio_mport *mport, u16 destid, u8 hopcount,
 
 static int idtcps_switch_init(struct rio_dev *rdev, int do_enum)
 {
+        struct rio_mport *mport = rdev->net->hport;
+        u16 destid = rdev->rswitch->destid;
+        u8 hopcount = rdev->rswitch->hopcount;
+
         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;
@@ -126,6 +130,12 @@ static int idtcps_switch_init(struct rio_dev *rdev, int do_enum)
         rdev->rswitch->em_init = NULL;
         rdev->rswitch->em_handle = NULL;
 
+        if (do_enum) {
+                /* set TVAL = ~50us */
+                rio_mport_write_config_32(mport, destid, hopcount,
+                        rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x8e << 8);
+        }
+
         return 0;
 }
 
diff --git a/drivers/rapidio/switches/tsi568.c b/drivers/rapidio/switches/tsi568.c
index f7fd7898606e..b9a389b9f812 100644
--- a/drivers/rapidio/switches/tsi568.c
+++ b/drivers/rapidio/switches/tsi568.c
@@ -29,7 +29,7 @@
 #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(n)       (0x11004 + 0x100*n)
 #define  TSI568_SP_MODE_PW_DIS  0x08000000
 
 static int
@@ -117,14 +117,19 @@ tsi568_em_init(struct rio_dev *rdev)
         u16 destid = rdev->rswitch->destid;
         u8 hopcount = rdev->rswitch->hopcount;
         u32 regval;
+        int portnum;
 
         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, &regval);
-        rio_mport_write_config_32(mport, destid, hopcount,
-                        TSI568_SP_MODE_BC, regval | TSI568_SP_MODE_PW_DIS);
+        for (portnum = 0;
+             portnum < RIO_GET_TOTAL_PORTS(rdev->swpinfo); portnum++) {
+                rio_mport_read_config_32(mport, destid, hopcount,
+                                TSI568_SP_MODE(portnum), &regval);
+                rio_mport_write_config_32(mport, destid, hopcount,
+                                TSI568_SP_MODE(portnum),
+                                regval | TSI568_SP_MODE_PW_DIS);
+        }
 
         return 0;
 }
diff --git a/drivers/rapidio/switches/tsi57x.c b/drivers/rapidio/switches/tsi57x.c
index d34df722d95f..2003fb63c404 100644
--- a/drivers/rapidio/switches/tsi57x.c
+++ b/drivers/rapidio/switches/tsi57x.c
@@ -166,7 +166,8 @@ tsi57x_em_init(struct rio_dev *rdev)
 
         pr_debug("TSI578 %s [%d:%d]\n", __func__, destid, hopcount);
 
-        for (portnum = 0; portnum < 16; portnum++) {
+        for (portnum = 0;
+             portnum < RIO_GET_TOTAL_PORTS(rdev->swpinfo); portnum++) {
                 /* Make sure that Port-Writes are enabled (for all ports) */
                 rio_mport_read_config_32(mport, destid, hopcount,
                                 TSI578_SP_MODE(portnum), &regval);
@@ -205,6 +206,10 @@ tsi57x_em_init(struct rio_dev *rdev)
                         portnum++;
         }
 
+        /* set TVAL = ~50us */
+        rio_mport_write_config_32(mport, destid, hopcount,
+                rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x9a << 8);
+
         return 0;
 }