diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-01-25 22:11:25 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-15 09:26:31 +0100 |
| commit | cd1f402c18cf31b38bb304bc0c320669762ac50b (patch) | |
| tree | 3c949bfcb739cae6661698dadce1e655d8b2ea4f /drivers/net/fec.c | |
| parent | net/fec: postpone unsetting driver data until the hardware is stopped (diff) | |
| download | linux-cd1f402c18cf31b38bb304bc0c320669762ac50b.tar.xz linux-cd1f402c18cf31b38bb304bc0c320669762ac50b.zip | |
net/fec: enable flow control and length check on enet-mac
Also optimize not to reread the value written to FEC_R_CNTRL.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index c3229713b1e2..74798bee672e 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -339,7 +339,8 @@ fec_restart(struct net_device *ndev, int duplex) const struct platform_device_id *id_entry = platform_get_device_id(fep->pdev); int i; - u32 val, temp_mac[2]; + u32 temp_mac[2]; + u32 rcntl = OPT_FRAME_SIZE | 0x04; /* Whack a reset. We should wait for this. */ writel(1, fep->hwp + FEC_ECNTRL); @@ -388,14 +389,14 @@ fec_restart(struct net_device *ndev, int duplex) /* Enable MII mode */ if (duplex) { - /* MII enable / FD enable */ - writel(OPT_FRAME_SIZE | 0x04, fep->hwp + FEC_R_CNTRL); + /* FD enable */ writel(0x04, fep->hwp + FEC_X_CNTRL); } else { - /* MII enable / No Rcv on Xmit */ - writel(OPT_FRAME_SIZE | 0x06, fep->hwp + FEC_R_CNTRL); + /* No Rcv on Xmit */ + rcntl |= 0x02; writel(0x0, fep->hwp + FEC_X_CNTRL); } + fep->full_duplex = duplex; /* Set MII speed */ @@ -406,21 +407,21 @@ fec_restart(struct net_device *ndev, int duplex) * differently on enet-mac. */ if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) { - val = readl(fep->hwp + FEC_R_CNTRL); + /* Enable flow control and length check */ + rcntl |= 0x40000000 | 0x00000020; /* MII or RMII */ if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) - val |= (1 << 8); + rcntl |= (1 << 8); else - val &= ~(1 << 8); + rcntl &= ~(1 << 8); /* 10M or 100M */ if (fep->phy_dev && fep->phy_dev->speed == SPEED_100) - val &= ~(1 << 9); + rcntl &= ~(1 << 9); else - val |= (1 << 9); + rcntl |= (1 << 9); - writel(val, fep->hwp + FEC_R_CNTRL); } else { #ifdef FEC_MIIGSK_ENR if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) { @@ -440,6 +441,7 @@ fec_restart(struct net_device *ndev, int duplex) } #endif } + writel(rcntl, fep->hwp + FEC_R_CNTRL); /* And last, enable the transmit and receive processing */ writel(2, fep->hwp + FEC_ECNTRL); |