1 files changed, 92 insertions, 9 deletions

diff --git a/sys/dev/phy/et131x.c b/sys/dev/phy/et131x.c
index 52fac6c..f8a8ed5 100644
--- a/sys/dev/phy/et131x.c
+++ b/sys/dev/phy/et131x.c
@@ -43,6 +43,7 @@
 #include <dev/pci/pciregs.h>
 #include <dev/phy/et131xregs.h>
 #include <dev/timer.h>
+#include <net/if_var.h>
 
 #define VENDOR_ID 0x11C1 /* Agere */
 #define DEVICE_ID 0xED00
@@ -50,7 +51,16 @@
 #define pr_trace(fmt, ...) kprintf("et131x: " fmt, ##__VA_ARGS__)
 #define pr_error(...) pr_trace(__VA_ARGS__)
 
+/* Helpful constants */
+#define ETHERFRAME_LEN 1518         /* Length of ethernet frame */
+#define ETHER_FCS_LEN  4            /* Length of frame check seq */
+
+struct netcard {
+    struct et131x_iospace *io;
+};
+
 static struct pci_device *dev;
+static struct netcard g_card;
 static struct timer tmr;
 
 /*
@@ -59,8 +69,9 @@ static struct timer tmr;
  * @io: Register space
  */
 static void
-et131x_soft_reset(struct et131x_iospace *io)
+et131x_soft_reset(struct netcard *card)
 {
+    struct et131x_iospace *io = card->io;
     uint32_t tmp;
 
     tmp = (
@@ -99,8 +110,9 @@ et131x_soft_reset(struct et131x_iospace *io)
  * @v: Value to write
  */
 static int
-et131x_mii_write(struct et131x_iospace *io, uint8_t addr, uint8_t reg, uint16_t v)
+et131x_mii_write(struct netcard *card, uint8_t addr, uint8_t reg, uint16_t v)
 {
+    struct et131x_iospace *io = card->io;
     uint16_t mii_addr;
     uint32_t tmp, mgmt_addr_old;
     uint32_t mgmt_cmd_old;
@@ -169,25 +181,96 @@ et131x_init_pci(void)
  * @delay: Millisecond delay between blinks
  */
 static void
-et131x_blink(struct et131x_iospace *io, uint32_t count, uint16_t delay)
+et131x_blink(struct netcard *card, uint32_t count, uint16_t delay)
 {
     uint16_t on_val;
 
     on_val =  (LED_ON << LED_LINK_SHIFT);
     on_val |= (LED_ON << LED_TXRX_SHIFT);
     for (uint32_t i = 0; i < count; ++i) {
-        et131x_mii_write(io, 0, PHY_LED2, on_val);
+        et131x_mii_write(card, 0, PHY_LED2, on_val);
         tmr.msleep(delay);
-        et131x_mii_write(io, 0, PHY_LED2, LED_ALL_OFF);
+        et131x_mii_write(card, 0, PHY_LED2, LED_ALL_OFF);
         tmr.msleep(delay);
     }
 }
 
+/*
+ * Initialize the MAC into a functional
+ * state.
+ *
+ * @io: Register space.
+ */
+static void
+et131x_mac_init(struct netcard *card)
+{
+    struct et131x_iospace *io = card->io;
+    struct mac_regs *mac = &io->mac;
+    struct netif_addr addr;
+    uint32_t ipg_tmp, tmp;
+
+    /*
+     * Okay so we need to reset the card so it doesn't
+     * do undefined bullshit. God forbid we get undefined
+     * behaviour without having a fucking official datasheet.
+     * Most would end themselves right then and there.
+     *
+     * Now, after we've done that, we must ensure that any
+     * packets larger than ETHERFRAME_LEN are truncated by
+     * the MAC. Again, something like an internal buffer
+     * overrun during TX/RX would be quite fucking horrible.
+     *
+     * We also want to clear the MAC interface control and MII
+     * clock to ensure it is in a known state.
+     */
+    et131x_soft_reset(card);
+    mmio_write32(&mac->max_fm_len, ETHERFRAME_LEN);
+    mmio_write32(&mac->if_ctrl, 0);
+    mmio_write32(&mac->mii_mgmt_cfg, MAC_MIIMGMT_CLK_RST);
+
+    /*
+     * Set up half duplex config
+     *
+     * - BEB trunc      (0xA)
+     * - Excess defer
+     * - Re-transmit    (0xF)
+     * - Collision window
+     */
+    mmio_write32(&mac->hfdp, 0x00A1F037);
+
+    /*
+     * Setup the MAC interpacket gap register
+     *
+     * - IPG1 (0x38)
+     * - IPG2 (0x58)
+     * - B2B  (0x60)
+     */
+    ipg_tmp = ((0x50 << 8) | 0x38005860);
+    mmio_write32(&mac->ipg, ipg_tmp);
+
+    /* MAC address dword 0 */
+    tmp = pci_readl(dev, PCI_MAC_ADDRESS);
+    addr.data[0] = tmp & 0xFF;
+    addr.data[1] = (tmp >> 8) & 0xFF;
+    addr.data[2] = (tmp >> 16) & 0xFF;
+    addr.data[3] = (tmp >> 24) & 0xFF;
+
+    /* MAC address word 1 */
+    tmp = pci_readl(dev, PCI_MAC_ADDRESS + 4);
+    addr.data[4] = tmp & 0xFF;
+    addr.data[5] = (tmp >> 8) & 0xFF;
+
+    /* Print out the MAC address */
+    pr_trace("MAC address: %x:%x:%x:%x:%x:%x\n",
+        (uint64_t)addr.data[0], (uint64_t)addr.data[1],
+        (uint64_t)addr.data[2], (uint64_t)addr.data[3],
+        (uint64_t)addr.data[4], (uint64_t)addr.data[5]);
+}
+
 static int
 et131x_init(void)
 {
     struct pci_lookup lookup;
-    struct et131x_iospace *bar;
     int error;
 
     lookup.vendor_id = VENDOR_ID;
@@ -213,13 +296,13 @@ et131x_init(void)
         return -ENODEV;
     }
 
-    if ((error = pci_map_bar(dev, 0, (void *)&bar)) != 0) {
+    if ((error = pci_map_bar(dev, 0, (void *)&g_card.io)) != 0) {
         return error;
     }
 
     et131x_init_pci();
-    et131x_soft_reset(bar);
-    et131x_blink(bar, 4, 150);
+    et131x_mac_init(&g_card);
+    et131x_blink(&g_card, 4, 150);
     return 0;
 }