2 files changed, 27 insertions, 34 deletions

diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 2296f3d46ca8..558dd0692092 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -910,18 +910,16 @@ core99_gmac_phy_reset(struct device_node *node, long param, long value)
             macio->type != macio_intrepid)
                 return -ENODEV;
 
-        printk(KERN_DEBUG "Hard reset of PHY chip ...\n");
-
         LOCK(flags);
         MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE);
         (void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET);
         UNLOCK(flags);
-        msleep(10);
+        mdelay(10);
         LOCK(flags);
         MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */
                 KEYLARGO_GPIO_OUTOUT_DATA);
         UNLOCK(flags);
-        msleep(10);
+        mdelay(10);
 
         return 0;
 }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 55f3b856236e..28ce47a02408 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1653,40 +1653,36 @@ static void gem_init_rings(struct gem *gp)
 /* Init PHY interface and start link poll state machine */
 static void gem_init_phy(struct gem *gp)
 {
-        u32 mif_cfg;
+        u32 mifcfg;
 
         /* Revert MIF CFG setting done on stop_phy */
-        mif_cfg = readl(gp->regs + MIF_CFG);
-        mif_cfg &= ~(MIF_CFG_PSELECT|MIF_CFG_POLL|MIF_CFG_BBMODE|MIF_CFG_MDI1);
-        mif_cfg |= MIF_CFG_MDI0;
-        writel(mif_cfg, gp->regs + MIF_CFG);
-        writel(PCS_DMODE_MGM, gp->regs + PCS_DMODE);
-        writel(MAC_XIFCFG_OE, gp->regs + MAC_XIFCFG);
+        mifcfg = readl(gp->regs + MIF_CFG);
+        mifcfg &= ~MIF_CFG_BBMODE;
+        writel(mifcfg, gp->regs + MIF_CFG);
         
         if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) {
                 int i;
-                u16 ctrl;
 
+                /* Those delay sucks, the HW seem to love them though, I'll
+                 * serisouly consider breaking some locks here to be able
+                 * to schedule instead
+                 */
+                for (i = 0; i < 3; i++) {
 #ifdef CONFIG_PPC_PMAC
-                pmac_call_feature(PMAC_FTR_GMAC_PHY_RESET, gp->of_node, 0, 0);
+                        pmac_call_feature(PMAC_FTR_GMAC_PHY_RESET, gp->of_node, 0, 0);
+                        msleep(20);
 #endif
-
-                /* Some PHYs used by apple have problem getting back
-                 * to us, we do an additional reset here
-                 */
-                phy_write(gp, MII_BMCR, BMCR_RESET);
-                for (i = 0; i < 50; i++) {
-                        if ((phy_read(gp, MII_BMCR) & BMCR_RESET) == 0)
+                        /* Some PHYs used by apple have problem getting back to us,
+                         * we do an additional reset here
+                         */
+                        phy_write(gp, MII_BMCR, BMCR_RESET);
+                        msleep(20);
+                        if (phy_read(gp, MII_BMCR) != 0xffff)
                                 break;
-                        msleep(10);
+                        if (i == 2)
+                                printk(KERN_WARNING "%s: GMAC PHY not responding !\n",
+                                       gp->dev->name);
                 }
-                if (i == 50)
-                        printk(KERN_WARNING "%s: GMAC PHY not responding !\n",
-                               gp->dev->name);
-                /* Make sure isolate is off */
-                ctrl = phy_read(gp, MII_BMCR);
-                if (ctrl & BMCR_ISOLATE)
-                        phy_write(gp, MII_BMCR, ctrl & ~BMCR_ISOLATE);
         }
 
         if (gp->pdev->vendor == PCI_VENDOR_ID_SUN &&
@@ -2123,7 +2119,7 @@ static void gem_reinit_chip(struct gem *gp)
 /* Must be invoked with no lock held. */
 static void gem_stop_phy(struct gem *gp, int wol)
 {
-        u32 mif_cfg;
+        u32 mifcfg;
         unsigned long flags;
 
         /* Let the chip settle down a bit, it seems that helps
@@ -2134,9 +2130,9 @@ static void gem_stop_phy(struct gem *gp, int wol)
         /* Make sure we aren't polling PHY status change. We
          * don't currently use that feature though
          */
-        mif_cfg = readl(gp->regs + MIF_CFG);
-        mif_cfg &= ~MIF_CFG_POLL;
-        writel(mif_cfg, gp->regs + MIF_CFG);
+        mifcfg = readl(gp->regs + MIF_CFG);
+        mifcfg &= ~MIF_CFG_POLL;
+        writel(mifcfg, gp->regs + MIF_CFG);
 
         if (wol && gp->has_wol) {
                 unsigned char *e = &gp->dev->dev_addr[0];
@@ -2186,8 +2182,7 @@ static void gem_stop_phy(struct gem *gp, int wol)
                 /* According to Apple, we must set the MDIO pins to this begnign
                  * state or we may 1) eat more current, 2) damage some PHYs
                  */
-                mif_cfg = 0;
-                writel(mif_cfg | MIF_CFG_BBMODE, gp->regs + MIF_CFG);
+                writel(mifcfg | MIF_CFG_BBMODE, gp->regs + MIF_CFG);
                 writel(0, gp->regs + MIF_BBCLK);
                 writel(0, gp->regs + MIF_BBDATA);
                 writel(0, gp->regs + MIF_BBOENAB);