MEPA-1030 Bug Fix: M10G Link Broken

Author: Praveen-Kumar-S-Mchp

board-configs/src/meba_phy_generic.c

@@ -71,18 +71,10 @@ static void meba_phy_config(meba_inst_t inst, const vtss_inst_t vtss_instance, m
     mepa_reset_param_t phy_reset = {};
 
     /* Pre Reset Configuration */
-    phy_reset.media_intf = MESA_PHY_MEDIA_IF_CU;
+    phy_reset.media_intf = MESA_PHY_MEDIA_IF_FI_10G_LAN;
     phy_reset.reset_point = MEPA_RESET_POINT_PRE;
     meba_phy_reset(inst, port_no, &phy_reset);
 
-    /* PHY Info Get */
-    meba_phy_info_get(inst, port_no, &phy_info);
-
-    if(phy_info.part_number == MEBA_10GPHY_8258) {
-        phy_reset.media_intf = MESA_PHY_MEDIA_IF_FI_10G_LAN;
-        m10g_mode_conf(vtss_instance, inst, port_no, base_port_no);
-    }
-
     /* Default Reset Point */
     phy_reset.reset_point = MEPA_RESET_POINT_DEFAULT;
     meba_phy_reset(inst, port_no, &phy_reset);
@@ -91,6 +83,13 @@ static void meba_phy_config(meba_inst_t inst, const vtss_inst_t vtss_instance, m
     phy_reset.reset_point = MEPA_RESET_POINT_POST;
     meba_phy_reset(inst, port_no, &phy_reset);
 
+    /* PHY Info Get */
+    meba_phy_info_get(inst, port_no, &phy_info);
+
+    if(phy_info.part_number == MEBA_10GPHY_8258) {
+        m10g_mode_conf(vtss_instance, inst, port_no, base_port_no);
+    }
+
 } 
 
 uint16_t slot1_map[] = {0x1b, 0x1a, 0x19, 0x18};

board-configs/src/meba_phy_malibu.c

@@ -45,7 +45,12 @@ void m10g_mode_conf(const vtss_inst_t inst, meba_inst_t meba_inst, mepa_port_no_
     mesa_rc rc = MESA_RC_OK;
     vtss_gpio_10g_gpio_mode_t gpio_conf;
     const edsx_phy_config_map_t *gmap = &vsc825x_gpio_map[iport - slot_port]; /*have to be changed to respective slot */
-    mepa_conf_t conf;
+    mepa_conf_t conf = {0};
+
+    if ((rc = mepa_conf_get(meba_inst->phy_devices[iport], &conf)) != MESA_RC_OK) {
+        printf("mepa_conf_get failed on port %u", iport);
+        return;
+    }
     conf.speed = MESA_SPEED_10G;
     conf.conf_10g.oper_mode = MEPA_PHY_LAN_MODE;
     conf.conf_10g.interface_mode = MEPA_PHY_SFI_XFI;
@@ -56,6 +61,12 @@ void m10g_mode_conf(const vtss_inst_t inst, meba_inst_t meba_inst, mepa_port_no_
     if(conf.conf_10g.channel_high_to_low == false ) {
         conf.conf_10g.channel_id = VTSS_CHANNEL_AUTO;
     }
+    conf.conf_10g.polarity.host_rx = false;
+    conf.conf_10g.polarity.line_rx = false;
+    conf.conf_10g.polarity.host_tx = false;
+    conf.conf_10g.polarity.line_tx = false;
+    conf.conf_10g.h_clk_src_is_high_amp = true;
+    conf.conf_10g.l_clk_src_is_high_amp = true;
     if ((rc = mepa_conf_set(meba_inst->phy_devices[iport], &conf)) != MESA_RC_OK) {
         printf("mepa_conf_set failed on port %u", iport);
 	return;

mepa/vtss/src/vtss.c

@@ -1050,8 +1050,10 @@ static mepa_rc malibu_10g_reset(mepa_device_t *dev,
         if(vtss_phy_10g_init(data->vtss_instance, data->port_no, NULL) != VTSS_RC_OK) {
             return MEPA_RC_ERROR;
         }
+        break;
     default:
         // No other RESET POINTs needed
+        break;
     }
 
     return MEPA_RC_OK;
@@ -1108,8 +1110,10 @@ static mepa_rc phy_10g_poll(mepa_device_t *dev,
 static mepa_rc phy_10g_conf_set(mepa_device_t *dev, const mepa_conf_t *config)
 {
     phy_data_t *data = (phy_data_t *)dev->data;
-    vtss_phy_10g_mode_t mode = {};
-
+    vtss_phy_10g_mode_t mode = {0};
+    if(vtss_phy_10g_init(data->vtss_instance, data->port_no, NULL) != VTSS_RC_OK) {
+        return MEPA_RC_ERROR;
+    }
     mode.oper_mode = config->conf_10g.oper_mode;
     mode.interface  = config->conf_10g.interface_mode;
     mode.channel_id = config->conf_10g.channel_id;
@@ -1125,7 +1129,6 @@ static mepa_rc phy_10g_conf_set(mepa_device_t *dev, const mepa_conf_t *config)
     mode.lref_for_host = config->conf_10g.lref_for_host;
     mode.h_clk_src.is_high_amp = config->conf_10g.h_clk_src_is_high_amp;
     mode.l_clk_src.is_high_amp = config->conf_10g.l_clk_src_is_high_amp;
-
     if (config->speed == MESA_SPEED_1G || config->speed == MESA_SPEED_AUTO) {
         /* Need to flip the lanes to match JR XAUI-lane-0 and 8487 XAUI-lane-0
          * This only applies to PHY's with a XAUI MAC Interface  */

mepa_demo/mepa_scripts/port_config_json.json

@@ -40,8 +40,8 @@
 			"hl_clk_synth": 0,
 			"is_host_wan" : 0,
 			"lref_for_host" : 0,
-			"h_clk_src_is_high_amp" : 0,
-			"l_clk_src_is_high_amp" : 0
+			"h_clk_src_is_high_amp" : 1,
+			"l_clk_src_is_high_amp" : 1
 		}
 	}
 }