summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-06 18:40:28 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-06 18:40:28 +0000
commit533b9e3bd42ae5392ac5eea3549e672419e02d76 (patch)
tree055e6f12b4548578fc99673e14fa73ec890e3404
parente2b5ab4233779ace4e0160ea6f0a9801b7128053 (diff)
Put back some code from the 2.4 driver, supposed to boot network perfs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8354 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/rdc-2.6/files/drivers/net/r6040.c35
1 files changed, 23 insertions, 12 deletions
diff --git a/target/linux/rdc-2.6/files/drivers/net/r6040.c b/target/linux/rdc-2.6/files/drivers/net/r6040.c
index de58e657b..135ea13fd 100644
--- a/target/linux/rdc-2.6/files/drivers/net/r6040.c
+++ b/target/linux/rdc-2.6/files/drivers/net/r6040.c
@@ -861,18 +861,19 @@ for (i = 0; i < RX_DCNT; i++) {
outw(MAX_BUF_SIZE, ioaddr+0x18);
if ((lp->switch_sig = phy_read(ioaddr, 0, 2)) == 0x0243) // ICPlus IP175C Signature
-{
- phy_write(ioaddr, 29,31, 0x175C); //Enable registers
- lp->phy_mode = 0x8000;
-} else {
- /* PHY Mode Check */
- phy_write(ioaddr, lp->phy_addr, 4, PHY_CAP);
- phy_write(ioaddr, lp->phy_addr, 0, PHY_MODE);
-
- if (PHY_MODE == 0x3100)
- lp->phy_mode = phy_mode_chk(dev);
- else lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
-}
+ {
+ phy_write(ioaddr, 29,31, 0x175C); //Enable registers
+ lp->phy_mode = 0x8000;
+ } else {
+ /* PHY Mode Check */
+ phy_write(ioaddr, lp->phy_addr, 4, PHY_CAP);
+ phy_write(ioaddr, lp->phy_addr, 0, PHY_MODE);
+
+ if (PHY_MODE == 0x3100)
+ lp->phy_mode = phy_mode_chk(dev);
+ else
+ lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
+ }
/* MAC Bus Control Register */
outw(MBCR_DEFAULT, ioaddr+0x8);
@@ -880,6 +881,16 @@ for (i = 0; i < RX_DCNT; i++) {
lp->mcr0 |= lp->phy_mode;
outw(lp->mcr0, ioaddr);
+ /* set interrupt waiting time and packet numbers */
+ outw(0x0802, ioaddr + 0x0C);
+ outw(0x0802, ioaddr + 0x10);
+
+ /* upgrade performance (by RDC guys) */
+ phy_write(ioaddr,30,17,(phy_read(ioaddr,30,17)|0x4000)); //bit 14=1
+ phy_write(ioaddr,30,17,~((~phy_read(ioaddr,30,17))|0x2000)); //bit 13=0
+ phy_write(ioaddr,0,19,0x0000);
+ phy_write(ioaddr,0,30,0x01F0);
+
/* Interrupt Mask Register */
outw(R6040_INT_MASK, ioaddr + 0x40);
}