]> git.sur5r.net Git - u-boot/blobdiff - drivers/net/vsc9953.c
sf: add paired dev info for winbond w25q16jv
[u-boot] / drivers / net / vsc9953.c
index 8be87a15b29501fb900d2b017abbff77e8ec115b..f17839c70ff0bf029afce94ffddb402a043d8d0c 100644 (file)
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  Copyright 2014 Freescale Semiconductor, Inc.
- *
- *  SPDX-License-Identifier:      GPL-2.0+
+ *  Copyright 2014 - 2015 Freescale Semiconductor, Inc.
  *
  *  Driver for the Vitesse VSC9953 L2 Switch
  */
@@ -335,7 +334,7 @@ static int vsc9953_port_vlan_pvid_get(int port_nr, int *pvid)
        struct vsc9953_analyzer *l2ana_reg;
 
        /* Administrative down */
-       if (vsc9953_l2sw.port[port_nr].enabled) {
+       if (!vsc9953_l2sw.port[port_nr].enabled) {
                printf("Port %d is administrative down\n", port_nr);
                return -1;
        }
@@ -469,6 +468,47 @@ static void vsc9953_vlan_ingr_fltr_learn_drop(int enable)
                clrbits_le32(&l2ana_reg->ana.adv_learn, VSC9953_VLAN_CHK);
 }
 
+enum aggr_code_mode {
+       AGGR_CODE_RAND = 0,
+       AGGR_CODE_ALL,  /* S/D MAC, IPv4 S/D IP, IPv6 Flow Label, S/D PORT */
+};
+
+/* Set aggregation code generation mode */
+static int vsc9953_aggr_code_set(enum aggr_code_mode ac)
+{
+       int rc;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       switch (ac) {
+       case AGGR_CODE_RAND:
+               clrsetbits_le32(&l2ana_reg->common.aggr_cfg,
+                               VSC9953_AC_DMAC_ENA | VSC9953_AC_SMAC_ENA |
+                               VSC9953_AC_IP6_LBL_ENA |
+                               VSC9953_AC_IP6_TCPUDP_ENA |
+                               VSC9953_AC_IP4_SIPDIP_ENA |
+                               VSC9953_AC_IP4_TCPUDP_ENA, VSC9953_AC_RND_ENA);
+               rc = 0;
+               break;
+       case AGGR_CODE_ALL:
+               clrsetbits_le32(&l2ana_reg->common.aggr_cfg, VSC9953_AC_RND_ENA,
+                               VSC9953_AC_DMAC_ENA | VSC9953_AC_SMAC_ENA |
+                               VSC9953_AC_IP6_LBL_ENA |
+                               VSC9953_AC_IP6_TCPUDP_ENA |
+                               VSC9953_AC_IP4_SIPDIP_ENA |
+                               VSC9953_AC_IP4_TCPUDP_ENA);
+               rc = 0;
+               break;
+       default:
+               /* unknown mode for aggregation code */
+               rc = -EINVAL;
+       }
+
+       return rc;
+}
+
 /* Egress untag modes of a VSC9953 port */
 enum egress_untag_mode {
        EGRESS_UNTAG_ALL = 0,
@@ -593,6 +633,25 @@ static void vsc9953_port_all_vlan_egress_untagged_set(
                vsc9953_port_vlan_egr_untag_set(i, mode);
 }
 
+static int vsc9953_autoage_time_set(int age_period)
+{
+       u32 autoage;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       if (age_period < 0 || age_period > VSC9953_AUTOAGE_PERIOD_MASK)
+               return -EINVAL;
+
+       autoage = bitfield_replace_by_mask(in_le32(&l2ana_reg->ana.auto_age),
+                                          VSC9953_AUTOAGE_PERIOD_MASK,
+                                          age_period);
+       out_le32(&l2ana_reg->ana.auto_age, autoage);
+
+       return 0;
+}
+
 #ifdef CONFIG_CMD_ETHSW
 
 /* Enable/disable status of a VSC9953 port */
@@ -1474,6 +1533,224 @@ static int vsc9953_port_ingress_filtering_get(int port_no)
        return !!(val & (1 << port_no));
 }
 
