commit 5e2e47af544813ce6195e3f1d240e7cc4a1b4bec
author Linux Build Service Account <lnxbuild@localhost> Tue Jun 02 05:21:53 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 02 05:21:53 2015 -0700
tree 908813ab9ffac476d6f397d7c3d746e6fe366970
parent 7c16fb687f41aba71ab3553e552e1cd9667c196b
parent ffafffa2f41cd822f8bbd8398a97efdcb86acb2d

Merge "[qca-ssdk] fix phy speed 1000 issue."

src/hsl/phy/malibu_phy.c

diff --git a/src/hsl/phy/malibu_phy.c b/src/hsl/phy/malibu_phy.c
index 6c89d77..4792577 100755
--- a/src/hsl/phy/malibu_phy.c
+++ b/src/hsl/phy/malibu_phy.c
@@ -2243,12 +2243,23 @@
 malibu_phy_hw_init(void)
 {
 	a_uint16_t phy_data = 0;
+	a_uint32_t dev_id = 0;
+	a_uint32_t phy_id = 0;
+
 	phy_data = malibu_phy_mmd_read(0, PSGMII_ID, MALIBU_PHY_MMD1_NUM,
 				       MALIBU_PSGMII_FIFI_CTRL);
 	phy_data &= 0xbfff;
 
 	malibu_phy_mmd_write(0, PSGMII_ID, MALIBU_PHY_MMD1_NUM,
 			     MALIBU_PSGMII_FIFI_CTRL, phy_data);
+
+/*disable phy power saving function by default */
+	for (phy_id = 0; phy_id < 5; phy_id++) {
+		malibu_phy_set_powersave(dev_id, phy_id, A_FALSE);
+		malibu_phy_set_8023az(dev_id, phy_id, A_FALSE);
+		malibu_phy_set_hibernate(dev_id, phy_id, A_FALSE);
+	}
+
 	return SW_OK;
 }
 

src/init/ssdk_init.c

diff --git a/src/init/ssdk_init.c b/src/init/ssdk_init.c
index e99bbb3..e12891e 100755
--- a/src/init/ssdk_init.c
+++ b/src/init/ssdk_init.c
@@ -1402,8 +1402,10 @@
             fal_port_link_forcemode_set(dev_id, i, A_FALSE);
         }
 #endif
-        fal_port_rxhdr_mode_set(dev_id, i, FAL_NO_HEADER_EN);
-        fal_port_txhdr_mode_set(dev_id, i, FAL_NO_HEADER_EN);
+        if (SSDK_CURRENT_CHIP_TYPE != CHIP_DESS) {
+            fal_port_rxhdr_mode_set(dev_id, i, FAL_NO_HEADER_EN);
+            fal_port_txhdr_mode_set(dev_id, i, FAL_NO_HEADER_EN);
+        }
         fal_port_3az_status_set(dev_id, i, A_FALSE);
         fal_port_flowctrl_forcemode_set(dev_id, i, A_TRUE);
         fal_port_flowctrl_set(dev_id, i, A_FALSE);
@@ -1682,11 +1684,13 @@
 
 	aos_mem_copy(reg_value, &value, sizeof(a_uint32_t));
 	qca_switch_reg_write(0, 0x7c, &reg_value, 4 );
+/*
 	qca_switch_reg_write(0, 0x80, &reg_value, 4 );
 	qca_switch_reg_write(0, 0x84, &reg_value, 4 );
 	qca_switch_reg_write(0, 0x88, &reg_value, 4 );
 	qca_switch_reg_write(0, 0x8c, (a_uint8_t *)&reg_value, 4 );
 	qca_switch_reg_write(0, 0x90, (a_uint8_t *)&reg_value, 4 );
+*/
 }
 
 #if defined(CONFIG_OF) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))