4 files changed, 63 insertions, 107 deletions

diff --git a/drivers/rapidio/switches/idt_gen2.c b/drivers/rapidio/switches/idt_gen2.c
index 0bb871cb5c40..095016a9dec1 100644
--- a/drivers/rapidio/switches/idt_gen2.c
+++ b/drivers/rapidio/switches/idt_gen2.c
@@ -209,9 +209,6 @@ idtg2_get_domain(struct rio_mport *mport, u16 destid, u8 hopcount,
 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;
 
@@ -220,29 +217,25 @@ idtg2_em_init(struct rio_dev *rdev)
          * All standard EM configuration should be performed at upper level.
          */
 
-        pr_debug("RIO: %s [%d:%d]\n", __func__, destid, hopcount);
+        pr_debug("RIO: %s [%d:%d]\n", __func__, rdev->destid, rdev->hopcount);
 
         /* Set Port-Write info CSR: PRIO=3 and CRF=1 */
-        rio_mport_write_config_32(mport, destid, hopcount,
-                        IDT_PW_INFO_CSR, 0x0000e000);
+        rio_write_config_32(rdev, 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,
+        rio_write_config_32(rdev, 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,
+        rio_read_config_32(rdev, IDT_DEV_CTRL_1, &regval);
+        rio_write_config_32(rdev, IDT_DEV_CTRL_1,
                         regval | IDT_DEV_CTRL_1_GENPW | IDT_DEV_CTRL_1_PRSTBEH);
 
         /*
@@ -250,45 +243,40 @@ idtg2_em_init(struct rio_dev *rdev)
          */
 
         /* Report all RIO.p8 errors supported by device */
-        rio_mport_write_config_32(mport, destid, hopcount,
-                        IDT_PORT_ERR_REPORT_EN_BC, 0x807e8037);
+        rio_write_config_32(rdev, 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);
+        rio_write_config_32(rdev, 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,
+                rio_read_config_32(rdev, IDT_PORT_OPS(i), &regval);
+                rio_write_config_32(rdev,
                                 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);
+        rio_write_config_32(rdev, 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);
+        rio_write_config_32(rdev, 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);
+                rio_read_config_32(rdev, IDT_LANE_CTRL(i), &regval);
+                rio_write_config_32(rdev, IDT_LANE_CTRL(i),
+                                    regval | IDT_LANE_CTRL_GENPW);
         }
 
         /*
@@ -296,41 +284,32 @@ idtg2_em_init(struct rio_dev *rdev)
          */
 
         /* Disable JTAG and I2C Error capture */
-        rio_mport_write_config_32(mport, destid, hopcount,
-                        IDT_AUX_PORT_ERR_CAP_EN, 0);
+        rio_write_config_32(rdev, 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);
+        rio_write_config_32(rdev, IDT_AUX_ERR_REPORT_EN, 0);
 
         /* Disable Port-Write notification from JTAG */
-        rio_mport_write_config_32(mport, destid, hopcount,
-                        IDT_JTAG_CTRL, 0);
+        rio_write_config_32(rdev, 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);
+        rio_read_config_32(rdev, IDT_I2C_MCTRL, &regval);
+        rio_write_config_32(rdev, 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);
+        rio_write_config_32(rdev, 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);
+        rio_read_config_32(rdev, IDT_CFGBLK_ERR_REPORT, &regval);
+        rio_write_config_32(rdev, IDT_CFGBLK_ERR_REPORT,
+                            regval & ~IDT_CFGBLK_ERR_REPORT_GENPW);
 
         /* set TVAL = ~50us */
-        rio_mport_write_config_32(mport, destid, hopcount,
+        rio_write_config_32(rdev,
                 rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x8e << 8);
 
         return 0;
@@ -339,18 +318,15 @@ idtg2_em_init(struct rio_dev *rdev)
 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,
+        rio_read_config_32(rdev,
                 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,
+                        rio_read_config_32(rdev,
                                         IDT_ISLTL_ADDRESS_CAP, &regval);
 
                         pr_debug("RIO: %s Implementation Specific LTL errors" \
@@ -358,13 +334,12 @@ idtg2_em_handler(struct rio_dev *rdev, u8 portnum)
                                  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_write_config_32(rdev, IDT_ISLTL_ADDRESS_CAP, 0);
 
                 }
         }
 
-        rio_mport_read_config_32(mport, destid, hopcount,
+        rio_read_config_32(rdev,
                 rdev->em_efptr + RIO_EM_PN_ERR_DETECT(portnum), &em_perrdet);
         if (em_perrdet) {
                 /* Service Port-Level Error(s) */
@@ -372,14 +347,14 @@ idtg2_em_handler(struct rio_dev *rdev, u8 portnum)
                         /* Implementation Specific port error reported */
 
                         /* Get IS errors reported */
-                        rio_mport_read_config_32(mport, destid, hopcount,
+                        rio_read_config_32(rdev,
                                         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,
+                        rio_write_config_32(rdev,
                                         IDT_PORT_ISERR_DET(portnum), 0);
                 }
         }
@@ -391,14 +366,10 @@ 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)) {
+        while (!rio_read_config_32(rdev, IDT_ERR_RD, &regval)) {
                 if (!regval)    /* 0 = end of log */
                         break;
                 len += snprintf(buf + len, PAGE_SIZE - len,
@@ -445,3 +416,5 @@ static int idtg2_switch_init(struct rio_dev *rdev, int do_enum)
 
 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);
+DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTVPS1616, idtg2_switch_init);
+DECLARE_RIO_SWITCH_INIT(RIO_VID_IDT, RIO_DID_IDTSPS1616, idtg2_switch_init);
diff --git a/drivers/rapidio/switches/idtcps.c b/drivers/rapidio/switches/idtcps.c
index fc9f6374f759..3a971077e7bf 100644
--- a/drivers/rapidio/switches/idtcps.c
+++ b/drivers/rapidio/switches/idtcps.c
@@ -117,10 +117,6 @@ 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;
@@ -132,7 +128,7 @@ static int idtcps_switch_init(struct rio_dev *rdev, int do_enum)
 
         if (do_enum) {
                 /* set TVAL = ~50us */
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x8e << 8);
         }
 
diff --git a/drivers/rapidio/switches/tsi568.c b/drivers/rapidio/switches/tsi568.c
index b9a389b9f812..3994c00aa01f 100644
--- a/drivers/rapidio/switches/tsi568.c
+++ b/drivers/rapidio/switches/tsi568.c
@@ -113,22 +113,17 @@ tsi568_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
 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;
         int portnum;
 
-        pr_debug("TSI568 %s [%d:%d]\n", __func__, destid, hopcount);
+        pr_debug("TSI568 %s [%d:%d]\n", __func__, rdev->destid, rdev->hopcount);
 
         /* Make sure that Port-Writes are disabled (for all ports) */
         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);
+                rio_read_config_32(rdev, TSI568_SP_MODE(portnum), &regval);
+                rio_write_config_32(rdev, 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 2003fb63c404..1a62934bfebc 100644
--- a/drivers/rapidio/switches/tsi57x.c
+++ b/drivers/rapidio/switches/tsi57x.c
@@ -158,48 +158,45 @@ tsi57x_get_domain(struct rio_mport *mport, u16 destid, u8 hopcount,
 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);
+        pr_debug("TSI578 %s [%d:%d]\n", __func__, rdev->destid, rdev->hopcount);
 
         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,
+                rio_read_config_32(rdev,
                                 TSI578_SP_MODE(portnum), &regval);
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                                 TSI578_SP_MODE(portnum),
                                 regval & ~TSI578_SP_MODE_PW_DIS);
 
                 /* Clear all pending interrupts */
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                                 rdev->phys_efptr +
                                         RIO_PORT_N_ERR_STS_CSR(portnum),
                                 &regval);
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                                 rdev->phys_efptr +
                                         RIO_PORT_N_ERR_STS_CSR(portnum),
                                 regval & 0x07120214);
 
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                                 TSI578_SP_INT_STATUS(portnum), &regval);
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                                 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,
+                rio_read_config_32(rdev,
                                 TSI578_SP_CTL_INDEP(portnum), &regval);
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                                 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,
+                rio_read_config_32(rdev,
                                 rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
                                 &regval);
                 if ((regval & RIO_PORT_N_CTL_PWIDTH) == RIO_PORT_N_CTL_PWIDTH_4)