+/* Get the aggregation group of a port */
+static int vsc9953_port_aggr_grp_get(int port_no, int *aggr_grp)
+{
+       u32 val;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       if (!VSC9953_PORT_CHECK(port_no))
+               return -EINVAL;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       val = in_le32(&l2ana_reg->port[port_no].port_cfg);
+       *aggr_grp = bitfield_extract_by_mask(val,
+                                            VSC9953_PORT_CFG_PORTID_MASK);
+
+       return 0;
+}
+
+static void vsc9953_aggr_grp_members_get(int aggr_grp,
+                                        u8 aggr_membr[VSC9953_MAX_PORTS])
+{
+       int port_no;
+       int aggr_membr_grp;
+
+       for (port_no = 0; port_no < VSC9953_MAX_PORTS; port_no++) {
+               aggr_membr[port_no] = 0;
+
+               if (vsc9953_port_aggr_grp_get(port_no, &aggr_membr_grp))
+                       continue;
+
+               if (aggr_grp == aggr_membr_grp)
+                       aggr_membr[port_no] = 1;
+       }
+}
+
+static void vsc9953_update_dest_members_masks(int port_no, u32 membr_bitfld_old,
+                                             u32 membr_bitfld_new)
+{
+       int i;
+       u32 pgid;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       /*
+        * NOTE: Only the unicast destination masks are updated, since
+        * we do not support for now Layer-2 multicast entries
+        */
+       for (i = 0; i < VSC9953_MAX_PORTS; i++) {
+               if (i == port_no) {
+                       clrsetbits_le32(&l2ana_reg->port_id_tbl.port_grp_id[i],
+                                       VSC9953_PGID_PORT_MASK,
+                                       membr_bitfld_new);
+                       continue;
+               }
+
+               pgid = in_le32(&l2ana_reg->port_id_tbl.port_grp_id[i]);
+               if ((u32)(1 << i) & membr_bitfld_old & VSC9953_PGID_PORT_MASK)
+                       pgid &= ~((u32)(1 << port_no));
+               if ((u32)(1 << i) & membr_bitfld_new & VSC9953_PGID_PORT_MASK)
+                       pgid |= ((u32)(1 << port_no));
+
+               out_le32(&l2ana_reg->port_id_tbl.port_grp_id[i], pgid);
+       }
+}
+
+static void vsc9953_update_source_members_masks(int port_no,
+                                               u32 membr_bitfld_old,
+                                               u32 membr_bitfld_new)
+{
+       int i;
+       int index;
+       u32 pgid;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       for (i = 0; i < VSC9953_MAX_PORTS + 1; i++) {
+               index = PGID_SRC_START + i;
+               pgid = in_le32(&l2ana_reg->port_id_tbl.port_grp_id[index]);
+               if (i == port_no) {
+                       pgid = (pgid | VSC9953_PGID_PORT_MASK) &
+                              ~membr_bitfld_new;
+                       out_le32(&l2ana_reg->port_id_tbl.port_grp_id[index],
+                                pgid);
+                       continue;
+               }
+
+               if ((u32)(1 << i) & membr_bitfld_old & VSC9953_PGID_PORT_MASK)
+                       pgid |= (u32)(1 << port_no);
+
+               if ((u32)(1 << i) & membr_bitfld_new & VSC9953_PGID_PORT_MASK)
+                       pgid &= ~(u32)(1 << port_no);
+               out_le32(&l2ana_reg->port_id_tbl.port_grp_id[index], pgid);
+       }
+}
+
+static u32 vsc9953_aggr_mask_get_next(u32 aggr_mask, u32 member_bitfield)
+{
+       if (!member_bitfield)
+               return 0;
+
+       if (!(aggr_mask & VSC9953_PGID_PORT_MASK))
+               aggr_mask = 1;
+       else
+               aggr_mask <<= 1;
+
+       while (!(aggr_mask & member_bitfield)) {
+               aggr_mask <<= 1;
+               if (!(aggr_mask & VSC9953_PGID_PORT_MASK))
+                       aggr_mask = 1;
+       }
+
+       return aggr_mask;
+}
+
+static void vsc9953_update_aggr_members_masks(int port_no, u32 membr_bitfld_old,
+                                             u32 membr_bitfld_new)
+{
+       int i;
+       u32 pgid;
+       u32 aggr_mask_old = 0;
+       u32 aggr_mask_new = 0;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       /* Update all the PGID aggregation masks */
+       for (i = PGID_AGGR_START; i < PGID_SRC_START; i++) {
+               pgid = in_le32(&l2ana_reg->port_id_tbl.port_grp_id[i]);
+
+               aggr_mask_old = vsc9953_aggr_mask_get_next(aggr_mask_old,
+                                                          membr_bitfld_old);
+               pgid = (pgid & ~membr_bitfld_old) | aggr_mask_old;
+
+               aggr_mask_new = vsc9953_aggr_mask_get_next(aggr_mask_new,
+                                                          membr_bitfld_new);
+               pgid = (pgid & ~membr_bitfld_new) | aggr_mask_new;
+
+               out_le32(&l2ana_reg->port_id_tbl.port_grp_id[i], pgid);
+       }
+}
+
+static u32 vsc9953_aggr_membr_bitfield_get(u8 member[VSC9953_MAX_PORTS])
+{
+       int i;
+       u32 member_bitfield = 0;
+
+       for (i = 0; i < VSC9953_MAX_PORTS; i++) {
+               if (member[i])
+                       member_bitfield |= 1 << i;
+       }
+       member_bitfield &= VSC9953_PGID_PORT_MASK;
+
+       return member_bitfield;
+}
+
+static void vsc9953_update_members_masks(int port_no,
+                                        u8 member_old[VSC9953_MAX_PORTS],
+                                        u8 member_new[VSC9953_MAX_PORTS])
+{
+       u32 membr_bitfld_old = vsc9953_aggr_membr_bitfield_get(member_old);
+       u32 membr_bitfld_new = vsc9953_aggr_membr_bitfield_get(member_new);
+
+       vsc9953_update_dest_members_masks(port_no, membr_bitfld_old,
+                                         membr_bitfld_new);
+       vsc9953_update_source_members_masks(port_no, membr_bitfld_old,
+                                           membr_bitfld_new);
+       vsc9953_update_aggr_members_masks(port_no, membr_bitfld_old,
+                                         membr_bitfld_new);
+}
+
+/* Set the aggregation group of a port */
+static int vsc9953_port_aggr_grp_set(int port_no, int aggr_grp)
+{
+       u8 aggr_membr_old[VSC9953_MAX_PORTS];
+       u8 aggr_membr_new[VSC9953_MAX_PORTS];
+       int rc;
+       int aggr_grp_old;
+       u32 val;
+       struct vsc9953_analyzer *l2ana_reg;
+
+       if (!VSC9953_PORT_CHECK(port_no) || !VSC9953_PORT_CHECK(aggr_grp))
+               return -EINVAL;
+
+       l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
+                                               VSC9953_ANA_OFFSET);
+
+       rc = vsc9953_port_aggr_grp_get(port_no, &aggr_grp_old);
+       if (rc)
+               return rc;
+
+       /* get all the members of the old aggregation group */
+       vsc9953_aggr_grp_members_get(aggr_grp_old, aggr_membr_old);
+
+       /* get all the members of the same aggregation group */
+       vsc9953_aggr_grp_members_get(aggr_grp, aggr_membr_new);
+
+       /* add current port as member to the new aggregation group */
+       aggr_membr_old[port_no] = 0;
+       aggr_membr_new[port_no] = 1;
+
+       /* update masks */
+       vsc9953_update_members_masks(port_no, aggr_membr_old, aggr_membr_new);
+
+       /* Change logical port number */
+       val = in_le32(&l2ana_reg->port[port_no].port_cfg);
+       val = bitfield_replace_by_mask(val,
+                                      VSC9953_PORT_CFG_PORTID_MASK, aggr_grp);
+       out_le32(&l2ana_reg->port[port_no].port_cfg, val);
+
+       return 0;
+}
+
 static int vsc9953_port_status_key_func(struct ethsw_command_def *parsed_cmd)
 {
        int i;
@@ -2064,6 +2341,72 @@ static int vsc9953_ingr_fltr_set_key_func(struct ethsw_command_def *parsed_cmd)
        return CMD_RET_SUCCESS;
 }
 
