RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

leon, greth: speed modes advertising now configurable

Browse Source
This commit is contained in:
Daniel Hellstrom
2017-04-24 16:32:17 +02:00
parent 1271813421
commit e6fbd26fdb
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libbsp/sparc/shared/include/greth.h
View File

@@ -81,6 +81,8 @@ typedef struct _greth_regs {
#define GRETH_CTRL_FULLD 0x00000010 /* Full Duplex */
#define GRETH_CTRL_PRO 0x00000020 /* Promiscuous (receive all) */
#define GRETH_CTRL_RST 0x00000040 /* Reset MAC */
#define GRETH_CTRL_SP 0x00000080 /* 100MBit speed mode */
#define GRETH_CTRL_GB 0x00000100 /* 1GBit speed mode */
#define GRETH_CTRL_DD 0x00001000 /* Disable EDCL Duplex Detection */
#define GRETH_CTRL_ED 0x00004000 /* EDCL Disable */
@@ -133,6 +135,14 @@ struct phy_device_info
int extpart;
};
/* Limit speed modes advertised during auto-negotiation */
#define GRETH_ADV_10_HD 0x0001
#define GRETH_ADV_10_FD 0x0002
#define GRETH_ADV_100_HD 0x0004
#define GRETH_ADV_100_FD 0x0008
#define GRETH_ADV_1000_HD 0x0010
#define GRETH_ADV_1000_FD 0x0020
#define GRETH_ADV_ALL 0x003f
/*
#ifdef CPU_U32_FIX
void ipalign(struct mbuf *m);

36
c/src/lib/libbsp/sparc/shared/net/greth.c
View File

@@ -188,6 +188,7 @@ struct greth_softc
int gb;
int gbit_mac;
int auto_neg;
unsigned int advmodes; /* advertise ethernet speed modes. 0 = all modes. */
struct timespec auto_neg_time;
/*
@@ -352,6 +353,7 @@ greth_initialize_hardware (struct greth_softc *sc)
int tmp2;
struct timespec tstart, tnow;
greth_regs *regs;
unsigned int advmodes;
regs = sc->regs;
@@ -394,6 +396,13 @@ greth_initialize_hardware (struct greth_softc *sc)
/* Wait for reset to complete and get default values */
while ((phyctrl = read_mii(sc, phyaddr, 0)) & 0x8000) {}
/* Set up PHY advertising modes for auto-negotiation */
advmodes = sc->advmodes;
if (advmodes == 0)
advmodes = GRETH_ADV_ALL;
if (!sc->gbit_mac)
advmodes &= ~(GRETH_ADV_1000_FD | GRETH_ADV_1000_HD);
/* Enable/Disable GBit auto-neg advetisement so that the link partner
* know that we have/haven't GBit capability. The MAC may not support
* Gbit even though PHY does...
@@ -401,12 +410,27 @@ greth_initialize_hardware (struct greth_softc *sc)
phystatus = read_mii(sc, phyaddr, 1);
if (phystatus & 0x0100) {
tmp1 = read_mii(sc, phyaddr, 9);
if (sc->gbit_mac)
write_mii(sc, phyaddr, 9, tmp1 | 0x300);
else
write_mii(sc, phyaddr, 9, tmp1 & ~(0x300));
tmp1 &= ~0x300;
if (advmodes & GRETH_ADV_1000_FD)
tmp1 |= 0x200;
if (advmodes & GRETH_ADV_1000_HD)
tmp1 |= 0x100;
write_mii(sc, phyaddr, 9, tmp1);
}
/* Optionally limit the 10/100 modes as configured by user */
tmp1 = read_mii(sc, phyaddr, 4);
tmp1 &= ~0x1e0;
if (advmodes & GRETH_ADV_100_FD)
tmp1 |= 0x100;
if (advmodes & GRETH_ADV_100_HD)
tmp1 |= 0x080;
if (advmodes & GRETH_ADV_10_FD)
tmp1 |= 0x040;
if (advmodes & GRETH_ADV_10_HD)
tmp1 |= 0x020;
write_mii(sc, phyaddr, 4, tmp1);
/* If autonegotiation implemented we start it */
if (phystatus & 0x0008) {
write_mii(sc, phyaddr, 0, phyctrl | 0x1200);
@@ -1480,6 +1504,10 @@ int greth_device_init(struct greth_softc *sc)
if ( value && (value->i < 32) )
sc->phyaddr = value->i;
value = drvmgr_dev_key_get(sc->dev, "advModes", DRVMGR_KT_INT);
if ( value )
sc->advmodes = value->i;
return 0;
}