update brcm-2.4 b44 bcm47xx support patch, add fixes from #205
SVN-Revision: 2950
This commit is contained in:
Felix Fietkau
parent
8e5f578571
commit
7bd21f4514
2 changed files with 355 additions and 388 deletions
|
|
@ -1,17 +1,31 @@
|
||||||
--- linux-2.4.32.old/drivers/net/b44.c 2006-01-11 04:41:11.175458750 +0100
|
diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c
|
||||||
+++ linux-2.4.32/drivers/net/b44.c 2006-01-11 20:19:57.900822500 +0100
|
--- linux.old/drivers/net/b44.c 2006-01-12 17:27:45.920623500 +0100
|
||||||
@@ -3,6 +3,7 @@
|
+++ linux.dev/drivers/net/b44.c 2006-01-13 13:29:18.782391750 +0100
|
||||||
|
@@ -1,7 +1,9 @@
|
||||||
|
/* b44.c: Broadcom 4400 device driver.
|
||||||
|
*
|
||||||
* Copyright (C) 2002 David S. Miller (davem@redhat.com)
|
* Copyright (C) 2002 David S. Miller (davem@redhat.com)
|
||||||
* Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi)
|
- * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
|
||||||
* Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
+ * Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi)
|
||||||
|
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||||
+ * Copyright (C) 2006 Felix Fietkau (nbd@openwrt.org)
|
+ * Copyright (C) 2006 Felix Fietkau (nbd@openwrt.org)
|
||||||
*
|
*
|
||||||
* Distribute under GPL.
|
* Distribute under GPL.
|
||||||
*/
|
*/
|
||||||
@@ -36,6 +37,31 @@
|
@@ -25,6 +27,41 @@
|
||||||
#include <sbchipc.h>
|
|
||||||
#include <sflash.h>
|
|
||||||
|
|
||||||
|
#include "b44.h"
|
||||||
|
|
||||||
|
+#include <typedefs.h>
|
||||||
|
+#include <bcmdevs.h>
|
||||||
|
+#include <bcmutils.h>
|
||||||
|
+#include <osl.h>
|
||||||
|
+#include <bcmutils.h>
|
||||||
|
+#include <bcmnvram.h>
|
||||||
|
+#include <sbconfig.h>
|
||||||
|
+#include <sbchipc.h>
|
||||||
|
+#include <sflash.h>
|
||||||
|
+
|
||||||
+#ifdef CONFIG_BCM947XX
|
+#ifdef CONFIG_BCM947XX
|
||||||
+#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
|
+#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
|
||||||
+
|
+
|
||||||
|
|
@ -40,24 +54,248 @@
|
||||||
#define DRV_MODULE_NAME "b44"
|
#define DRV_MODULE_NAME "b44"
|
||||||
#define PFX DRV_MODULE_NAME ": "
|
#define PFX DRV_MODULE_NAME ": "
|
||||||
#define DRV_MODULE_VERSION "0.93"
|
#define DRV_MODULE_VERSION "0.93"
|
||||||
@@ -285,7 +311,7 @@
|
@@ -75,7 +112,7 @@
|
||||||
|
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 +126,8 @@
|
||||||
|
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 */
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -236,6 +275,8 @@
|
||||||
|
udelay(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int b44_4713_instance;
|
||||||
|
+
|
||||||
|
static int ssb_core_unit(struct b44 *bp)
|
||||||
|
{
|
||||||
|
#if 0
|
||||||
|
@@ -258,6 +299,9 @@
|
||||||
|
break;
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
+ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
|
||||||
|
+ return b44_4713_instance++;
|
||||||
|
+ else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -267,6 +311,28 @@
|
||||||
== SBTMSLOW_CLOCK);
|
== SBTMSLOW_CLOCK);
|
||||||
}
|
}
|
||||||
|
|
||||||
-static void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)
|
|
||||||
+static inline void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)
|
+static inline 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;
|
u32 val;
|
||||||
|
@@ -303,14 +369,14 @@
|
||||||
|
bw32(B44_IMASK, bp->imask);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1751,10 +1777,18 @@
|
-static int b44_readphy(struct b44 *bp, int reg, u32 *val)
|
||||||
|
+static int __b44_readphy(struct b44 *bp, int phy_addr, int reg, u32 *val)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
|
||||||
|
bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
|
||||||
|
(MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
|
||||||
|
- (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
|
||||||
|
+ (phy_addr << MDIO_DATA_PMD_SHIFT) |
|
||||||
|
(reg << MDIO_DATA_RA_SHIFT) |
|
||||||
|
(MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
|
||||||
|
err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
|
||||||
|
@@ -319,23 +385,42 @@
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int b44_writephy(struct b44 *bp, int reg, u32 val)
|
||||||
|
+static int b44_readphy(struct b44 *bp, int reg, u32 *val)
|
||||||
|
+{
|
||||||
|
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ return __b44_readphy(bp, bp->phy_addr, reg, val);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int __b44_writephy(struct b44 *bp, int phy_addr, int reg, u32 val)
|
||||||
|
{
|
||||||
|
bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
|
||||||
|
bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
|
||||||
|
(MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
|
||||||
|
- (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
|
||||||
|
+ (phy_addr << MDIO_DATA_PMD_SHIFT) |
|
||||||
|
(reg << MDIO_DATA_RA_SHIFT) |
|
||||||
|
(MDIO_TA_VALID << MDIO_DATA_TA_SHIFT) |
|
||||||
|
(val & MDIO_DATA_DATA)));
|
||||||
|
return b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int b44_writephy(struct b44 *bp, int reg, u32 val)
|
||||||
|
+{
|
||||||
|
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ return __b44_writephy(bp, bp->phy_addr, reg, val);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int b44_phy_reset(struct b44 *bp)
|
||||||
|
{
|
||||||
|
u32 val;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
@@ -405,6 +490,18 @@
|
||||||
|
{
|
||||||
|
u32 val;
|
||||||
|
int err;
|
||||||
|
+ char *s;
|
||||||
|
+
|
||||||
|
+ if ((s = nvram_get("boardnum")) && (s != NULL) && \
|
||||||
|
+ !strncmp(s, "2", 1) && \
|
||||||
|
+ (__b44_readphy(bp, 0, MII_BMCR, &val) != 0) && \
|
||||||
|
+ (val & BMCR_ISOLATE) && \
|
||||||
|
+ (__b44_writephy(bp, 0, MII_BMCR, val & ~BMCR_ISOLATE) != 0)) {
|
||||||
|
+ printk(KERN_WARNING PFX "PHY: cannot reset MII transceiver isolate bit.\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||||
|
+ return 0;
|
||||||
|
|
||||||
|
if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
|
||||||
|
goto out;
|
||||||
|
@@ -498,6 +595,19 @@
|
||||||
|
{
|
||||||
|
u32 bmsr, aux;
|
||||||
|
|
||||||
|
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
|
||||||
|
+ bp->flags |= B44_FLAG_100_BASE_T;
|
||||||
|
+ bp->flags |= B44_FLAG_FULL_DUPLEX;
|
||||||
|
+ if (!netif_carrier_ok(bp->dev)) {
|
||||||
|
+ u32 val = br32(B44_TX_CTRL);
|
||||||
|
+ val |= TX_CTRL_DUPLEX;
|
||||||
|
+ bw32(B44_TX_CTRL, val);
|
||||||
|
+ netif_carrier_on(bp->dev);
|
||||||
|
+ b44_link_report(bp);
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
|
||||||
|
!b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
|
||||||
|
(bmsr != 0xffff)) {
|
||||||
|
@@ -1092,6 +1202,8 @@
|
||||||
|
/* 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);
|
||||||
|
@@ -1105,9 +1217,10 @@
|
||||||
|
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);
|
||||||
|
@@ -1115,6 +1228,11 @@
|
||||||
|
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)));
|
||||||
|
br32(B44_MDIO_CTRL);
|
||||||
|
@@ -1628,7 +1746,7 @@
|
||||||
|
u32 mii_regval;
|
||||||
|
|
||||||
|
spin_lock_irq(&bp->lock);
|
||||||
|
- err = b44_readphy(bp, data->reg_num & 0x1f, &mii_regval);
|
||||||
|
+ err = __b44_readphy(bp, data->phy_id & 0x1f, data->reg_num & 0x1f, &mii_regval);
|
||||||
|
spin_unlock_irq(&bp->lock);
|
||||||
|
|
||||||
|
data->val_out = mii_regval;
|
||||||
|
@@ -1641,7 +1759,7 @@
|
||||||
|
return -EPERM;
|
||||||
|
|
||||||
|
spin_lock_irq(&bp->lock);
|
||||||
|
- err = b44_writephy(bp, data->reg_num & 0x1f, data->val_in);
|
||||||
|
+ err = __b44_writephy(bp, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in);
|
||||||
|
spin_unlock_irq(&bp->lock);
|
||||||
|
|
||||||
|
return err;
|
||||||
|
@@ -1668,21 +1786,52 @@
|
||||||
static int __devinit b44_get_invariants(struct b44 *bp)
|
static int __devinit b44_get_invariants(struct b44 *bp)
|
||||||
{
|
{
|
||||||
u8 eeprom[128];
|
u8 eeprom[128];
|
||||||
+ u8 buf[32];
|
+ u8 buf[32];
|
||||||
int err;
|
int err;
|
||||||
unsigned long flags;
|
+ unsigned long flags;
|
||||||
|
|
||||||
if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) {
|
- 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;
|
||||||
|
- bp->mdc_port = (eeprom[90] >> 14) & 0x1;
|
||||||
|
+ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) {
|
||||||
+#ifdef CONFIG_BCM947XX
|
+#ifdef CONFIG_BCM947XX
|
||||||
+ sprintf(buf, "et%dmacaddr", instance - 1);
|
+ sprintf(buf, "et%dmacaddr", instance - 1);
|
||||||
+ e_aton(nvram_get(buf), bp->dev->dev_addr);
|
+ e_aton(nvram_get(buf), bp->dev->dev_addr);
|
||||||
|
|
@ -65,18 +303,60 @@
|
||||||
+ sprintf(buf, "et%dphyaddr", instance - 1);
|
+ sprintf(buf, "et%dphyaddr", instance - 1);
|
||||||
+ bp->phy_addr = B44_PHY_ADDR_NO_PHY;
|
+ bp->phy_addr = B44_PHY_ADDR_NO_PHY;
|
||||||
+#else
|
+#else
|
||||||
/*
|
+ /*
|
||||||
* BCM47xx boards don't have a EEPROM. The MAC is stored in
|
+ * BCM47xx boards don't have a EEPROM. The MAC is stored in
|
||||||
* a NVRAM area somewhere in the flash memory. As we don't
|
+ * a NVRAM area somewhere in the flash memory. As we don't
|
||||||
@@ -1771,6 +1805,7 @@
|
+ * know the location and/or the format of the NVRAM area
|
||||||
* chip with multiple PHYs connected to the PHY port.
|
+ * here, we simply rely on the bootloader to write the
|
||||||
*/
|
+ * MAC into the CAM.
|
||||||
bp->phy_addr = B44_PHY_ADDR_NO_PHY;
|
+ */
|
||||||
|
+ 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;
|
||||||
+#endif
|
+#endif
|
||||||
bp->dma_offset = 0;
|
+ bp->dma_offset = 0;
|
||||||
} else {
|
+ } else {
|
||||||
err = b44_read_eeprom(bp, &eeprom[0]);
|
+ err = b44_read_eeprom(bp, &eeprom[0]);
|
||||||
@@ -1814,6 +1849,10 @@
|
+ 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;
|
||||||
|
+ bp->mdc_port = (eeprom[90] >> 14) & 0x1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* With this, plus the rx_header prepended to the data by the
|
||||||
|
* hardware, we'll land the ethernet header on a 2-byte boundary.
|
||||||
|
@@ -1692,13 +1841,12 @@
|
||||||
|
bp->imask = IMASK_DEF;
|
||||||
|
|
||||||
|
bp->core_unit = ssb_core_unit(bp);
|
||||||
|
- bp->dma_offset = ssb_get_addr(bp, SBID_PCI_DMA, 0);
|
||||||
|
|
||||||
|
/* XXX - really required?
|
||||||
|
bp->flags |= B44_FLAG_BUGGY_TXPTR;
|
||||||
|
*/
|
||||||
|
-out:
|
||||||
|
- return err;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __devinit b44_init_one(struct pci_dev *pdev,
|
||||||
|
@@ -1710,6 +1858,10 @@
|
||||||
struct b44 *bp;
|
struct b44 *bp;
|
||||||
int err, i;
|
int err, i;
|
||||||
|
|
||||||
|
|
@ -87,3 +367,54 @@
|
||||||
if (b44_version_printed++ == 0)
|
if (b44_version_printed++ == 0)
|
||||||
printk(KERN_INFO "%s", version);
|
printk(KERN_INFO "%s", version);
|
||||||
|
|
||||||
|
@@ -1819,11 +1971,17 @@
|
||||||
|
|
||||||
|
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' : ':');
|
||||||
|
|
||||||
|
+ /* Initialize phy */
|
||||||
|
+ spin_lock_irq(&bp->lock);
|
||||||
|
+ b44_chip_reset(bp);
|
||||||
|
+ spin_unlock_irq(&bp->lock);
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
err_out_iounmap:
|
||||||
|
diff -urN linux.old/drivers/net/b44.h linux.dev/drivers/net/b44.h
|
||||||
|
--- linux.old/drivers/net/b44.h 2006-01-12 17:26:13.234831000 +0100
|
||||||
|
+++ linux.dev/drivers/net/b44.h 2006-01-12 17:22:01.043070000 +0100
|
||||||
|
@@ -229,8 +229,6 @@
|
||||||
|
#define SBIPSFLAG_IMASK4 0x3f000000 /* Which sbflags --> mips interrupt 4 */
|
||||||
|
#define SBIPSFLAG_ISHIFT4 24
|
||||||
|
#define B44_SBTPSFLAG 0x0F18UL /* SB Target Port OCP Slave Flag */
|
||||||
|
-#define SBTPS_NUM0_MASK 0x0000003f
|
||||||
|
-#define SBTPS_F0EN0 0x00000040
|
||||||
|
#define B44_SBADMATCH3 0x0F60UL /* SB Address Match 3 */
|
||||||
|
#define B44_SBADMATCH2 0x0F68UL /* SB Address Match 2 */
|
||||||
|
#define B44_SBADMATCH1 0x0F70UL /* SB Address Match 1 */
|
||||||
|
@@ -461,6 +459,8 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
#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
|
||||||
|
diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
|
||||||
|
--- linux.old/include/linux/pci_ids.h 2006-01-12 17:26:13.250832000 +0100
|
||||||
|
+++ linux.dev/include/linux/pci_ids.h 2006-01-12 17:22:01.071071750 +0100
|
||||||
|
@@ -1735,6 +1735,7 @@
|
||||||
|
#define PCI_DEVICE_ID_TIGON3_5901_2 0x170e
|
||||||
|
#define PCI_DEVICE_ID_BCM4401 0x4401
|
||||||
|
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
||||||
|
+#define PCI_DEVICE_ID_BCM4713 0x4713
|
||||||
|
|
||||||
|
#define PCI_VENDOR_ID_ENE 0x1524
|
||||||
|
#define PCI_DEVICE_ID_ENE_1211 0x1211
|
||||||
|
|
|
||||||
|
|
@ -1,364 +0,0 @@
|
||||||
diff -Nur linux-2.4.30/drivers/net/b44.c linux-2.4.30-b44/drivers/net/b44.c
|
|
||||||
--- linux-2.4.30/drivers/net/b44.c 2004-08-08 01:26:05.000000000 +0200
|
|
||||||
+++ linux-2.4.30-b44/drivers/net/b44.c 2005-05-26 14:08:48.000000000 +0200
|
|
||||||
@@ -1,7 +1,8 @@
|
|
||||||
/* b44.c: Broadcom 4400 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.
|
|
||||||
*/
|
|
||||||
@@ -25,6 +26,16 @@
|
|
||||||
|
|
||||||
#include "b44.h"
|
|
||||||
|
|
||||||
+#include <typedefs.h>
|
|
||||||
+#include <bcmdevs.h>
|
|
||||||
+#include <bcmutils.h>
|
|
||||||
+#include <osl.h>
|
|
||||||
+#include <bcmutils.h>
|
|
||||||
+#include <bcmnvram.h>
|
|
||||||
+#include <sbconfig.h>
|
|
||||||
+#include <sbchipc.h>
|
|
||||||
+#include <sflash.h>
|
|
||||||
+
|
|
||||||
#define DRV_MODULE_NAME "b44"
|
|
||||||
#define PFX DRV_MODULE_NAME ": "
|
|
||||||
#define DRV_MODULE_VERSION "0.93"
|
|
||||||
@@ -75,7 +86,7 @@
|
|
||||||
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 +100,8 @@
|
|
||||||
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 */
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -236,6 +249,8 @@
|
|
||||||
udelay(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int b44_4713_instance;
|
|
||||||
+
|
|
||||||
static int ssb_core_unit(struct b44 *bp)
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
@@ -258,6 +273,9 @@
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
+ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
|
|
||||||
+ return b44_4713_instance++;
|
|
||||||
+ else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -267,6 +285,28 @@
|
|
||||||
== 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;
|
|
||||||
@@ -303,14 +343,14 @@
|
|
||||||
bw32(B44_IMASK, bp->imask);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int b44_readphy(struct b44 *bp, int reg, u32 *val)
|
|
||||||
+static int __b44_readphy(struct b44 *bp, int phy_addr, int reg, u32 *val)
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
|
|
||||||
bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
|
|
||||||
bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
|
|
||||||
(MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
|
|
||||||
- (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
|
|
||||||
+ (phy_addr << MDIO_DATA_PMD_SHIFT) |
|
|
||||||
(reg << MDIO_DATA_RA_SHIFT) |
|
|
||||||
(MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
|
|
||||||
err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
|
|
||||||
@@ -319,23 +359,42 @@
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int b44_writephy(struct b44 *bp, int reg, u32 val)
|
|
||||||
+static int b44_readphy(struct b44 *bp, int reg, u32 *val)
|
|
||||||
+{
|
|
||||||
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ return __b44_readphy(bp, bp->phy_addr, reg, val);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int __b44_writephy(struct b44 *bp, int phy_addr, int reg, u32 val)
|
|
||||||
{
|
|
||||||
bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
|
|
||||||
bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
|
|
||||||
(MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
|
|
||||||
- (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
|
|
||||||
+ (phy_addr << MDIO_DATA_PMD_SHIFT) |
|
|
||||||
(reg << MDIO_DATA_RA_SHIFT) |
|
|
||||||
(MDIO_TA_VALID << MDIO_DATA_TA_SHIFT) |
|
|
||||||
(val & MDIO_DATA_DATA)));
|
|
||||||
return b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int b44_writephy(struct b44 *bp, int reg, u32 val)
|
|
||||||
+{
|
|
||||||
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ return __b44_writephy(bp, bp->phy_addr, reg, val);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int b44_phy_reset(struct b44 *bp)
|
|
||||||
{
|
|
||||||
u32 val;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
@@ -406,6 +465,9 @@
|
|
||||||
u32 val;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
|
|
||||||
goto out;
|
|
||||||
if ((err = b44_writephy(bp, B44_MII_ALEDCTRL,
|
|
||||||
@@ -498,6 +560,19 @@
|
|
||||||
{
|
|
||||||
u32 bmsr, aux;
|
|
||||||
|
|
||||||
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
|
|
||||||
+ bp->flags |= B44_FLAG_100_BASE_T;
|
|
||||||
+ bp->flags |= B44_FLAG_FULL_DUPLEX;
|
|
||||||
+ if (!netif_carrier_ok(bp->dev)) {
|
|
||||||
+ u32 val = br32(B44_TX_CTRL);
|
|
||||||
+ val |= TX_CTRL_DUPLEX;
|
|
||||||
+ bw32(B44_TX_CTRL, val);
|
|
||||||
+ netif_carrier_on(bp->dev);
|
|
||||||
+ b44_link_report(bp);
|
|
||||||
+ }
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
|
|
||||||
!b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
|
|
||||||
(bmsr != 0xffff)) {
|
|
||||||
@@ -1092,6 +1167,8 @@
|
|
||||||
/* 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);
|
|
||||||
@@ -1105,9 +1182,10 @@
|
|
||||||
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);
|
|
||||||
@@ -1115,6 +1193,11 @@
|
|
||||||
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)));
|
|
||||||
br32(B44_MDIO_CTRL);
|
|
||||||
@@ -1628,7 +1711,7 @@
|
|
||||||
u32 mii_regval;
|
|
||||||
|
|
||||||
spin_lock_irq(&bp->lock);
|
|
||||||
- err = b44_readphy(bp, data->reg_num & 0x1f, &mii_regval);
|
|
||||||
+ err = __b44_readphy(bp, data->phy_id & 0x1f, data->reg_num & 0x1f, &mii_regval);
|
|
||||||
spin_unlock_irq(&bp->lock);
|
|
||||||
|
|
||||||
data->val_out = mii_regval;
|
|
||||||
@@ -1641,7 +1724,7 @@
|
|
||||||
return -EPERM;
|
|
||||||
|
|
||||||
spin_lock_irq(&bp->lock);
|
|
||||||
- err = b44_writephy(bp, data->reg_num & 0x1f, data->val_in);
|
|
||||||
+ err = __b44_writephy(bp, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in);
|
|
||||||
spin_unlock_irq(&bp->lock);
|
|
||||||
|
|
||||||
return err;
|
|
||||||
@@ -1669,20 +1752,42 @@
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
- bp->mdc_port = (eeprom[90] >> 14) & 0x1;
|
|
||||||
+ 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;
|
|
||||||
+ bp->mdc_port = (eeprom[90] >> 14) & 0x1;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* With this, plus the rx_header prepended to the data by the
|
|
||||||
* hardware, we'll land the ethernet header on a 2-byte boundary.
|
|
||||||
@@ -1692,13 +1797,12 @@
|
|
||||||
bp->imask = IMASK_DEF;
|
|
||||||
|
|
||||||
bp->core_unit = ssb_core_unit(bp);
|
|
||||||
- bp->dma_offset = ssb_get_addr(bp, SBID_PCI_DMA, 0);
|
|
||||||
|
|
||||||
/* XXX - really required?
|
|
||||||
bp->flags |= B44_FLAG_BUGGY_TXPTR;
|
|
||||||
*/
|
|
||||||
-out:
|
|
||||||
- return err;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __devinit b44_init_one(struct pci_dev *pdev,
|
|
||||||
@@ -1819,11 +1923,17 @@
|
|
||||||
|
|
||||||
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' : ':');
|
|
||||||
|
|
||||||
+ /* Initialize phy */
|
|
||||||
+ spin_lock_irq(&bp->lock);
|
|
||||||
+ b44_chip_reset(bp);
|
|
||||||
+ spin_unlock_irq(&bp->lock);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
err_out_iounmap:
|
|
||||||
diff -Nur linux-2.4.30/drivers/net/b44.h linux-2.4.30-b44/drivers/net/b44.h
|
|
||||||
--- linux-2.4.30/drivers/net/b44.h 2003-08-25 13:44:42.000000000 +0200
|
|
||||||
+++ linux-2.4.30-b44/drivers/net/b44.h 2005-05-26 16:45:10.000000000 +0200
|
|
||||||
@@ -229,8 +229,6 @@
|
|
||||||
#define SBIPSFLAG_IMASK4 0x3f000000 /* Which sbflags --> mips interrupt 4 */
|
|
||||||
#define SBIPSFLAG_ISHIFT4 24
|
|
||||||
#define B44_SBTPSFLAG 0x0F18UL /* SB Target Port OCP Slave Flag */
|
|
||||||
-#define SBTPS_NUM0_MASK 0x0000003f
|
|
||||||
-#define SBTPS_F0EN0 0x00000040
|
|
||||||
#define B44_SBADMATCH3 0x0F60UL /* SB Address Match 3 */
|
|
||||||
#define B44_SBADMATCH2 0x0F68UL /* SB Address Match 2 */
|
|
||||||
#define B44_SBADMATCH1 0x0F70UL /* SB Address Match 1 */
|
|
||||||
@@ -461,6 +459,8 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
#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
|
|
||||||
diff -Nur linux-2.4.30/include/linux/pci_ids.h linux-2.4.30-b44/include/linux/pci_ids.h
|
|
||||||
--- linux-2.4.30/include/linux/pci_ids.h 2005-04-04 03:42:20.000000000 +0200
|
|
||||||
+++ linux-2.4.30-b44/include/linux/pci_ids.h 2005-05-26 14:08:41.000000000 +0200
|
|
||||||
@@ -1735,6 +1735,7 @@
|
|
||||||
#define PCI_DEVICE_ID_TIGON3_5901_2 0x170e
|
|
||||||
#define PCI_DEVICE_ID_BCM4401 0x4401
|
|
||||||
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
|
||||||
+#define PCI_DEVICE_ID_BCM4713 0x4713
|
|
||||||
|
|
||||||
#define PCI_VENDOR_ID_ENE 0x1524
|
|
||||||
#define PCI_DEVICE_ID_ENE_1211 0x1211
|
|
||||||
Loading…
Reference in a new issue