+static int vsc9953_port_aggr_show_key_func(struct ethsw_command_def *parsed_cmd)
+{
+       int i;
+       int aggr_grp;
+
+       if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
+               if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
+                       printf("Invalid port number: %d\n", parsed_cmd->port);
+                       return CMD_RET_FAILURE;
+               }
+
+               if (vsc9953_port_aggr_grp_get(parsed_cmd->port, &aggr_grp))
+                       return CMD_RET_FAILURE;
+               printf("%7s %10s\n", "Port", "Aggr grp");
+               printf("%7d %10d\n", parsed_cmd->port, aggr_grp);
+       } else {
+               printf("%7s %10s\n", "Port", "Aggr grp");
+               for (i = 0; i < VSC9953_MAX_PORTS; i++) {
+                       if (vsc9953_port_aggr_grp_get(i, &aggr_grp))
+                               continue;
+                       printf("%7d %10d\n", i, aggr_grp);
+               }
+       }
+
+       return CMD_RET_SUCCESS;
+}
+
+static int vsc9953_port_aggr_set_key_func(struct ethsw_command_def *parsed_cmd)
+{
+       int i;
+
+       /* Aggregation group number should be set in parsed_cmd->aggr_grp */
+       if (parsed_cmd->aggr_grp == ETHSW_CMD_AGGR_GRP_NONE) {
+               printf("Please set an aggregation group value\n");
+               return CMD_RET_FAILURE;
+       }
+
+       if (!VSC9953_PORT_CHECK(parsed_cmd->aggr_grp)) {
+               printf("Invalid aggregation group number: %d\n",
+                      parsed_cmd->aggr_grp);
+               return CMD_RET_FAILURE;
+       }
+
+       if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
+               if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
+                       printf("Invalid port number: %d\n", parsed_cmd->port);
+                       return CMD_RET_FAILURE;
+               }
+               if (vsc9953_port_aggr_grp_set(parsed_cmd->port,
+                                             parsed_cmd->aggr_grp)) {
+                       printf("Port %d: failed to set aggr group %d\n",
+                              parsed_cmd->port, parsed_cmd->aggr_grp);
+               }
+       } else {
+               for (i = 0; i < VSC9953_MAX_PORTS; i++) {
+                       if (vsc9953_port_aggr_grp_set(i,
+                                                     parsed_cmd->aggr_grp)) {
+                               printf("Port %d: failed to set aggr group %d\n",
+                                      i, parsed_cmd->aggr_grp);
+                       }
+               }
+       }
+
+       return CMD_RET_SUCCESS;
+}
+
 static struct ethsw_command_func vsc9953_cmd_func = {
                .ethsw_name = "L2 Switch VSC9953",
                .port_enable = &vsc9953_port_status_key_func,
@@ -2088,7 +2431,9 @@ static struct ethsw_command_func vsc9953_cmd_func = {
                .vlan_learn_show = &vsc9953_vlan_learn_show_key_func,
                .vlan_learn_set = &vsc9953_vlan_learn_set_key_func,
                .port_ingr_filt_show = &vsc9953_ingr_fltr_show_key_func,
-               .port_ingr_filt_set = &vsc9953_ingr_fltr_set_key_func
+               .port_ingr_filt_set = &vsc9953_ingr_fltr_set_key_func,
+               .port_aggr_show = &vsc9953_port_aggr_show_key_func,
+               .port_aggr_set = &vsc9953_port_aggr_set_key_func,
 };
 
 #endif /* CONFIG_CMD_ETHSW */
@@ -2107,6 +2452,10 @@ void vsc9953_default_configuration(void)
 {
        int i;
 
+       if (vsc9953_autoage_time_set(VSC9953_DEFAULT_AGE_TIME))
+               debug("VSC9953: failed to set AGE time to %d\n",
+                     VSC9953_DEFAULT_AGE_TIME);
+
        for (i = 0; i < VSC9953_MAX_VLAN; i++)
                vsc9953_vlan_table_membership_all_set(i, 0);
        vsc9953_port_all_vlan_aware_set(1);
@@ -2115,6 +2464,141 @@ void vsc9953_default_configuration(void)
        vsc9953_vlan_table_membership_all_set(1, 1);
        vsc9953_vlan_ingr_fltr_learn_drop(1);
        vsc9953_port_all_vlan_egress_untagged_set(EGRESS_UNTAG_PVID_AND_ZERO);
+       if (vsc9953_aggr_code_set(AGGR_CODE_ALL))
+               debug("VSC9953: failed to set default aggregation code mode\n");
+}
+
+static void vcap_entry2cache_init(u32 target, u32 entry_words)
+{
+       int i;
+
+       for (i = 0; i < entry_words; i++) {
+               out_le32((unsigned int *)(VSC9953_OFFSET +
+                               VSC9953_VCAP_CACHE_ENTRY_DAT(target, i)), 0x00);
+               out_le32((unsigned int *)(VSC9953_OFFSET +
+                               VSC9953_VCAP_CACHE_MASK_DAT(target, i)), 0xFF);
+       }
+
+       out_le32((unsigned int *)(VSC9953_OFFSET +
+                               VSC9953_VCAP_CACHE_TG_DAT(target)), 0x00);
+       out_le32((unsigned int *)(VSC9953_OFFSET +
+                                 VSC9953_VCAP_CFG_MV_CFG(target)),
+                VSC9953_VCAP_CFG_MV_CFG_SIZE(entry_words));
+}
+
+static void vcap_action2cache_init(u32 target, u32 action_words,
+                                  u32 counter_words)
+{
+       int i;
+
+       for (i = 0; i < action_words; i++)
+               out_le32((unsigned int *)(VSC9953_OFFSET +
+                              VSC9953_VCAP_CACHE_ACTION_DAT(target, i)), 0x00);
+
+       for (i = 0; i < counter_words; i++)
+               out_le32((unsigned int *)(VSC9953_OFFSET +
+                                 VSC9953_VCAP_CACHE_CNT_DAT(target, i)), 0x00);
+}
+
+static int vcap_cmd(u32 target, u16 ix, int cmd, int sel, int entry_count)
+{
+       u32 tgt = target;
+       u32 value = (VSC9953_VCAP_UPDATE_CTRL_UPDATE_CMD(cmd) |
+                    VSC9953_VCAP_UPDATE_CTRL_UPDATE_ADDR(ix) |
+                    VSC9953_VCAP_UPDATE_CTRL_UPDATE_SHOT);
+
+       if ((sel & TCAM_SEL_ENTRY) && ix >= entry_count)
+               return CMD_RET_FAILURE;
+
+       if (!(sel & TCAM_SEL_ENTRY))
+               value |= VSC9953_VCAP_UPDATE_CTRL_UPDATE_ENTRY_DIS;
+
+       if (!(sel & TCAM_SEL_ACTION))
+               value |= VSC9953_VCAP_UPDATE_CTRL_UPDATE_ACTION_DIS;
+
+       if (!(sel & TCAM_SEL_COUNTER))
+               value |= VSC9953_VCAP_UPDATE_CTRL_UPDATE_CNT_DIS;
+
+       out_le32((unsigned int *)(VSC9953_OFFSET +
+                               VSC9953_VCAP_CFG_UPDATE_CTRL(tgt)), value);
+
+       do {
+               value = in_le32((unsigned int *)(VSC9953_OFFSET +
+                               VSC9953_VCAP_CFG_UPDATE_CTRL(tgt)));
+
+       } while (value & VSC9953_VCAP_UPDATE_CTRL_UPDATE_SHOT);
+
+       return CMD_RET_SUCCESS;
+}
+
+static void vsc9953_vcap_init(void)
+{
+       u32 tgt = VSC9953_ES0;
+       int cmd_ret;
+
+       /* write entries */
+       vcap_entry2cache_init(tgt, ENTRY_WORDS_ES0);
+       cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE, TCAM_SEL_ENTRY,
+                          ENTRY_WORDS_ES0);
+       if (cmd_ret != CMD_RET_SUCCESS)
+               debug("VSC9953:%d invalid TCAM_SEL_ENTRY\n",
+                     __LINE__);
+
+       /* write actions and counters */
+       vcap_action2cache_init(tgt, BITS_TO_DWORD(ES0_ACT_WIDTH),
+                              BITS_TO_DWORD(ES0_CNT_WIDTH));
+       out_le32((unsigned int *)(VSC9953_OFFSET +
+                                 VSC9953_VCAP_CFG_MV_CFG(tgt)),
+                VSC9953_VCAP_CFG_MV_CFG_SIZE(ES0_ACT_COUNT));
+       cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE,
+                          TCAM_SEL_ACTION | TCAM_SEL_COUNTER, ENTRY_WORDS_ES0);
+       if (cmd_ret != CMD_RET_SUCCESS)
+               debug("VSC9953:%d invalid TCAM_SEL_ACTION | TCAM_SEL_COUNTER\n",
+                     __LINE__);
+
+       tgt = VSC9953_IS1;
+
+       /* write entries */
+       vcap_entry2cache_init(tgt, ENTRY_WORDS_IS1);
+       cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE, TCAM_SEL_ENTRY,
+                          ENTRY_WORDS_IS1);
+       if (cmd_ret != CMD_RET_SUCCESS)
+               debug("VSC9953:%d invalid TCAM_SEL_ENTRY\n",
+                     __LINE__);
+
+       /* write actions and counters */
+       vcap_action2cache_init(tgt, BITS_TO_DWORD(IS1_ACT_WIDTH),
+                              BITS_TO_DWORD(IS1_CNT_WIDTH));
+       out_le32((unsigned int *)(VSC9953_OFFSET +
+                                 VSC9953_VCAP_CFG_MV_CFG(tgt)),
+                VSC9953_VCAP_CFG_MV_CFG_SIZE(IS1_ACT_COUNT));
+       cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE,
+                          TCAM_SEL_ACTION | TCAM_SEL_COUNTER, ENTRY_WORDS_IS1);
+       if (cmd_ret != CMD_RET_SUCCESS)
+               debug("VSC9953:%d invalid TCAM_SEL_ACTION | TCAM_SEL_COUNTER\n",
+                     __LINE__);
+
+       tgt = VSC9953_IS2;
+
+       /* write entries */
+       vcap_entry2cache_init(tgt, ENTRY_WORDS_IS2);
+       cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE, TCAM_SEL_ENTRY,
+                          ENTRY_WORDS_IS2);
+       if (cmd_ret != CMD_RET_SUCCESS)
+               debug("VSC9953:%d invalid selection: TCAM_SEL_ENTRY\n",
+                     __LINE__);
+
+       /* write actions and counters */
+       vcap_action2cache_init(tgt, BITS_TO_DWORD(IS2_ACT_WIDTH),
+                              BITS_TO_DWORD(IS2_CNT_WIDTH));
+       out_le32((unsigned int *)(VSC9953_OFFSET +
+                                 VSC9953_VCAP_CFG_MV_CFG(tgt)),
+                VSC9953_VCAP_CFG_MV_CFG_SIZE(IS2_ACT_COUNT));
+       cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE,
+                          TCAM_SEL_ACTION | TCAM_SEL_COUNTER, ENTRY_WORDS_IS2);
+       if (cmd_ret != CMD_RET_SUCCESS)
+               debug("VSC9953:%d invalid TCAM_SEL_ACTION | TCAM_SEL_COUNTER\n",
+                     __LINE__);
 }
 
 void vsc9953_init(bd_t *bis)
