From edbf5a02126c8db32ba826e510459fbcb9a579e5 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 11:43:57 +0000 Subject: slugos-init: improve module loading at boot --- packages/slugos-init/files/boot/disk | 19 ++++-------- packages/slugos-init/files/boot/ram | 13 --------- .../slugos-init/files/initscripts/loadmodules.sh | 34 +++------------------- packages/slugos-init/slugos-init_0.10.bb | 4 ++- 4 files changed, 13 insertions(+), 57 deletions(-) diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index 02b8ee82cf..d0b093c602 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -8,22 +8,10 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin # # Load the helper functions . /etc/default/functions +. /etc/default/modulefunctions # leds boot system # -# Load the required SCSI and USB modules 'by hand' -insmod /lib/modules/`uname -r`/kernel/drivers/scsi/scsi_mod.ko -insmod /lib/modules/`uname -r`/kernel/drivers/scsi/sd_mod.ko -insmod /lib/modules/`uname -r`/kernel/drivers/usb/core/usbcore.ko -# Add more cases here for different boards -case "$(machine)" in - nslu2) - insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ehci-hcd.ko - insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ohci-hcd.ko - ;; -esac -insmod /lib/modules/`uname -r`/kernel/drivers/usb/storage/usb-storage.ko -# if test -n "$1" then device="$1" @@ -35,6 +23,11 @@ then # # proc is needed for UUID mount mount -t proc proc /proc + # + # load USB & SCSI storage modules (/proc required!) + echo "boot: loading modules required for boot" + loadusbmods + # # Mount read-write because before exec'ing init # If a UUID is given (in the environment) this # is used in preference to the device, but if diff --git a/packages/slugos-init/files/boot/ram b/packages/slugos-init/files/boot/ram index 4729e16a78..a7c78b39ac 100644 --- a/packages/slugos-init/files/boot/ram +++ b/packages/slugos-init/files/boot/ram @@ -12,19 +12,6 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin leds beep -r 2 leds boot system # -# Load the required SCSI and USB modules 'by hand' -insmod /lib/modules/`uname -r`/kernel/drivers/scsi/scsi_mod.ko -insmod /lib/modules/`uname -r`/kernel/drivers/scsi/sd_mod.ko -insmod /lib/modules/`uname -r`/kernel/drivers/usb/core/usbcore.ko -# Add more cases here for different boards -case "$(machine)" in - nslu2) - insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ehci-hcd.ko - insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ohci-hcd.ko - ;; -esac -insmod /lib/modules/`uname -r`/kernel/drivers/usb/storage/usb-storage.ko -# if test -n "$1" then device="$1" diff --git a/packages/slugos-init/files/initscripts/loadmodules.sh b/packages/slugos-init/files/initscripts/loadmodules.sh index f2b28d8868..1bc540a148 100644 --- a/packages/slugos-init/files/initscripts/loadmodules.sh +++ b/packages/slugos-init/files/initscripts/loadmodules.sh @@ -4,41 +4,15 @@ # Currently, this script only supports the NSLU2 . /etc/default/functions # Load $(machine) function required - -echo "Starting Network Processing Engines" -modprobe ixp4xx_npe -sleep 1 # Wait for firmware load +. /etc/default/modulefunctions echo "Loading networking modules" - -modprobe af_packet # Required for DHCP - -# Add nas100d/loft below when mac definition is added to kernel -case "$(machine)" in - ixdp425|nslu2) - modprobe ixp4xx_mac - ;; -esac - -# Add conditional DSM-G600 ethernet module load +loadnetmods echo "Loading usb storage modules" -modprobe scsi_mod -modprobe sd_mod -modprobe usbcore - -# Add more entries as appropriate -case "$(machine)" in - nslu2) - modprobe ohci_hcd - modprobe ehci_hcd - ;; -esac - -modprobe usb_storage +loadusbmods echo "Loading other modules" -modprobe ixp4xx_rng -modprobe i2c_dev +loadmiscmods exit 0 diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 4c775dd1d7..66e2ae5712 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r67" +PR = "r68" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -23,6 +23,7 @@ SRC_URI = "file://boot/flash \ file://initscripts/umountinitrd.sh \ file://initscripts/loadmodules.sh \ file://functions \ + file://modulefunctions \ file://conffiles \ file://sysconf \ file://leds \ @@ -89,6 +90,7 @@ do_install() { # # Init scripts install -m 0644 functions ${D}${sysconfdir}/default + install -m 0644 modulefunctions ${D}${sysconfdir}/default for s in ${INITSCRIPTS} do install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/ -- cgit v1.2.3 From 4029724217730ac64434bf6e9c01c3cef3293267 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 11:46:32 +0000 Subject: tcpdump: tcpdump is compiled without crypto, so remove openssl RDEPENDS --- packages/tcpdump/tcpdump_3.9.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb index 2caaa3ab98..0e52268cfd 100644 --- a/packages/tcpdump/tcpdump_3.9.3.bb +++ b/packages/tcpdump/tcpdump_3.9.3.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.tcpdump.org/" LICENSE = "BSD" SECTION = "console/network" PRIORITY = "optional" -DEPENDS = "libpcap-0.9.3 openssl" -PR = "r1" +DEPENDS = "libpcap-0.9.3" +PR = "r2" SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ file://tcpdump_configure_no_-O2.patch;patch=1" -- cgit v1.2.3 From 50a1162999c34f88ceaf998ba29a1232e7c54f28 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 11:53:16 +0000 Subject: mii-diag: add new package * Used for debugging MII, needed for fixing NSLU2 LE --- packages/mii-diag/.mtn2git_empty | 0 packages/mii-diag/mii-diag-2.11/.mtn2git_empty | 0 packages/mii-diag/mii-diag-2.11/libmii.c | 630 ++++++++++++++++++++++++ packages/mii-diag/mii-diag-2.11/mii-diag.c | 648 +++++++++++++++++++++++++ packages/mii-diag/mii-diag_2.11.bb | 24 + 5 files changed, 1302 insertions(+) create mode 100644 packages/mii-diag/.mtn2git_empty create mode 100644 packages/mii-diag/mii-diag-2.11/.mtn2git_empty create mode 100644 packages/mii-diag/mii-diag-2.11/libmii.c create mode 100644 packages/mii-diag/mii-diag-2.11/mii-diag.c create mode 100644 packages/mii-diag/mii-diag_2.11.bb diff --git a/packages/mii-diag/.mtn2git_empty b/packages/mii-diag/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mii-diag/mii-diag-2.11/.mtn2git_empty b/packages/mii-diag/mii-diag-2.11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mii-diag/mii-diag-2.11/libmii.c b/packages/mii-diag/mii-diag-2.11/libmii.c new file mode 100644 index 0000000000..96f0060509 --- /dev/null +++ b/packages/mii-diag/mii-diag-2.11/libmii.c @@ -0,0 +1,630 @@ +/* libmii.c: MII diagnostic and setup library. + + Copyright 1997-2003 by Donald Becker. + This version released under the Gnu General Public License, + incorporated herein by reference. + This source code may be distributed without modification using the + existing notice. Any modification to this source code must include a + full notice as described in the GPL + Contact the author for use under other terms. + + The author may be reached as becker@scyld.com, or C/O + Scyld Computing Corporation + 914 Bay Ridge Road, Suite 220 + Annapolis MD 21403 + + References + http://www.scyld.com/expert/NWay.html + http://www.national.com/pf/DP/DP83840A.html +*/ + +static const char version_msg[] = +"libmii.c:v2.11 2/28/2005 Donald Becker (becker@scyld.com)\n" +" http://www.scyld.com/diag/index.html\n"; + +/* This library exports the following functions: + IOADDR: A token passed to the mdio_read() function. + PHY_ID: The MII transceiver address, passed uninterpreted to mdio_read(). +*/ +void show_mii_details(long ioaddr, int phy_id); +int monitor_mii(long ioaddr, int phy_id); + +/* This library expects to be able to call the following functions: */ +extern int mdio_read(long ioaddr, int phy_id, int mii_reg_num); + +#include +#include +#include +#include + +#include +typedef u_int32_t u32; +typedef u_int16_t u16; +typedef u_int8_t u8; + +static const char *media_names[] = { + "10baseT", "10baseT-FD", "100baseTx", "100baseTx-FD", "100baseT4", + "Flow-control", 0, +}; + +static void ns83843(long ioaddr, int phy_id); +static void qs6612(long ioaddr, int phy_id); +static void smsc83c180(long ioaddr, int phy_id); +static void tdk78q2120(long ioaddr, int phy_id); +static void davicom_dm9101(long ioaddr, int phy_id); +static void intel_i553(long ioaddr, int phy_id); +static void enablesemi(long ioaddr, int phy_id); +static void amd_pna(long ioaddr, int phy_id); +static void amd_tx(long ioaddr, int phy_id); +static void admtek(long ioaddr, int phy_id); +static void lu3x31(long ioaddr, int phy_id); +static void myson981(long ioaddr, int phy_id); +static void via_tahoe(long ioaddr, int phy_id); +static void via_vt6103(long ioaddr, int phy_id); +static void via_vt6105(long ioaddr, int phy_id); +static void intel(long ioaddr, int phy_id); + +struct mii_partnum { + const char *vendor; /* Vendor name. */ + u16 phy_id0; /* Vendor ID (alternate ver. of ieee_oui[]) */ + u16 phy_id1; /* Vendor ID (alternate ver. of ieee_oui[]) */ + unsigned char ieee_oui[3]; /* IEEE-assigned organizationally unique ID */ + char flags; + void (*(func))(long xcvr_if, int phy_id);/* Function to emit more info. */ +} static oui_map[] = { + {"Unknown transceiver type", 0x0000, 0x0000, {0,}, 0, NULL,}, + {"National Semiconductor 83840A", 0x2000, 0x5c01, {0,}, 0, NULL,}, + {"National Semiconductor 83843", 0x2000, 0x5c10, {0,}, 0, ns83843, }, + {"Level One LXT970", 0x7810, 0x0000, {0,}, 0, NULL, }, + {"Level One LXT971", 0x7810, 0x0001, {0,}, 0, NULL, }, + {"Level One LXT971A",0x7810, 0x0003, {0,}, 0, NULL, }, + {"Level One (unknown type)", 0, 0, {0x1e,0x04,0x00}, 0, NULL, }, + {"Davicom DM9101", 0x0181, 0xB800, {0,}, 0, davicom_dm9101, }, + {"Davicom (unknown type)", 0, 0, {0x00, 0x60, 0x6e}, 0, davicom_dm9101, }, + {"Quality Semiconductor QS6612", 0x0181, 0x4410, {0,}, 0, qs6612}, + {"Quality Semiconductor (unknown type)", 0,0, {0x00, 0x60, 0x51}, 0, NULL}, + {"SMSC 83c180", 0x0282, 0x1C51, {0}, 0, smsc83c180, }, + {"TDK Semi 78Q2120 rev. 2", 0x0300, 0xE542, {0,}, 0, tdk78q2120, }, + {"TDK Semi 78Q2120 rev. 3", 0x0300, 0xE543, {0,}, 0, tdk78q2120, }, + {"TDK Semi 78Q2120 rev. 11", 0x0300, 0xE54B, {0,}, 0, tdk78q2120, }, + {"TDK transceiver (unknown type)", 0,0, {0x00, 0xc0, 0x39}, 0, tdk78q2120}, + {"Intel (unknown type)", 0,0, {0x00, 0xf8, 0x00}, 0, intel_i553}, + {"Enable Semiconductor EL40-331", 0x0043, 0x7411, {0,}, 0, enablesemi}, + {"AMD 79c901A.1 HomePNA", 0x0000, 0x6B91, {0,}, 0, amd_pna}, + {"AMD 79c901A.2 HomePNA", 0x0000, 0x6B92, {0,}, 0, amd_pna}, + {"AMD 79c901A.3 HomePNA", 0x0000, 0x6B93, {0,}, 0, amd_pna}, + {"AMD 79c901A.3 10baseT", 0x0000, 0x6B71, {0,}, 0, amd_tx}, + {"AdHoc Technology AH101LF", 0x0022, 0x561B, {0,}, 0, tdk78q2120}, + {"Altimata Communications AC101LF", 0x0022, 0x5523, {0,}, 0, tdk78q2120}, + {"Altimata Comm (unknown type)", 0, 0, {0x00,0x10,0xA9}, 0, tdk78q2120}, + {"ASIX (unknown type)", 0, 0, {0x00,0xC0,0xB4}, 0, tdk78q2120}, + {"ADMtek AN983 Comet", 0x0022, 0x5410, {0,}, 0, admtek}, + {"ADMtek AN985 Comet", 0x0022, 0x5513, {0,}, 0, admtek}, + {"ADMtek (unknown type)", 0, 0, {0x00,0xe0,0x92}, 0, admtek}, + {"Lucent LU6612", 0x0180, 0x7641, {0,}, 0, qs6612}, + {"Lucent LU3X31", 0x0043, 0x7411, {0,}, 0, lu3x31}, + {"LSI Logic (Seeq) 80225", 0, 0, {0x00,0xA0,0x7D}, 0, NULL}, + {"Myson MTD981", 0x0302, 0xD000, {0,}, 0, myson981}, + {"Myson (unknown type)", 0, 0, {0x00,0xC0,0xB4,}, 0, myson981}, + {"Alta/Kendin Sundance", 0x0022, 0x1720, {0,}, 0, NULL}, + {"Alta/Kendin Sundance", 0, 0, {0x00,0x08,0x85}, 0, NULL}, + {"VIA Tahoe VT6103", 0x0101, 0x8f20, {0,}, 0, via_vt6103}, + {"VIA Tahoe VT6104", 0x0101, 0x8f30, {0,}, 0, via_tahoe}, + {"VIA Rhine VT6105", 0x0101, 0x8f22, {0,}, 0, via_vt6105}, + {"Intel 82557 series", 0x02a8, 0x0150, {0,}, 0, intel}, + {"Intel 82555 rev 1", 0x02a8, 0x0151, {0,}, 0, intel}, + {"Intel 82559 transceiver", 0x02a8, 0x0154, {0,}, 0, intel}, + {"Intel 82555 series transceiver", 0,0, {0x00,0xaa,0x00}, 0, intel}, + {0, }, +}; + +static u16 mii_val[32]; + +void show_mii_details(long ioaddr, int phy_id) +{ + int mii_reg, i, vendor = 0; + u16 bmcr, bmsr, new_bmsr; + + /* This may not be omitted from the output. */ + printf("%s", version_msg); + printf(" MII PHY #%d transceiver registers:", phy_id); + for (mii_reg = 0; mii_reg < 32; mii_reg++) { + mii_val[mii_reg] = mdio_read(ioaddr, phy_id, mii_reg); + printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n " : "", + mii_val[mii_reg]); + } + printf(".\n"); + if (mii_val[0] == 0xffff) { + printf(" No MII transceiver present!.\n"); + return; + } + bmcr = mii_val[0]; + bmsr = mii_val[1]; + printf(" Basic mode control register 0x%4.4x:", bmcr); + if (bmcr & 0x1000) + printf(" Auto-negotiation enabled.\n"); + else + printf(" Auto-negotiation disabled!\n" + " Speed fixed at 10%s mbps, %s-duplex.\n", + bmcr & 0x2000 ? "0" : "", + bmcr & 0x0100 ? "full":"half"); + if (bmcr & 0x8000) + printf(" Transceiver currently being reset!\n"); + if (bmcr & 0x4000) + printf(" Transceiver in loopback mode!\n"); + if (bmcr & 0x0800) + printf(" Transceiver powered down!\n"); + if (bmcr & 0x0400) + printf(" Transceiver isolated from the MII!\n"); + if (bmcr & 0x0200) + printf(" Restarted auto-negotiation in progress!\n"); + if (bmcr & 0x0080) + printf(" Internal Collision-Test enabled!\n"); + + new_bmsr = mdio_read(ioaddr, phy_id, 1); + printf(" Basic mode status register 0x%4.4x ... %4.4x.\n" + " Link status: %sestablished.\n" + " Capable of ", + bmsr, new_bmsr, + bmsr & 0x0004 ? "" : + (new_bmsr & 0x0004) ? "previously broken, but now re" : "not "); + if (bmsr & 0xF800) { + for (i = 15; i >= 11; i--) + if (bmsr & (1<"); + + printf(".\n" + " %s to perform Auto-negotiation, negotiation %scomplete.\n", + bmsr & 0x0008 ? "Able" : "Unable", + bmsr & 0x0020 ? "" : "not "); + + if (bmsr & 0x0010) + printf(" Remote fault detected!\n"); + if (bmsr & 0x0002) + printf(" *** Link Jabber! ***\n"); + + if (mii_val[2] ^ mii_val[3]) { /* Eliminate 0x0000 and 0xffff IDs. */ + unsigned char oui_0 = mii_val[2] >> 10; + unsigned char oui_1 = mii_val[2] >> 2; + unsigned char oui_2 = (mii_val[2] << 6) | (mii_val[3] >> 10); + + printf(" Vendor ID is %2.2x:%2.2x:%2.2x:--:--:--, model %d rev. %d.\n", + oui_0, oui_1, oui_2, + ((mii_val[3] >> 4) & 0x3f), mii_val[3] & 0x0f); + for ( i = 0; oui_map[i].vendor; i++) + /* We match either the Phy ID or the IEEE OUI. */ + if ((oui_map[i].phy_id0 == mii_val[2] && + oui_map[i].phy_id1 == mii_val[3]) || + (oui_map[i].ieee_oui[0] == oui_0 && + oui_map[i].ieee_oui[1] == oui_1 && + oui_map[i].ieee_oui[2] == oui_2)) { + printf(" Vendor/Part: %s.\n", oui_map[i].vendor); + vendor = i; + break; + } + if (oui_map[i].vendor == NULL) + printf(" No specific information is known about this transceiver" + " type.\n"); + } else + printf(" This transceiver has no vendor identification.\n"); + + { + int nway_advert = mii_val[4]; + int lkpar = mii_val[5]; + printf(" I'm advertising %4.4x:", nway_advert); + for (i = 10; i >= 5; i--) + if (nway_advert & (1<= 5; i--) + if (lkpar & (1<= 5; i--) + if (lkpar & (1< 30 ? 200000 : 1000; + select(0, 0, 0, 0, &sleepval); /* Or just sleep(1); */ + } + printf(" Value of MII BMSR (basic mode status register) is %4.4x.\n", + mdio_read(ioaddr, phy_id, 1)); + return 0; +} + +/* Emit transceiver-specific info. */ + +struct msg_tbl { int bitmask; char *msg; }; + +static void msg_if_set(const int val, const struct msg_tbl msg_tbl[]) +{ + int i; + for (i = 0; msg_tbl[i].bitmask; i++) + if (msg_tbl[i].bitmask & val) + printf(" %s\n", msg_tbl[i].msg); +} + +static void msg_if_set_fmt(const int val, const struct msg_tbl msg_tbl[], + const char *fmt) +{ + int i; + for (i = 0; msg_tbl[i].bitmask; i++) + if (msg_tbl[i].bitmask & val) + printf(fmt, msg_tbl[i].msg); +} + +static void qs6612(long ioaddr, int phy_id) +{ + printf(" QS6612 extra registers: Mode %4.4x.\n" + " Interrupt source %4.4x, mask %4.4x.\n" + " PHY control %4.4x.\n", + mii_val[17], mii_val[29], mii_val[30], mii_val[31]); + return; +} + +static void ns83843(long ioaddr, int phy_id) +{ + printf(" NatSemi 83843 extra registers:\n" + " PHY status %4.4x\n" + " %s link, %d Mb/sec %s duplex\n" + " MII interrupts %sabled, %s pending.\n" + " Events since last read\n" + " Link disconnects %d\n" + " False carriers %d\n" + " Receive errors %d\n" + " Link beat is currently %sstable\n", + mii_val[0x10], + mii_val[10] & 0x0001 ? "Valid" : "Invalid", + mii_val[10] & 0x0002 ? 10 : 100, + mii_val[10] & 0x0004 ? "full" : "half", + mii_val[0x11] & 0x0002 ? "en":"dis", + mii_val[0x10] & 0x0100 ? "interrupt": "none", + mii_val[0x13], mii_val[0x14], mii_val[0x15], + mii_val[0x16] & 0x0010 ? "UN" : ""); + return; +} +static void smsc83c180(long ioaddr, int phy_id) +{ + int mii_reg25 = mii_val[25]; + printf(" SMSC 83c180 extra registers:\n" + " Auto-negotiation status 0x%4.4x.\n" + " 10baseT polarity is %s.\n" + " PHY address is %d.\n" + " Auto-negotiation %scomplete, 1%s0Mbps %s duplex.\n" + " Rx symbol errors since last read %d.\n", + mii_reg25, + mii_reg25 & 0x2000 ? "normal" : "reversed", + (mii_reg25>>8) & 0x1F, + mii_reg25 & 0x0080 ? "did not " : "", + mii_reg25 & 0x0020 ? "0" : "", + mii_reg25 & 0x0040 ? "full" : "half", + mdio_read(ioaddr, phy_id, 26)); + return; +} + +static const char *tdk_events[8] = { + "Jabber", "Rx error", "Negotiation page received", "Link detection fault", + "Link partner acknowledge", "Link status change", "Remote partner fault", + "Auto-Negotiation complete"}; + +static const struct msg_tbl tdk_reg16[] = { + {0x8000, " Transceiver is in repeater mode!"}, + {0x4000, " Interrupt pin set to active high."}, + {0x2000, " Reserved bit 12 is unexpectedly set."}, + {0x1000, " Transmit pins are internally disconnected."}, + {0x0800, " 10baseT signal quality test is disabled."}, + {0x0400, " 10baseT loopback mode."}, + {0, 0}, +}; + +static void tdk78q2120(long ioaddr, int phy_id) +{ + int mii_reg16 = mii_val[16]; + int mii_reg17 = mii_val[17]; + int mii_reg18 = mii_val[18]; + int i; + printf(" TDK format vendor-specific registers 16..18 are " + "0x%4.4x 0x%4.4x 0x%4.4x\n", mii_reg16, mii_reg17, mii_reg18); + printf(" Link polarity is %s %s.\n" + "%s%s" + " Auto-negotiation %s, 1%s0Mbps %s duplex.\n" + " Rx link in %s state, PLL %s.\n", + mii_reg16 & 0x0020 ? "OVERRIDDEN to" : "detected as", + mii_reg16 & 0x0010 ? "reversed" : "normal", + mii_reg16 & 0x0002 ? + " 100baseTx Coding and scrambling is disabled!\n":"", + mii_reg16 & 0x0001 ? " Rx_CLK power-save mode is enabled!\n":"", + mii_reg18 & 0x1000 ? "had no common media" : "complete", + mii_reg18 & 0x0400 ? "0" : "", + mii_reg18 & 0x0800 ? "full" : "half", + mii_reg18 & 0x0200 ? "pass" : "fail", + mii_reg18 & 0x0100 ? "slipped since last read" : "locked"); + + msg_if_set(mii_reg16, tdk_reg16); + if (mii_reg17 & 0x00ff) { + printf(" Events since last read:"); + for (i = 0; i < 8; i++) + if (mii_reg17 & (1 << i)) + printf(" %s", tdk_events[i]); + } else + printf(" No new link status events."); + + if (mii_reg17 & 0xff00) { + printf("\n Events that will raise an interrupt:"); + for (i = 0; i < 8; i++) + if (mii_reg17 & (0x100 << i)) + printf(" %s", tdk_events[i]); + } + printf("\n"); + return; +} + +static void davicom_dm9101(long ioaddr, int phy_id) +{ + printf(" Davicom vendor specific registers: 0x%4.4x 0x%4.4x 0x%4.4x.\n", + mii_val[16], mii_val[17], mii_val[18]); +} +static void intel_i553(long ioaddr, int phy_id) +{ + printf(" This transceiver is 100baseT4 only! Register 16 is %4.4x.\n", + mii_val[16]); +} +/* http://www.enablesemi.com/cgi-bin/byteserve/Products/Docs/3VCardBus.pdf */ +static void enablesemi(long ioaddr, int phy_id) +{ + printf(" Isolated %d times, %d false carrier events, %d Rx errors.\n", + mii_val[18], mii_val[19], mii_val[21]); + printf(" Cable polarity is %s, 100Mb PLL is %slocked.\n", + mii_val[28]&0x8000 ? "reversed" : "normal", + mii_val[27]&0x2000 ? "" : "un"); +} +/* The amd79c901 contains both PNA and 10/100 management registers. + http://www.amd.com/products/npd/techdocs/22304.pdf +*/ +static void amd_pna(long ioaddr, int phy_id) +{ + printf(" HomePNA transceiver in %s speed, %s power mode.\n", + mii_val[16] & 4 ? "high" : "low", + mii_val[16] & 2 ? "high" : "low"); + printf(" HomePNA noise level %d, peak power %d..\n", + mii_val[25] >> 8, mii_val[25] & 0xff); +} +static void amd_tx(long ioaddr, int phy_id) +{ + int mii_reg25 = mii_val[25]; + printf(" AMD vendor specific registers: 0x%4.4x 0x%4.4x 0x%4.4x.\n", + mii_val[16], mii_val[17], mii_val[18]); + printf(" The link is %s in 10%s %s duplex mode, autonegotiation state " + "has%s changed.\n", + mii_reg25 & 8 ? "up" : "down", + mii_reg25 & 1 ? "0baseTx" : "baseT", + mii_reg25 & 4 ? "full" : "half", + mii_reg25 & 2 ? "" : " not"); +} + +static const struct msg_tbl admtek_reg21[] = { + {0x4000, " Link test diabled: Ignoring lack of 10baseT link beat."}, + {0x2000, " Link forced up."}, + {0x1000, " Tx jabber check disabled."}, + {0x0080, " Transmitting 'Far End Fault'!"}, + {0x0040, " Rx error count full."}, + {0x0008, " Remote loop back enabled."}, + {0, 0}, +}; + +static void admtek(long ioaddr, int phy_id) +{ + + printf(" ADMtek vendor specific registers information:\n" + " Cable length is approximately %d meters.\n" + " The receiver has lost lock %d times since last check and " + "had %d error events.\n", + ((mii_val[20] & 0x00f0) >> 4)*10, + mii_val[23], mii_val[23]); + msg_if_set(mii_val[21], admtek_reg21); + tdk78q2120(ioaddr, phy_id); +} + +static void lu3x31(long ioaddr, int phy_id) +{ + printf(" Lucent vendor specific registers 17: 0x%4.4x" + " 29: 0x%4.4x 30: 0x%4.4x 31: 0x%4.4x.\n", + mii_val[17], mii_val[29], mii_val[30], mii_val[31]); +} + +static const struct msg_tbl myson_reg16[] = { + {0x0080, " Far end fault enabled."}, + {0x0040, " Transformer ratio 1.25:1."}, + {0x0020, " Polarity correction diabled."}, + {0x0010, " Link is forced up regardless of link beat."}, + {0x0004, " Bypass Jabber check."}, + {0x0001, " 100baseFx mode selected."}, + {0, 0}, +}; + +static void myson981(long ioaddr, int phy_id) +{ + int i, mii_reg17 = mii_val[17]; + + printf(" Myson mtd981 extra registers: %4.4x %4.4x %4.4x %4.4x.\n", + mii_val[16], mii_val[17], mii_val[18], mii_val[19]); + msg_if_set(mii_val[16] & 0xC800, tdk_reg16); + msg_if_set(mii_val[16], myson_reg16); + + if (mii_reg17 & 0x00ff) { + printf(" Events since last read:"); + for (i = 0; i < 8; i++) + if (mii_reg17 & (1 << i)) + printf(" %s", tdk_events[i]); + } else + printf(" No new link status events."); + if (mii_reg17 & 0xff00) { + printf("\n Events that will raise an interrupt:"); + for (i = 0; i < 8; i++) + if (mii_reg17 & (0x100 << i)) + printf(" %s", tdk_events[i]); + } + printf("\n"); + + return; +} + +/* These are much like the TDK events in reversed order. */ +static const struct msg_tbl via_reg17[] = { + {0x0001, "Auto-Negotiation complete"}, + {0x0002, "Remote fault detected"}, + {0x0004, "Link failure detected"}, + {0x0008, "Bad Start Stream detected"}, + {0x0010, "Parallel detection fault"}, + {0x0020, "Extended negotiation page received"}, + {0x0040, "5B/4B code error detected"}, + {0x0080, "Jabber detected"}, + {0, 0}, +}; + +static void via_tahoe(long ioaddr, int phy_id) +{ + int mii_reg16 = mii_val[16]; + int mii_reg17 = mii_val[17]; + int mii_reg18 = mii_val[18]; + + printf(" VIA Tahoe extended registers: 16 %4.4x #17 %4.4x #18 %4.4x.\n", + mii_reg16, mii_reg17, mii_reg18); + msg_if_set_fmt(mii_reg17, via_reg17, " %s\n"); + printf(" Link %s 10%s Mbps %s duplex\n", + mii_reg18 & 0x2000 ? "up" : "down", + mii_reg18 & 0x0400 ? "0" : "", + mii_reg18 & 0x0800 ? "full" : "half"); +} + +/* Information from + http://www.via.com.tw/en/datasheet/DS6103110.pdf +*/ + +static void via_vt6103(long ioaddr, int phy_id) +{ + printf(" VIA vt6103 error counts since the last check:\n" + " The link has failed %d times.\n" + " The receiver has lost lock %d times.\n" + " There have been %d false carrier/SQE error.\n", + mii_val[21], mii_val[22], mii_val[23]); +} + +/* Information from + http://www.via.com.tw/en/Networking/DS6105LOM100.pdf +*/ + +static void via_vt6105(long ioaddr, int phy_id) +{ + printf(" VIA vt6105 PHY status:\n" + " Duplex %s speed %s\n", + mii_val[20] & 0x0001 ? "full" : "half", + mii_val[20] & 0x0002 ? "100" : "10"); +} + +/* Information from + http://www.via.com.tw/en/Networking/DS6105LOM100.pdf +*/ +static void intel(long ioaddr, int phy_id) +{ + printf(" Intel 8255* PHY #%d extended management registers:\n" + " Error counts, cleared when read:\n" + " False carriers %d\n" + " Link disconnects %d\n" + " Receive errors %d\n" + " Rx symbol errors %d.\n" + " Rx 10Mbps Early End-Of-Frame errors %d.\n" + " Rx 100Mbps Early End-Of-Frame errors %d.\n" + " Tx jabber errors %d.\n", + mii_val[18], + mii_val[19], mii_val[20], mii_val[21], mii_val[22], mii_val[23], + mii_val[24], mii_val[25]); +} + + +/* + * Local variables: + * compile-command: "cc -O -Wall -c libmii.c" + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ diff --git a/packages/mii-diag/mii-diag-2.11/mii-diag.c b/packages/mii-diag/mii-diag-2.11/mii-diag.c new file mode 100644 index 0000000000..3c47e4a9b5 --- /dev/null +++ b/packages/mii-diag/mii-diag-2.11/mii-diag.c @@ -0,0 +1,648 @@ +/* Mode: C; + * mii-diag.c: Examine and set the MII registers of a network interfaces. + + Usage: mii-diag [-vw] interface. + + This program reads and writes the Media Independent Interface (MII) + management registers on network transceivers. The registers control + and report network link settings and errors. Examples are link speed, + duplex, capabilities advertised to the link partner, status LED + indications and link error counters. + + Notes: + The compile-command is at the end of this source file. + This program works with drivers that implement MII ioctl() calls. + + Written/copyright 1997-2003 by Donald Becker + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation. + + The author may be reached as becker@scyld.com, or C/O + Scyld Computing Corporation + 914 Bay Ridge Road, Suite 220 + Annapolis MD 21403 + + References + http://scyld.com/expert/mii-status.html + http://scyld.com/expert/NWay.html + http://www.national.com/pf/DP/DP83840.html +*/ + +static char version[] = +"mii-diag.c:v2.11 3/21/2005 Donald Becker (becker@scyld.com)\n" +" http://www.scyld.com/diag/index.html\n"; + +static const char usage_msg[] = +"Usage: %s [--help] [-aDfrRvVw] [-AF ] [--watch] .\n"; +static const char long_usage_msg[] = +"Usage: %s [-aDfrRvVw] [-AF ] [--watch] .\n" +"\n" +" This program configures and monitors the transceiver management registers\n" +" for network interfaces. It uses the Media Independent Interface (MII)\n" +" standard with additional Linux-specific controls to communicate with the\n" +" underlying device driver. The MII registers control and report network\n" +" link settings and errors. Examples are link speed, duplex, capabilities\n" +" advertised to the link partner, status LED indications and link error\n" +" counters.\n" +"\n" +" The common usage is\n" +" mii-diag eth0\n" +"\n" +" The default interface is \"eth0\".\n" +" Frequently used options are\n" +" -A --advertise \n" +" -F --fixed-speed \n" +" Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD,\n" +" 10baseT, 10baseT-FD, 10baseT-HD\n" +" -s --status Return exit status 2 if there is no link beat.\n" +"\n" +" Less frequently used options are\n" +" -a --all-interfaces Show the status all interfaces\n" +" (Not recommended with options that change settings.)\n" +" -D --debug\n" +" -g --read-parameters Get driver-specific parameters.\n" +" -G --set-parameters PARMS Set driver-specific parameters.\n" +" Parameters are comma separated, missing elements retain existing value.\n" +" -M --msg-level LEVEL Set the driver message bit map.\n" +" -p --phy ADDR Set the PHY (MII address) to report.\n" +" -r --restart Restart the link autonegotiation.\n" +" -R --reset Reset the transceiver.\n" +" -v --verbose Report each action taken.\n" +" -V --version Emit version information.\n" +" -w --watch Continuously monitor the transceiver and report changes.\n" +"\n" +" This command returns success (zero) if the interface information can be\n" +" read. If the --status option is passed, a zero return means that the\n" +" interface has link beat.\n"; + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef use_linux_libc5 +#include +#include +#endif + +typedef u_int32_t u32; +typedef u_int16_t u16; +typedef u_int8_t u8; + +#if defined(SIOCGPARAMS) && SIOCGPARAMS != SIOCDEVPRIVATE+3 +#error Changed definition for SIOCGPARAMS +#else +#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters. */ +#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters. */ +#endif + +const char shortopts[] = "aA:C:DfF:gG:hmM:p:rRsvVw?"; +struct option longopts[] = { + /* { name has_arg *flag val } */ + {"all-interfaces", 0, 0, 'a'}, /* Show all interfaces. */ + {"advertise", 1, 0, 'A'}, /* Change the capabilities advertised. */ + {"BMCR", 1, 0, 'C'}, /* Set the control register. */ + {"debug", 0, 0, 'D'}, /* Increase the debug level. */ + {"force", 0, 0, 'f'}, /* Force the operation. */ + {"fixed-speed", 1, 0, 'F'}, /* Fixed speed name. */ + {"read-parameters", 0, 0, 'g'}, /* Show general settings values. */ + {"set-parameters", 1, 0, 'G'}, /* Write general settings values. */ + {"help", 0, 0, 'h'}, /* Print a long usage message. */ + {"monitor", 0, 0, 'm'}, /* Monitor status register. */ + {"msg-level", 1, 0, 'M'}, /* Set the driver message level. */ + {"phy", 1, 0, 'p'}, /* Set the PHY (MII address) to report. */ + {"restart", 0, 0, 'r'}, /* Restart the link negotiation */ + {"reset", 0, 0, 'R'}, /* Reset the transceiver. */ + {"status", 0, 0, 's'}, /* Non-zero exit status w/ no link beat. */ + {"verbose", 0, 0, 'v'}, /* Report each action taken. */ + {"version", 0, 0, 'V'}, /* Emit version information. */ + {"watch", 0, 0, 'w'}, /* Constantly monitor the port. */ + {"error", 0, 0, '?'}, /* Return the error message. */ + { 0, 0, 0, 0 } +}; + +/* Usually in libmii.c, but trivial substitions are below. */ +extern int show_mii_details(long ioaddr, int phy_id); +extern void monitor_mii(long ioaddr, int phy_id); +int show_mii_details(long ioaddr, int phy_id) __attribute__((weak)); +void monitor_mii(long ioaddr, int phy_id) __attribute__((weak)); + + +/* Command-line flags. */ +unsigned int opt_a = 0, /* Show-all-interfaces flag. */ + opt_f = 0, /* Force the operation. */ + opt_g = 0, + opt_G = 0, + verbose = 0, /* Verbose flag. */ + debug = 0, + opt_version = 0, + opt_restart = 0, + opt_reset = 0, + opt_status = 0, + opt_watch = 0; +static int msg_level = -1; +static int set_BMCR = -1; +static int nway_advertise = 0; +static int fixed_speed = -1; +static int override_phy = -1; +char *opt_G_string = NULL; + +/* Internal values. */ +int new_ioctl_nums; +int skfd = -1; /* AF_INET socket for ioctl() calls. */ +struct ifreq ifr; + +int do_one_xcvr(int skfd); +int show_basic_mii(long ioaddr, int phy_id); +int mdio_read(int skfd, int phy_id, int location); +void mdio_write(int skfd, int phy_id, int location, int value); +static int parse_advertise(const char *capabilities); +static void monitor_status(long ioaddr, int phy_id); + + +int +main(int argc, char **argv) +{ + int c, errflag = 0; + char **spp, *ifname; + char *progname = rindex(argv[0], '/') ? rindex(argv[0], '/')+1 : argv[0]; + + while ((c = getopt_long(argc, argv, shortopts, longopts, 0)) != EOF) + switch (c) { + case 'a': opt_a++; break; + case 'A': nway_advertise |= parse_advertise(optarg); + if (nway_advertise == -1) errflag++; + break; + case 'C': set_BMCR = strtoul(optarg, NULL, 16); break; + case 'D': debug++; break; + case 'f': opt_f++; break; + case 'F': fixed_speed = parse_advertise(optarg); + if (fixed_speed == -1) errflag++; + break; + case 'g': opt_g++; break; + case 'G': opt_G++; opt_G_string = strdup(optarg); break; + case 'm': opt_watch++; opt_status++; break; + case 'M': msg_level = strtoul(optarg, NULL, 0); break; + case 'h': fprintf(stderr, long_usage_msg, progname); return 0; + case 'p': override_phy = atoi(optarg); break; + case 'r': opt_restart++; break; + case 'R': opt_reset++; break; + case 's': opt_status++; break; + case 'v': verbose++; break; + case 'V': opt_version++; break; + case 'w': opt_watch++; break; + case '?': errflag++; break; + } + if (errflag) { + fprintf(stderr, usage_msg, progname); + return 2; + } + + if (verbose || opt_version) + printf(version); + + /* Open a basic socket. */ + if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { + perror("socket"); + return 1; + } + + if (debug) + fprintf(stderr, "DEBUG: argc=%d, optind=%d and argv[optind] is %s.\n", + argc, optind, argv[optind]); + + /* No remaining args means show all interfaces. */ + if (optind == argc) { + ifname = "eth0"; + fprintf(stderr, "Using the default interface 'eth0'.\n"); + } else { + /* Copy the interface name. */ + spp = argv + optind; + ifname = *spp++; + } + + if (ifname == NULL) { + ifname = "eth0"; + fprintf(stderr, "Using the default interface 'eth0'.\n"); + } + + /* Verify that the interface supports the ioctl(), and if + it is using the new or old SIOCGMIIPHY value (grrr...). + */ + { + u16 *data = (u16 *)(&ifr.ifr_data); + + strncpy(ifr.ifr_name, ifname, IFNAMSIZ); + data[0] = 0; + + if (ioctl(skfd, 0x8947, &ifr) >= 0) { + new_ioctl_nums = 1; + } else if (ioctl(skfd, SIOCDEVPRIVATE, &ifr) >= 0) { + new_ioctl_nums = 0; + } else { + fprintf(stderr, "SIOCGMIIPHY on %s failed: %s\n", ifname, + strerror(errno)); + (void) close(skfd); + return 1; + } + if (verbose) + printf(" Using the %s SIOCGMIIPHY value on PHY %d " + "(BMCR 0x%4.4x).\n", + new_ioctl_nums ? "new" : "old", data[0], data[3]); + } + + do_one_xcvr(skfd); + + (void) close(skfd); + return 0; +} + +int do_one_xcvr(int skfd) +{ + u16 *data = (u16 *)(&ifr.ifr_data); + u32 *data32 = (u32 *)(&ifr.ifr_data); + unsigned phy_id = data[0]; + + if (override_phy >= 0) { + printf("Using the specified MII PHY index %d.\n", override_phy); + phy_id = override_phy; + } + + if (opt_g || opt_G || msg_level >= 0) { + if (ioctl(skfd, SIOCGPARAMS, &ifr) < 0) { + fprintf(stderr, "SIOCGPARAMS on %s failed: %s\n", ifr.ifr_name, + strerror(errno)); + return -1; + } + } + if (opt_g) { + int i; + printf("Driver general parameter settings:"); + for (i = 0; i*sizeof(u32) < sizeof(ifr.ifr_ifru); i++) { + printf(" %d", data32[i]); + } + printf(".\n"); + } + if (opt_G) { + /* Set up to four arbitrary driver parameters from the -G parameter. + The format is comma separated integers, with a missing element + retaining the previous value. + */ + char *str = opt_G_string; + int i; + for (i = 0; str && i < 4; i++) { + char *endstr; + u32 newval = strtol(str, &endstr, 0); + if (debug) + printf(" parse string '%s' value %d end '%s'.\n", + str, newval, endstr); + if (str == endstr) { + if (endstr[0] == ',') /* No parameter */ + str = endstr+1; + else { + fprintf(stderr, "Invalid driver parameter '%s'.\n", str); + str = index(str, ','); + } + } else if (endstr[0] == ',') { + data32[i] = newval; + str = endstr + 1; + } else if (endstr[0] == 0) { + data32[i] = newval; + break; + } + } + printf("Setting new driver general parameters:"); + for (i = 0; i*sizeof(u32) < sizeof(ifr.ifr_ifru); i++) { + printf(" %d", data32[i]); + } + printf(".\n"); + if (ioctl(skfd, SIOCSPARAMS, &ifr) < 0) { + fprintf(stderr, "SIOCSPARAMS on %s failed: %s\n", ifr.ifr_name, + strerror(errno)); + return -1; + } + } + if (msg_level >= 0) { + data32[0] = msg_level; + if (ioctl(skfd, SIOCSPARAMS, &ifr) < 0) { + fprintf(stderr, "SIOCSPARAMS on %s failed: %s\n", ifr.ifr_name, + strerror(errno)); + return -1; + } + } + + if (opt_reset) { + printf("Resetting the transceiver...\n"); + mdio_write(skfd, phy_id, 0, 0x8000); + } + /* Note: PHY addresses > 32 are pseudo-MII devices, usually built-in. */ + if (phy_id < 64 && nway_advertise > 0) { + printf(" Setting the media capability advertisement register of " + "PHY #%d to 0x%4.4x.\n", phy_id, nway_advertise | 1); + mdio_write(skfd, phy_id, 4, nway_advertise | 1); + mdio_write(skfd, phy_id, 0, 0x1000); + } + + if (opt_restart) { + printf("Restarting negotiation...\n"); + mdio_write(skfd, phy_id, 0, 0x0000); + mdio_write(skfd, phy_id, 0, 0x1200); + } + /* To force 100baseTx-HD do mdio_write(skfd, phy_id, 0, 0x2000); */ + if (fixed_speed >= 0) { + int reg0_val = 0; + if (fixed_speed & 0x0180) /* 100mpbs */ + reg0_val |= 0x2000; + if ((fixed_speed & 0x0140) && /* A full duplex type and */ + ! (fixed_speed & 0x0820)) /* no half duplex types. */ + reg0_val |= 0x0100; + printf("Setting the speed to \"fixed\", Control register %4.4x.\n", + reg0_val); + mdio_write(skfd, phy_id, 0, reg0_val); + } + if (set_BMCR >= 0) { + printf("Setting the Basic Mode Control Register to 0x%4.4x.\n", + set_BMCR); + mdio_write(skfd, phy_id, 0, set_BMCR); + } + + if (opt_watch && opt_status) + monitor_status(skfd, phy_id); + + show_basic_mii(skfd, phy_id); +#ifdef LIBMII + if (verbose) + show_mii_details(skfd, phy_id); +#else + if (verbose || debug) { + int mii_reg, mii_val; + printf(" MII PHY #%d transceiver registers:", phy_id); + for (mii_reg = 0; mii_reg < 32; mii_reg++) { + mii_val = mdio_read(skfd, phy_id, mii_reg); + printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n " : "", + mii_val); + } + printf("\n"); + } +#endif + + if (opt_watch) + monitor_mii(skfd, phy_id); + if (opt_status && + (mdio_read(skfd, phy_id, 1) & 0x0004) == 0) + exit(2); + return 0; +} + +int mdio_read(int skfd, int phy_id, int location) +{ + u16 *data = (u16 *)(&ifr.ifr_data); + + data[0] = phy_id; + data[1] = location; + + if (ioctl(skfd, new_ioctl_nums ? 0x8948 : SIOCDEVPRIVATE+1, &ifr) < 0) { + fprintf(stderr, "SIOCGMIIREG on %s failed: %s\n", ifr.ifr_name, + strerror(errno)); + return -1; + } + return data[3]; +} + +void mdio_write(int skfd, int phy_id, int location, int value) +{ + u16 *data = (u16 *)(&ifr.ifr_data); + + data[0] = phy_id; + data[1] = location; + data[2] = value; + + if (ioctl(skfd, new_ioctl_nums ? 0x8949 : SIOCDEVPRIVATE+2, &ifr) < 0) { + fprintf(stderr, "SIOCSMIIREG on %s failed: %s\n", ifr.ifr_name, + strerror(errno)); + } +} + +/* Parse the command line argument for advertised capabilities. */ +static int parse_advertise(const char *capabilities) +{ + const char *mtypes[] = { + "100baseT4", "100baseTx", "100baseTx-FD", "100baseTx-HD", + "10baseT", "10baseT-FD", "10baseT-HD", 0, + }; + char *endptr; + int cap_map[] = { 0x0200, 0x0180, 0x0100, 0x0080, 0x0060, 0x0040, 0x0020,}; + int i; + if ( ! capabilities) { + fprintf(stderr, "You passed -A 'NULL'. You must provide a media" + " list to advertise!\n"); + return -1; + } + if (debug) + fprintf(stderr, "Advertise string is '%s'.\n", capabilities); + for (i = 0; mtypes[i]; i++) + if (strcasecmp(mtypes[i], capabilities) == 0) + return cap_map[i]; + if ((i = strtol(capabilities, &endptr, 16)) <= 0xffff && endptr[0] == 0) + return i; + fprintf(stderr, "Invalid media advertisement value '%s'.\n" + " Either pass a numeric value or one of the following names:\n", + capabilities); + for (i = 0; mtypes[i]; i++) + fprintf(stderr, " %-14s %3.3x\n", mtypes[i], cap_map[i]); + return -1; +} + +/* Trivial versions if we don't link against libmii.c */ +static const char *media_names[] = { + "10baseT", "10baseT-FD", "100baseTx", "100baseTx-FD", "100baseT4", + "Flow-control", 0, +}; +/* Various non-good bits in the command register. */ +static const char *bmcr_bits[] = { + " Internal Collision-Test enabled!\n", "", /* 0x0080,0x0100 */ + " Restarted auto-negotiation in progress!\n", + " Transceiver isolated from the MII!\n", + " Transceiver powered down!\n", "", "", + " Transceiver in loopback mode!\n", + " Transceiver currently being reset!\n", +}; + +int show_basic_mii(long ioaddr, int phy_id) +{ + int mii_reg, i; + u16 mii_val[32]; + u16 bmcr, bmsr, new_bmsr, nway_advert, lkpar; + + for (mii_reg = 0; mii_reg < 8; mii_reg++) + mii_val[mii_reg] = mdio_read(ioaddr, phy_id, mii_reg); + if ( ! verbose) { + printf("Basic registers of MII PHY #%d: ", phy_id); + for (mii_reg = 0; mii_reg < 8; mii_reg++) + printf(" %4.4x", mii_val[mii_reg]); + printf(".\n"); + } + + if (mii_val[0] == 0xffff || mii_val[1] == 0x0000) { + printf(" No MII transceiver present!.\n"); + if (! opt_f) { + printf(" Use '--force' to view the information anyway.\n"); + return -1; + } + } + /* Descriptive rename. */ + bmcr = mii_val[0]; + bmsr = mii_val[1]; + nway_advert = mii_val[4]; + lkpar = mii_val[5]; + + if (lkpar & 0x4000) { + int negotiated = nway_advert & lkpar & 0x3e0; + int max_capability = 0; + /* Scan for the highest negotiated capability, highest priority + (100baseTx-FDX) to lowest (10baseT-HDX). */ + int media_priority[] = {8, 9, 7, 6, 5}; /* media_names[i-5] */ + printf(" The autonegotiated capability is %4.4x.\n", negotiated); + for (i = 0; media_priority[i]; i++) + if (negotiated & (1 << media_priority[i])) { + max_capability = media_priority[i]; + break; + } + if (max_capability) + printf("The autonegotiated media type is %s.\n", + media_names[max_capability - 5]); + else + printf("No common media type was autonegotiated!\n" + "This is extremely unusual and typically indicates a " + "configuration error.\n" "Perhaps the advertised " + "capability set was intentionally limited.\n"); + } + printf(" Basic mode control register 0x%4.4x:", bmcr); + if (bmcr & 0x1000) + printf(" Auto-negotiation enabled.\n"); + else + printf(" Auto-negotiation disabled, with\n" + " Speed fixed at 10%s mbps, %s-duplex.\n", + bmcr & 0x2000 ? "0" : "", + bmcr & 0x0100 ? "full":"half"); + for (i = 0; i < 9; i++) + if (bmcr & (0x0080<= 11; i--) + if (bmsr & (1<"); + printf(".\n"); + printf(" %s to perform Auto-negotiation, negotiation %scomplete.\n", + bmsr & 0x0008 ? "Able" : "Unable", + bmsr & 0x0020 ? "" : "not "); + } + + if (bmsr & 0x0010) + printf(" Remote fault detected!\n"); + if (bmsr & 0x0002) + printf(" *** Link Jabber! ***\n"); + + if (lkpar & 0x4000) { + printf(" Your link partner advertised %4.4x:", + lkpar); + for (i = 5; i >= 0; i--) + if (lkpar & (0x20< Date: Thu, 28 Sep 2006 14:36:34 +0000 Subject: ixp4xx-kernel: SVN Revision bump * now includes patches allowing LE ethernet functionality --- packages/linux/ixp4xx-kernel_2.6.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index 0933a3c914..a5f2ff5b8c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "427" +IXP4XX_KERNEL_SVN_REV = "435" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the -- cgit v1.2.3 From 1decdb826d58ca77eedf9516b4b250b03d398afc Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 15:41:26 +0000 Subject: slugos-init: Further improvements to module loading --- packages/slugos-init/files/boot/disk | 2 +- .../slugos-init/files/initscripts/loadmodules.sh | 11 +++---- packages/slugos-init/files/modulefunctions | 37 ++++++++++++++++++++++ packages/slugos-init/slugos-init_0.10.bb | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 packages/slugos-init/files/modulefunctions diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index d0b093c602..dca1e422aa 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -26,7 +26,7 @@ then # # load USB & SCSI storage modules (/proc required!) echo "boot: loading modules required for boot" - loadusbmods + loaddiskmods # # Mount read-write because before exec'ing init # If a UUID is given (in the environment) this diff --git a/packages/slugos-init/files/initscripts/loadmodules.sh b/packages/slugos-init/files/initscripts/loadmodules.sh index 1bc540a148..e80f995598 100644 --- a/packages/slugos-init/files/initscripts/loadmodules.sh +++ b/packages/slugos-init/files/initscripts/loadmodules.sh @@ -1,18 +1,15 @@ #!/bin/sh # This script is used for loading modules required by SlugOS -# Currently, this script only supports the NSLU2 +# This script may not be necessary if udev is present, but is included +# for 'backup' purposes in case udev is playing silly buggers -. /etc/default/functions # Load $(machine) function required -. /etc/default/modulefunctions +. /etc/default/modulefunctions # Load module loading logic -echo "Loading networking modules" loadnetmods -echo "Loading usb storage modules" -loadusbmods +loaddiskmods -echo "Loading other modules" loadmiscmods exit 0 diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions new file mode 100644 index 0000000000..c6719d4f79 --- /dev/null +++ b/packages/slugos-init/files/modulefunctions @@ -0,0 +1,37 @@ +#!/bin/sh +# . this file to load the functions for automatically loading modules + +. /etc/default/functions + +loaddiskmods(){ + modprobe scsi_mod + modprobe sd_mod + modprobe usbcore + case "$(machine)" in + nslu2) + modprobe ehci-hcd + modprobe ohci-hcd + ;; + nas100d) + modprobe ehci-hcd + modprobe uhci-hcd + ;; + + esac + modprobe usb-storage +} + +loadnetmods(){ + modprobe af_packet + case "$(machine)" in + ixdp425|nslu2|nas100d) + modprobe ixp4xx_mac + ;; + esac +} + +loadmiscmods(){ + modprobe ixp4xx_rng + modprobe i2c_dev +} + diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 66e2ae5712..d6ce0b5f65 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r68" +PR = "r69" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 07d63ec4d25f444630a2077e805df488b0d58772 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 16:15:16 +0000 Subject: udev: Enable udev-100 on SlugOS --- packages/udev/udev_100.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index fe24573b8d..6c40299a08 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -1,4 +1,5 @@ DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_slugos = "1" DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ -- cgit v1.2.3 From 0846c33022e583c178c20cf328a7c53fa7f881ab Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Thu, 28 Sep 2006 16:17:03 +0000 Subject: slugos: Revert to using udev (mdev functions, but turnup breaks) --- packages/images/slugos-image.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 08866600b3..34ca424821 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r35" +PR = "r36" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -65,7 +65,7 @@ EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}" # udev is the default way of handling devices, there is no guarantee # that the static device table is completely correct (it is just # known to be sufficient for boot.) -SLUGOS_SUPPORT ?= "diffutils cpio findutils mdev" +SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" # kernel-module-af-packet must be in the image for DHCP to work # kernel-module-netconsole is here because it is small and is -- cgit v1.2.3