diff options
| author | Michael Brown | 2012-08-23 22:25:51 +0200 |
|---|---|---|
| committer | Michael Brown | 2012-08-23 22:25:51 +0200 |
| commit | 6e50e7950f7f4faca450f7be958b1508d2584716 (patch) | |
| tree | cdbd3c0061b2969816f6b00c91fb29a1af50874c | |
| parent | [realtek] Enable DAC only when built as a 64-bit binary (diff) | |
| download | ipxe-6e50e7950f7f4faca450f7be958b1508d2584716.tar.gz ipxe-6e50e7950f7f4faca450f7be958b1508d2584716.tar.xz ipxe-6e50e7950f7f4faca450f7be958b1508d2584716.zip | |
[mii] Add separate mii_restart() function
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/drivers/net/mii.c | 36 | ||||
| -rw-r--r-- | src/include/ipxe/mii.h | 1 |
2 files changed, 33 insertions, 4 deletions
diff --git a/src/drivers/net/mii.c b/src/drivers/net/mii.c index c8e6529d..c4d32514 100644 --- a/src/drivers/net/mii.c +++ b/src/drivers/net/mii.c @@ -31,6 +31,37 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ /** + * Restart autonegotiation + * + * @v mii MII interface + * @ret rc Return status code + */ +int mii_restart ( struct mii_interface *mii ) { + int bmcr; + int rc; + + /* Read BMCR */ + bmcr = mii_read ( mii, MII_BMCR ); + if ( bmcr < 0 ) { + rc = bmcr; + DBGC ( mii, "MII %p could not read BMCR: %s\n", + mii, strerror ( rc ) ); + return rc; + } + + /* Enable and restart autonegotiation */ + bmcr |= ( BMCR_ANENABLE | BMCR_ANRESTART ); + if ( ( rc = mii_write ( mii, MII_BMCR, bmcr ) ) != 0 ) { + DBGC ( mii, "MII %p could not write BMCR: %s\n", + mii, strerror ( rc ) ); + return rc; + } + + DBGC ( mii, "MII %p restarted autonegotiation\n", mii ); + return 0; +} + +/** * Reset MII interface * * @v mii MII interface @@ -70,11 +101,8 @@ int mii_reset ( struct mii_interface *mii ) { /* Force autonegotation on again, in case it was * cleared by the reset. */ - if ( ( rc = mii_write ( mii, MII_BMCR, BMCR_ANENABLE ) ) != 0 ){ - DBGC ( mii, "MII %p could not write BMCR: %s\n", - mii, strerror ( rc ) ); + if ( ( rc = mii_restart ( mii ) ) != 0 ) return rc; - } DBGC ( mii, "MII %p reset after %dms\n", mii, i ); return 0; diff --git a/src/include/ipxe/mii.h b/src/include/ipxe/mii.h index a33a31d9..cf462418 100644 --- a/src/include/ipxe/mii.h +++ b/src/include/ipxe/mii.h @@ -81,6 +81,7 @@ mii_write ( struct mii_interface *mii, unsigned int reg, unsigned int data ) { /** Maximum time to wait for a reset, in milliseconds */ #define MII_RESET_MAX_WAIT_MS 500 +extern int mii_restart ( struct mii_interface *mii ); extern int mii_reset ( struct mii_interface *mii ); #endif /* _IPXE_MII_H */ |