korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SUNGEM]: Unbreak Sun GEM chips.

Browse Source 
Revert: 40727198bf

These PHY changes hang the sungem driver on startup with Sun chips on
sparc64.  Hopefully we can redo these changes in a way that doesn't
break non-Apple systems.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-01-31 17:09:20 -08:00
parent 3fa97c9db4
commit 7fb76aa07f
2 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/platforms/powermac/feature.c
View File

@ -910,18 +910,16 @@ core99_gmac_phy_reset(struct device_node *node, long param, long value)
macio->type != macio_intrepid) macio->type != macio_intrepid)
return -ENODEV; return -ENODEV;
printk(KERN_DEBUG "Hard reset of PHY chip ...\n");
LOCK(flags); LOCK(flags);
MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE); MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE);
(void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET); (void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET);
UNLOCK(flags); UNLOCK(flags);
msleep(10); mdelay(10);
LOCK(flags); LOCK(flags);
MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */ MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */
KEYLARGO_GPIO_OUTOUT_DATA); KEYLARGO_GPIO_OUTOUT_DATA);
UNLOCK(flags); UNLOCK(flags);
msleep(10); mdelay(10);
return 0; return 0;
} }

57
drivers/net/sungem.c
View File

@ -1653,40 +1653,36 @@ static void gem_init_rings(struct gem *gp)
/* Init PHY interface and start link poll state machine */ /* Init PHY interface and start link poll state machine */
static void gem_init_phy(struct gem *gp) static void gem_init_phy(struct gem *gp)
{ {
u32 mif_cfg; u32 mifcfg;
/* Revert MIF CFG setting done on stop_phy */ /* Revert MIF CFG setting done on stop_phy */
mif_cfg = readl(gp->regs + MIF_CFG); mifcfg = readl(gp->regs + MIF_CFG);
mif_cfg &= ~(MIF_CFG_PSELECT|MIF_CFG_POLL|MIF_CFG_BBMODE|MIF_CFG_MDI1); mifcfg &= ~MIF_CFG_BBMODE;
mif_cfg |= MIF_CFG_MDI0; writel(mifcfg, gp->regs + MIF_CFG);
writel(mif_cfg, gp->regs + MIF_CFG);
writel(PCS_DMODE_MGM, gp->regs + PCS_DMODE);
writel(MAC_XIFCFG_OE, gp->regs + MAC_XIFCFG);
if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) { if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) {
int i; int i;
u16 ctrl;
#ifdef CONFIG_PPC_PMAC /* Those delay sucks, the HW seem to love them though, I'll
pmac_call_feature(PMAC_FTR_GMAC_PHY_RESET, gp->of_node, 0, 0); * serisouly consider breaking some locks here to be able
#endif * to schedule instead
/* 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 < 3; i++) {
for (i = 0; i < 50; i++) { #ifdef CONFIG_PPC_PMAC
if ((phy_read(gp, MII_BMCR) & BMCR_RESET) == 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);
msleep(20);
if (phy_read(gp, MII_BMCR) != 0xffff)
break; 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 && 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. */ /* Must be invoked with no lock held. */
static void gem_stop_phy(struct gem *gp, int wol) static void gem_stop_phy(struct gem *gp, int wol)
{ {
u32 mif_cfg; u32 mifcfg;
unsigned long flags; unsigned long flags;
/* Let the chip settle down a bit, it seems that helps /* 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 /* Make sure we aren't polling PHY status change. We
* don't currently use that feature though * don't currently use that feature though
*/ */
mif_cfg = readl(gp->regs + MIF_CFG); mifcfg = readl(gp->regs + MIF_CFG);
mif_cfg &= ~MIF_CFG_POLL; mifcfg &= ~MIF_CFG_POLL;
writel(mif_cfg, gp->regs + MIF_CFG); writel(mifcfg, gp->regs + MIF_CFG);
if (wol && gp->has_wol) { if (wol && gp->has_wol) {
unsigned char *e = &gp->dev->dev_addr[0]; 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 /* According to Apple, we must set the MDIO pins to this begnign
* state or we may 1) eat more current, 2) damage some PHYs * state or we may 1) eat more current, 2) damage some PHYs
*/ */
mif_cfg = 0; writel(mifcfg | MIF_CFG_BBMODE, gp->regs + MIF_CFG);
writel(mif_cfg | MIF_CFG_BBMODE, gp->regs + MIF_CFG);
writel(0, gp->regs + MIF_BBCLK); writel(0, gp->regs + MIF_BBCLK);
writel(0, gp->regs + MIF_BBDATA); writel(0, gp->regs + MIF_BBDATA);
writel(0, gp->regs + MIF_BBOENAB); writel(0, gp->regs + MIF_BBOENAB);