@@ -2173,6 +2657,9 @@ void vsc9953_init(bd_t *bis)
                if (vsc9953_port_init(i))
                        printf("Failed to initialize l2switch port %d\n", i);
 
+               if (!vsc9953_l2sw.port[i].enabled)
+                       continue;
+
                /* Enable VSC9953 GMII Ports Port ID 0 - 7 */
                if (VSC9953_INTERNAL_PORT_CHECK(i)) {
                        out_le32(&l2ana_reg->pfc[i].pfc_cfg,
@@ -2185,6 +2672,11 @@ void vsc9953_init(bd_t *bis)
                        out_le32(&l2sys_reg->pause_cfg.mac_fc_cfg[i],
                                 VSC9953_MAC_FC_CFG);
                }
+
+               l2dev_gmii_reg = (struct vsc9953_dev_gmii *)
+                                (VSC9953_OFFSET + VSC9953_DEV_GMII_OFFSET +
+                                T1040_SWITCH_GMII_DEV_OFFSET * i);
+
                out_le32(&l2dev_gmii_reg->port_mode.clock_cfg,
                         VSC9953_CLOCK_CFG);
                out_le32(&l2dev_gmii_reg->mac_cfg_status.mac_ena_cfg,
@@ -2207,10 +2699,6 @@ void vsc9953_init(bd_t *bis)
                /* WAIT FOR 2 us*/
                udelay(2);
 
-               l2dev_gmii_reg = (struct vsc9953_dev_gmii *)(
-                               (char *)l2dev_gmii_reg
-                               + T1040_SWITCH_GMII_DEV_OFFSET);
-
                /* Initialize Lynx PHY Wrappers */
                phy_addr = 0;
                if (vsc9953_l2sw.port[i].enet_if ==
@@ -2249,6 +2737,7 @@ void vsc9953_init(bd_t *bis)
                }
        }
 
+       vsc9953_vcap_init();
        vsc9953_default_configuration();
 
 #ifdef CONFIG_CMD_ETHSW