X-Git-Url: https://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.c;fp=jme.c;h=aeedfe209c19f0b4176fea330dd703daa718defe;hp=ce5ebc50661043b319b2946175ed1a4912e46414;hb=f6bba9549012eb31bd877994ed5f8a912b08d0ed;hpb=3ac41a14de98dfff0d66c2a7487d796aa55d414b

diff --git a/jme.c b/jme.c
index ce5ebc5..aeedfe2 100644
--- a/jme.c
+++ b/jme.c
@@ -1772,6 +1772,69 @@ jme_new_phy_off(struct jme_adapter *jme)
 	pci_write_config_dword(jme->pdev, PCI_PRIV_PE1, reg);
 }
 
+static inline void
+jme_recal_phy(struct jme_adapter *jme)
+{
+	u32 miictl1000, comm2;
+
+	miictl1000 = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_CTRL1000);
+	miictl1000 &= ~JME_PHY_GCTRL_TESTMASK;
+	miictl1000 |= JME_PHY_GCTRL_TESTMODE1;
+	jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_CTRL1000, miictl1000);
+
+	comm2 = jme_phyext_read(jme, JME_PHYEXT_COMM2);
+	comm2 &= ~(0x0001u);
+	comm2 |= 0x0011u;
+	jme_phyext_write(jme, JME_PHYEXT_COMM2, comm2);
+
+	mdelay(20);
+
+	comm2 = jme_phyext_read(jme, JME_PHYEXT_COMM2);
+	comm2 &= ~(0x0013u);
+	jme_phyext_write(jme, JME_PHYEXT_COMM2, comm2);
+
+	miictl1000 = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_CTRL1000);
+	miictl1000 &= ~JME_PHY_GCTRL_TESTMASK;
+	jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_CTRL1000, miictl1000);
+}
+
+static inline void
+jme_set_phyparm(struct jme_adapter *jme, u32 val)
+{
+	u32 comm0, comm1;
+
+	comm0 = jme_phyext_read(jme, JME_PHYEXT_COMM0);
+	comm1 = jme_phyext_read(jme, JME_PHYEXT_COMM1);
+	comm0 &= ~(0xE000u);
+	comm0 |= ((val << 13) & 0xE000u);
+	comm1 &= ~(0x0001u);
+	comm1 |= ((val >> 3) & 0x0001u);
+	jme_phyext_write(jme, JME_PHYEXT_COMM0, comm0);
+	jme_phyext_write(jme, JME_PHYEXT_COMM1, comm1);
+}
+
+static inline void
+jme_refill_phyparm(struct jme_adapter *jme)
+{
+	if (jme->chip_main_rev >= 6 ||
+	    (jme->chip_main_rev == 5 &&
+	     (jme->chip_sub_rev == 0 ||
+	      jme->chip_sub_rev == 1 ||
+	      jme->chip_sub_rev == 3))) {
+		jme_set_phyparm(jme, 0x8);
+	} else if (jme->chip_main_rev == 3 &&
+		   (jme->chip_sub_rev == 1 ||
+		    jme->chip_sub_rev == 2)) {
+		jme_set_phyparm(jme, 0x7);
+	} else if (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260 &&
+		   jme->chip_main_rev == 2) {
+		if (jme->chip_sub_rev == 0)
+			jme_set_phyparm(jme, 0x3);
+		else if (jme->chip_sub_rev == 2)
+			jme_set_phyparm(jme, 0x2);
+	}
+}
+
 static inline void
 jme_phy_on(struct jme_adapter *jme)
 {
@@ -1783,6 +1846,9 @@ jme_phy_on(struct jme_adapter *jme)
 	bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
 	bmcr &= ~BMCR_PDOWN;
 	jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+
+	jme_recal_phy(jme);
+	jme_refill_phyparm(jme);
 }
 
 static inline void