Ticket #2998: bfe440x.3.diff

src/libs/compat/freebsd_network/bus.c

@@ -108 +108 @@
     return 0;
 }
 
+int
+bus_alloc_mem_resource_adipe(device_t dev, struct resource *res, int regid)
+{
+    uint32 addr = pci_read_config(dev, regid, 4) & PCI_address_memory_32_mask;
+    uint32 size = 4 * 1024; /* XXX */
+    void *virtualAddr;
 
+    dprintf("bfe: bus_alloc_mem_resource_adipe\n");
+
+    res->r_mapped_area = map_mem(&virtualAddr, (void *)addr, size, 0,
+        "bus_alloc_resource(MEMORY)");
+    if (res->r_mapped_area < B_OK)
+        return -1;
+
+    res->r_bustag = I386_BUS_SPACE_MEM;
+    res->r_bushandle = (bus_space_handle_t)virtualAddr;
+    return 0;
+}
+
+
 static int
 bus_alloc_ioport_resource(device_t dev, struct resource *res, int regid)
 {

src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/if_bfe.c

@@ -430 +430 @@
     }
 }
 
+
+int bus_alloc_mem_resource_adipe(device_t dev, struct resource *res, int regid);
+
 static int
 bfe_attach(device_t dev)
 {
@@ -444 +447 @@
 
     sc->bfe_dev = dev;
 
+    {
+        int i=0;
+        char buf[1024]; unsigned bp=0;
+        while (bp < 1024 && i < 256)
+        {
+            if ((i & 0xf) == 0)
+                bp += snprintf(&buf[bp], 1024-bp, "(%02x)%08x:", i, pci_read_config(dev, i, 4));
+            else
+                bp += snprintf(&buf[bp], 1024-bp, "%08x:", pci_read_config(dev, i, 4));
+            i+=4;
+        }
+        dprintf("bfe: pci: %s\n", buf);
+    }
+
     /*
      * Map control/status registers.
      */
     pci_enable_busmaster(dev);
 
-    rid = PCIR_BAR(0);
-    sc->bfe_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
-            RF_ACTIVE);
+    rid = PCIR_BAR (0);
+    //sc->bfe_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+    //      RF_ACTIVE);
+    {
+        int result;
+        static struct resource BLERES;
+        sc->bfe_res = &BLERES;
+        result = bus_alloc_mem_resource_adipe(dev, sc->bfe_res, rid);
+        if (result < 0)
+            panic("ble");
+        sc->bfe_res->r_type = SYS_RES_MEMORY;
+    }
     if (sc->bfe_res == NULL) {
         device_printf(dev, "couldn't map memory\n");
         error = ENXIO;
         goto fail;
     }
 
+    dprintf("bfe: rman_get_bushandle(sc->bfe_res) 0x%x\n", rman_get_bushandle(sc->bfe_res));
+
     /* Allocate interrupt */
     rid = 0;
 
@@ -498 +526 @@
     ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN;
     IFQ_SET_READY(&ifp->if_snd);
 
+    {
+        char buf[1024]; unsigned bp=0;
+        int i=0;
+        while ( i < 256 && bp < 1024 )
+        {
+            unsigned v= CSR_READ_4(sc, i);
+            if ((i & 0xf) == 0)
+                bp += snprintf(&buf[bp], 1024-bp, "(%02x)%08x/", i, v);
+            else
+                bp += snprintf(&buf[bp], 1024-bp, "%08x/", v);
+            i += 4;
+        }
+
+        dprintf("bfe: attach: %s\n", buf);
+    }
+
     bfe_get_config(sc);
 
     /* Reset the chip and turn on the PHY */
@@ -854 +898 @@
     sc->bfe_enaddr[4] = eeprom[83];
     sc->bfe_enaddr[5] = eeprom[82];
 
-    sc->bfe_phyaddr = eeprom[90] & 0x1f;
+    //sc->bfe_phyaddr = eeprom[90] & 0x1f;
+    sc->bfe_phyaddr = 30;
     sc->bfe_mdc_port = (eeprom[90] >> 14) & 0x1;
 
     sc->bfe_core_unit = 0;
@@ -1161 +1206 @@
 bfe_read_eeprom(struct bfe_softc *sc, u_int8_t *data)
 {
     long i;
+    char buf[2048];
+    unsigned bp=0;
     u_int16_t *ptr = (u_int16_t *)data;
 
     for(i = 0; i < 128; i += 2)
+    {
+        unsigned v;
         ptr[i/2] = CSR_READ_4(sc, 4096 + i);
+        v= ptr[i/2];
+        if (bp < 2048 && (i & 0xf) == 0)
+            bp += snprintf(&buf[bp], 2048-bp, "(%02x)", i);
+        if (bp < 2048)
+            bp += snprintf(&buf[bp], 2048-bp, "%08x/", v);
+    }
+    dprintf("bfe: bfe_read_eeprom: %s\n", buf);
 }
 
 static int