diff --git a/kernel/branches/net/drivers/bus/mii.inc b/kernel/branches/net/drivers/bus/mii.inc new file mode 100644 index 0000000000..543d923d9f --- /dev/null +++ b/kernel/branches/net/drivers/bus/mii.inc @@ -0,0 +1,162 @@ +; Generic MII registers. + + MII_BMCR = 0x00 ; Basic mode control register + MII_BMSR = 0x01 ; Basic mode status register + MII_PHYSID1 = 0x02 ; PHYS ID 1 + MII_PHYSID2 = 0x03 ; PHYS ID 2 + MII_ADVERTISE = 0x04 ; Advertisement control reg + MII_LPA = 0x05 ; Link partner ability reg + MII_EXPANSION = 0x06 ; Expansion register + MII_CTRL1000 = 0x09 ; 1000BASE-T control + MII_STAT1000 = 0x0a ; 1000BASE-T status + MII_ESTATUS = 0x0f ; Extended Status + MII_DCOUNTER = 0x12 ; Disconnect counter + MII_FCSCOUNTER = 0x13 ; False carrier counter + MII_NWAYTEST = 0x14 ; N-way auto-neg test reg + MII_RERRCOUNTER = 0x15 ; Receive error counter + MII_SREVISION = 0x16 ; Silicon revision + MII_RESV1 = 0x17 ; Reserved... + MII_LBRERROR = 0x18 ; Lpback, rx, bypass error + MII_PHYADDR = 0x19 ; PHY address + MII_RESV2 = 0x1a ; Reserved... + MII_TPISTATUS = 0x1b ; TPI status for 10mbps + MII_NCONFIG = 0x1c ; Network interface config + +; Basic mode control register. + + BMCR_RESV = 0x003f ; Unused... + BMCR_SPEED1000 = 0x0040 ; MSB of Speed (1000) + BMCR_CTST = 0x0080 ; Collision test + BMCR_FULLDPLX = 0x0100 ; Full duplex + BMCR_ANRESTART = 0x0200 ; Auto negotiation restart + BMCR_ISOLATE = 0x0400 ; Disconnect DP83840 from MII + BMCR_PDOWN = 0x0800 ; Powerdown the DP83840 + BMCR_ANENABLE = 0x1000 ; Enable auto negotiation + BMCR_SPEED100 = 0x2000 ; Select 100Mbps + BMCR_LOOPBACK = 0x4000 ; TXD loopback bits + BMCR_RESET = 0x8000 ; Reset the DP83840 + +; Basic mode status register. + + BMSR_ERCAP = 0x0001 ; Ext-reg capability + BMSR_JCD = 0x0002 ; Jabber detected + BMSR_LSTATUS = 0x0004 ; Link status + BMSR_ANEGCAPABLE = 0x0008 ; Able to do auto-negotiation + BMSR_RFAULT = 0x0010 ; Remote fault detected + BMSR_ANEGCOMPLETE = 0x0020 ; Auto-negotiation complete + BMSR_RESV = 0x00c0 ; Unused... + BMSR_ESTATEN = 0x0100 ; Extended Status in R15 + BMSR_100HALF2 = 0x0200 ; Can do 100BASE-T2 HDX + BMSR_100FULL2 = 0x0400 ; Can do 100BASE-T2 FDX + BMSR_10HALF = 0x0800 ; Can do 10mbps, half-duplex + BMSR_10FULL = 0x1000 ; Can do 10mbps, full-duplex + BMSR_100HALF = 0x2000 ; Can do 100mbps, half-duplex + BMSR_100FULL = 0x4000 ; Can do 100mbps, full-duplex + BMSR_100BASE4 = 0x8000 ; Can do 100mbps, 4k packets + +; Advertisement control register. + + ADVERTISE_SLCT = 0x001f ; Selector bits + ADVERTISE_CSMA = 0x0001 ; Only selector supported + ADVERTISE_10HALF = 0x0020 ; Try for 10mbps half-duplex + ADVERTISE_1000XFULL = 0x0020 ; Try for 1000BASE-X full-duplex + ADVERTISE_10FULL = 0x0040 ; Try for 10mbps full-duplex + ADVERTISE_1000XHALF = 0x0040 ; Try for 1000BASE-X half-duplex + ADVERTISE_100HALF = 0x0080 ; Try for 100mbps half-duplex + ADVERTISE_1000XPAUSE = 0x0080 ; Try for 1000BASE-X pause + ADVERTISE_100FULL = 0x0100 ; Try for 100mbps full-duplex + ADVERTISE_1000XPSE_ASYM = 0x0100 ; Try for 1000BASE-X asym pause + ADVERTISE_100BASE4 = 0x0200 ; Try for 100mbps 4k packets + ADVERTISE_PAUSE_CAP = 0x0400 ; Try for pause + ADVERTISE_PAUSE_ASYM = 0x0800 ; Try for asymetric pause + ADVERTISE_RESV = 0x1000 ; Unused... + ADVERTISE_RFAULT = 0x2000 ; Say we can detect faults + ADVERTISE_LPACK = 0x4000 ; Ack link partners response + ADVERTISE_NPAGE = 0x8000 ; Next page bit + + ADVERTISE_FULL = (ADVERTISE_100FULL or ADVERTISE_10FULL or ADVERTISE_CSMA) + ADVERTISE_ALL = (ADVERTISE_10HALF or ADVERTISE_10FULL or ADVERTISE_100HALF or ADVERTISE_100FULL) + +; Link partner ability register. + + LPA_SLCT = 0x001f ; Same as advertise selector + LPA_10HALF = 0x0020 ; Can do 10mbps half-duplex + LPA_1000XFULL = 0x0020 ; Can do 1000BASE-X full-duplex + LPA_10FULL = 0x0040 ; Can do 10mbps full-duplex + LPA_1000XHALF = 0x0040 ; Can do 1000BASE-X half-duplex + LPA_100HALF = 0x0080 ; Can do 100mbps half-duplex + LPA_1000XPAUSE = 0x0080 ; Can do 1000BASE-X pause + LPA_100FULL = 0x0100 ; Can do 100mbps full-duplex + LPA_1000XPAUSE_ASYM = 0x0100 ; Can do 1000BASE-X pause asym + LPA_100BASE4 = 0x0200 ; Can do 100mbps 4k packets + LPA_PAUSE_CAP = 0x0400 ; Can pause + LPA_PAUSE_ASYM = 0x0800 ; Can pause asymetrically + LPA_RESV = 0x1000 ; Unused... + LPA_RFAULT = 0x2000 ; Link partner faulted + LPA_LPACK = 0x4000 ; Link partner acked us + LPA_NPAGE = 0x8000 ; Next page bit + + LPA_DUPLEX = (LPA_10FULL or LPA_100FULL) + LPA_100 = (LPA_100FULL or LPA_100HALF or LPA_100BASE4) + +; Expansion register for auto-negotiation. + + EXPANSION_NWAY = 0x0001 ; Can do N-way auto-nego + EXPANSION_LCWP = 0x0002 ; Got new RX page code word + EXPANSION_ENABLENPAGE = 0x0004 ; This enables npage words + EXPANSION_NPCAPABLE = 0x0008 ; Link partner supports npage + EXPANSION_MFAULTS = 0x0010 ; Multiple faults detected + EXPANSION_RESV = 0xffe0 ; Unused... + + ESTATUS_1000_TFULL = 0x2000 ; Can do 1000BT Full + ESTATUS_1000_THALF = 0x1000 ; Can do 1000BT Half + +; N-way test register. + + NWAYTEST_RESV1 = 0x00ff ; Unused... + NWAYTEST_LOOPBACK = 0x0100 ; Enable loopback for N-way + NWAYTEST_RESV2 = 0xfe00 ; Unused... + +; 1000BASE-T Control register + + ADVERTISE_1000FULL = 0x0200 ; Advertise 1000BASE-T full duplex + ADVERTISE_1000HALF = 0x0100 ; Advertise 1000BASE-T half duplex + +; 1000BASE-T Status register + + LPA_1000LOCALRXOK = 0x2000 ; Link partner local receiver status + LPA_1000REMRXOK = 0x1000 ; Link partner remote receiver status + LPA_1000FULL = 0x0800 ; Link partner 1000BASE-T full duplex + LPA_1000HALF = 0x0400 ; Link partner 1000BASE-T half duplex + +; Flow control flags + + FLOW_CTRL_TX = 0x01 + FLOW_CTRL_RX = 0x02 + + + +if defined mdio_read + +align 4 +mii_link_ok: + + DEBUGF 1, "mii_link_ok\n" + +; First do a dummy read to latch some MII phys + + mov ecx, MII_BMSR + call mdio_read + + mov ecx, MII_BMSR + call mdio_read + + DEBUGF 1, "eax=0x%x\n", eax + + and eax, BMSR_LSTATUS + + DEBUGF 1, "link status=0x%x\n", eax + + ret + +end if \ No newline at end of file diff --git a/kernel/branches/net/drivers/netdrv.inc b/kernel/branches/net/drivers/netdrv.inc index 5e08ab8039..e1b71a5871 100644 --- a/kernel/branches/net/drivers/netdrv.inc +++ b/kernel/branches/net/drivers/netdrv.inc @@ -9,6 +9,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; include 'bus/pci.inc' +include 'bus/mii.inc' ; Kernel variables diff --git a/kernel/branches/net/drivers/pcnet32.asm b/kernel/branches/net/drivers/pcnet32.asm index e60060a064..47fff6937e 100644 --- a/kernel/branches/net/drivers/pcnet32.asm +++ b/kernel/branches/net/drivers/pcnet32.asm @@ -277,6 +277,10 @@ public version TXCTL_MBO = 0x0000F000 TXCTL_BUFSZ = 0x00000FFF +; + + MAX_PHYS = 32 + virtual at ebx @@ -319,6 +323,8 @@ virtual at ebx .pci_bus dd ? .pci_dev dd ? + .phy dw ? + .read_csr dd ? .write_csr dd ? .read_bcr dd ? @@ -816,6 +822,57 @@ reset: mov dword [device.filter], -1 mov dword [device.filter+4], -1 + + +;----------------------------- + + test [device.mii], 1 + jz .no_mii + + mov [device.phy], 0 + + .mii_loop: + mov ecx, MII_PHYSID1 + call mdio_read + cmp ax, 0xffff + je .next + + DEBUGF 1, "0x%x\n", ax + + mov ecx, MII_PHYSID2 + call mdio_read + cmp ax, 0xffff + je .next + + DEBUGF 1, "0x%x\n", ax + + jmp .got_phy + + cmp [device.phy], 31 + jne .next + mov ax, [device.chip_version] + inc ax + and ax, 0xfffe + cmp ax, 0x2624 ; 79c971 & 79c972 have phantom phy at id 31 + je .got_phy + + .next: + inc [device.phy] + cmp [device.phy], MAX_PHYS + jb .mii_loop + + DEBUGF 1, "No PHY found!\n" + + or eax, -1 + ret + + .got_phy: + DEBUGF 1, "Found PHY at 0x%x\n", [device.phy]:4 + + .no_mii: + +;----------------------------------------------- + call read_mac lea esi, [device.mac] @@ -875,6 +932,8 @@ reset: ; get link status mov [device.state], ETH_LINK_UNKOWN + call check_media + DEBUGF 1,"reset complete\n" xor eax, eax ret @@ -1414,6 +1473,61 @@ dwio_reset: ret +align 4 +mdio_read: + + and ecx, 0x1f + mov ax, [device.phy] + and ax, 0x1f + shl ax, 5 + or ax, cx + + mov ecx, BCR_MIIADDR + call [device.write_bcr] + + mov ecx, BCR_MIIDATA + call [device.read_bcr] + + ret + + +align 4 +mdio_write: + + push eax + and ecx, 0x1f + mov ax, [device.phy] + and ax, 0x1f + shl ax, 5 + or ax, cx + + mov ecx, BCR_MIIADDR + call [device.write_bcr] + + pop eax + mov ecx, BCR_MIIDATA + call [device.write_bcr] + + ret + + +align 4 +check_media: + + DEBUGF 1, "check_media\n" + + test [device.mii], 1 + jnz mii_link_ok + + mov ecx, BCR_LED0 + call [device.read_bcr] + cmp eax, 0xc0 + + DEBUGF 1, "link status=0x%x\n", eax + + ret + + ; End of code