@@ -207,7 +204,7 @@ tsi57x_em_init(struct rio_dev *rdev)
         }
 
         /* set TVAL = ~50us */
-        rio_mport_write_config_32(mport, destid, hopcount,
+        rio_write_config_32(rdev,
                 rdev->phys_efptr + RIO_PORT_LINKTO_CTL_CSR, 0x9a << 8);
 
         return 0;
@@ -217,14 +214,12 @@ 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,
+        rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
                         &err_status);
 
@@ -232,15 +227,15 @@ tsi57x_em_handler(struct rio_dev *rdev, u8 portnum)
             (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,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
                         &regval);
                 if (!(regval & RIO_PORT_N_CTL_LOCKOUT)) {
-                        rio_mport_write_config_32(mport, destid, hopcount,
+                        rio_write_config_32(rdev,
                                 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,
+                        rio_write_config_32(rdev,
                                 rdev->phys_efptr + RIO_PORT_N_CTL_CSR(portnum),
                                 regval);
                 }
@@ -248,7 +243,7 @@ tsi57x_em_handler(struct rio_dev *rdev, u8 portnum)
                 /* Read from link maintenance response register to clear
                  * valid bit
                  */
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(portnum),
                         &regval);
 
@@ -257,13 +252,12 @@ tsi57x_em_handler(struct rio_dev *rdev, u8 portnum)
                  */
                 sendcount = 3;
                 while (sendcount) {
-                        rio_mport_write_config_32(mport, destid, hopcount,
+                        rio_write_config_32(rdev,
                                           TSI578_SP_CS_TX(portnum), 0x40fc8000);
                         checkcount = 3;
                         while (checkcount--) {
                                 udelay(50);
-                                rio_mport_read_config_32(
-                                        mport, destid, hopcount,
+                                rio_read_config_32(rdev,
                                         rdev->phys_efptr +
                                                 RIO_PORT_N_MNT_RSP_CSR(portnum),
                                         &regval);
@@ -277,25 +271,23 @@ tsi57x_em_handler(struct rio_dev *rdev, u8 portnum)
 
 exit_es:
         /* Clear implementation specific error status bits */
-        rio_mport_read_config_32(mport, destid, hopcount,
-                                 TSI578_SP_INT_STATUS(portnum), &intstat);
+        rio_read_config_32(rdev, TSI578_SP_INT_STATUS(portnum), &intstat);
         pr_debug("TSI578[%x:%x] SP%d_INT_STATUS=0x%08x\n",
-                 destid, hopcount, portnum, intstat);
+                 rdev->destid, rdev->hopcount, portnum, intstat);
 
         if (intstat & 0x10000) {
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                                 TSI578_SP_LUT_PEINF(portnum), &regval);
                 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,
+                tsi57x_route_add_entry(mport, rdev->destid, rdev->hopcount,
                                 RIO_GLOBAL_TABLE, regval, route_port);
         }
 
-        rio_mport_write_config_32(mport, destid, hopcount,
-                                  TSI578_SP_INT_STATUS(portnum),
-                                  intstat & 0x000700bd);
+        rio_write_config_32(rdev, TSI578_SP_INT_STATUS(portnum),
+                            intstat & 0x000700bd);
 
         return 0;
 }