[PATCH][4/4] b44: Add bcm47xx support

[Florian Schirmer <jolt@tuxbox.org>]

[-- Attachment #1: Type: text/plain, Size: 6957 bytes --]

Hi,

finally add bcm47xx support using the infrastructure created by the earlier patches.

Regards,
   Florian

Signed-off-by: Florian Schirmer <jolt@tuxbox.org>


--- linux/drivers/net/b44.c-old4 2004-08-29 17:24:23.000000000 +0200
+++ linux/drivers/net/b44.c 2004-08-29 18:48:45.000000000 +0200
@@ -1,7 +1,8 @@
-/* b44.c: Broadcom 4400 device driver.
+/* b44.c: Broadcom 4400/47xx device driver.
  *
  * Copyright (C) 2002 David S. Miller (davem@redhat.com)
- * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
+ * Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi)
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
  *
  * Distribute under GPL.
  */
@@ -75,7 +76,7 @@ static char version[] __devinitdata =
  DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("David S. Miller (davem@redhat.com)");
-MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
+MODULE_DESCRIPTION("Broadcom 4400/47xx 10/100 PCI ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_PARM(b44_debug, "i");
 MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
@@ -89,6 +90,8 @@ static struct pci_device_id b44_pci_tbl[
    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
  { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1,
    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4713,
+   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
  { } /* terminate list with empty entry */
 };
 
@@ -202,29 +205,14 @@ static void ssb_core_reset(struct b44 *b
  udelay(1);
 }
 
+static int b44_4713_instance;
+
 static int ssb_core_unit(struct b44 *bp)
 {
-#if 0
- u32 val = br32(B44_SBADMATCH0);
- u32 base;
-
- type = val & SBADMATCH0_TYPE_MASK;
- switch (type) {
- case 0:
-  base = val & SBADMATCH0_BS0_MASK;
-  break;
-
- case 1:
-  base = val & SBADMATCH0_BS1_MASK;
-  break;
-
- case 2:
- default:
-  base = val & SBADMATCH0_BS2_MASK;
-  break;
- };
-#endif
- return 0;
+ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
+  return b44_4713_instance++;
+ else
+  return 0;
 }
 
 static int ssb_is_core_up(struct b44 *bp)
@@ -233,6 +221,28 @@ static int ssb_is_core_up(struct b44 *bp
   == SBTMSLOW_CLOCK);
 }
 
+static void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)
+{
+ u32 val;
+
+ bw32(B44_CAM_CTRL, (CAM_CTRL_READ |
+       (index << CAM_CTRL_INDEX_SHIFT)));
+
+ b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1); 
+
+ val = br32(B44_CAM_DATA_LO);
+
+ data[2] = (val >> 24) & 0xFF;
+ data[3] = (val >> 16) & 0xFF;
+ data[4] = (val >> 8) & 0xFF;
+ data[5] = (val >> 0) & 0xFF;
+
+ val = br32(B44_CAM_DATA_HI);
+ 
+ data[0] = (val >> 8) & 0xFF;
+ data[1] = (val >> 0) & 0xFF;
+}
+
 static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
 {
  u32 val;
@@ -1110,6 +1120,8 @@ static void b44_clear_stats(struct b44 *
 /* bp->lock is held. */
 static void b44_chip_reset(struct b44 *bp)
 {
+ unsigned int sb_clock;
+
  if (ssb_is_core_up(bp)) {
   bw32(B44_RCV_LAZY, 0);
   bw32(B44_ENET_CTRL, ENET_CTRL_DISABLE);
@@ -1123,9 +1135,10 @@ static void b44_chip_reset(struct b44 *b
   bw32(B44_DMARX_CTRL, 0);
   bp->rx_prod = bp->rx_cons = 0;
  } else {
-  ssb_pci_setup(bp, (bp->core_unit == 0 ?
-       SBINTVEC_ENET0 :
-       SBINTVEC_ENET1));
+  if (bp->pdev->device != PCI_DEVICE_ID_BCM4713)
+   ssb_pci_setup(bp, (bp->core_unit == 0 ?
+        SBINTVEC_ENET0 :
+        SBINTVEC_ENET1));
  }
 
  ssb_core_reset(bp);
@@ -1133,8 +1146,14 @@ static void b44_chip_reset(struct b44 *b
  b44_clear_stats(bp);
 
  /* Make PHY accessible. */
+ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
+  sb_clock = 100000000; /* 100 MHz */
+ else
+  sb_clock = 62500000; /* 62.5 MHz */
+
  bw32(B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
-        (0x0d & MDIO_CTRL_MAXF_MASK)));
+        (((sb_clock + (B44_MDC_RATIO / 2)) / B44_MDC_RATIO)
+        & MDIO_CTRL_MAXF_MASK)));
  br32(B44_MDIO_CTRL);
 
  if (!(br32(B44_DEVCTRL) & DEVCTRL_IPP)) {
@@ -1654,19 +1673,41 @@ static int __devinit b44_get_invariants(
 {
  u8 eeprom[128];
  int err;
+ unsigned long flags;
 
- err = b44_read_eeprom(bp, &eeprom[0]);
- if (err)
-  goto out;
-
- bp->dev->dev_addr[0] = eeprom[79];
- bp->dev->dev_addr[1] = eeprom[78];
- bp->dev->dev_addr[2] = eeprom[81];
- bp->dev->dev_addr[3] = eeprom[80];
- bp->dev->dev_addr[4] = eeprom[83];
- bp->dev->dev_addr[5] = eeprom[82];
-
- bp->phy_addr = eeprom[90] & 0x1f;
+ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) {
+  /* 
+   * BCM47xx boards don't have a EEPROM. The MAC is stored in
+   * a NVRAM area somewhere in the flash memory. As we don't
+   * know the location and/or the format of the NVRAM area
+   * here, we simply rely on the bootloader to write the
+   * MAC into the CAM.
+   */
+  spin_lock_irqsave(&bp->lock, flags);
+  __b44_cam_read(bp, bp->dev->dev_addr, 0);
+  spin_unlock_irqrestore(&bp->lock, flags);
+
+  /* 
+   * BCM47xx boards don't have a PHY. Usually there is a switch
+   * chip with multiple PHYs connected to the PHY port.
+   */
+  bp->phy_addr = B44_PHY_ADDR_NO_PHY;
+  bp->dma_offset = 0;
+ } else {
+  err = b44_read_eeprom(bp, &eeprom[0]);
+  if (err)
+   return err;
+
+  bp->dev->dev_addr[0] = eeprom[79];
+  bp->dev->dev_addr[1] = eeprom[78];
+  bp->dev->dev_addr[2] = eeprom[81];
+  bp->dev->dev_addr[3] = eeprom[80];
+  bp->dev->dev_addr[4] = eeprom[83];
+  bp->dev->dev_addr[5] = eeprom[82];
+
+  bp->phy_addr = eeprom[90] & 0x1f;
+  bp->dma_offset = SB_PCI_DMA;
+ } 
 
  /* With this, plus the rx_header prepended to the data by the
   * hardware, we'll land the ethernet header on a 2-byte boundary.
@@ -1676,13 +1717,12 @@ static int __devinit b44_get_invariants(
  bp->imask = IMASK_DEF;
 
  bp->core_unit = ssb_core_unit(bp);
- bp->dma_offset = SB_PCI_DMA;
 
  /* XXX - really required? 
     bp->flags |= B44_FLAG_BUGGY_TXPTR;
          */
-out:
- return err;
+
+ return 0;
 }
 
 static int __devinit b44_init_one(struct pci_dev *pdev,
@@ -1811,7 +1851,8 @@ static int __devinit b44_init_one(struct
 
  pci_save_state(bp->pdev, bp->pci_cfg_state);
 
- printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
+ printk(KERN_INFO "%s: Broadcom %s 10/100BaseT Ethernet ", dev->name,
+  (pdev->device == PCI_DEVICE_ID_BCM4713) ? "47xx" : "4400");
  for (i = 0; i < 6; i++)
   printk("%2.2x%c", dev->dev_addr[i],
          i == 5 ? '\n' : ':');
--- linux/drivers/net/b44.h-old4 2004-08-29 17:24:53.000000000 +0200
+++ linux/drivers/net/b44.h 2004-08-29 18:42:56.000000000 +0200
@@ -363,6 +363,7 @@ struct ring_info {
 
 #define B44_MCAST_TABLE_SIZE 32
 #define B44_PHY_ADDR_NO_PHY 30
+#define B44_MDC_RATIO  5000000
 
 /* SW copy of device statistics, kept up to date by periodic timer
  * which probes HW values.  Must have same relative layout as HW


[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]