X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..53a0966f40913d68d81521450b2a3836fabdc5ef:/target/linux/brcm-2.4/patches/008-b44_bcm47xx_support.patch diff --git a/target/linux/brcm-2.4/patches/008-b44_bcm47xx_support.patch b/target/linux/brcm-2.4/patches/008-b44_bcm47xx_support.patch index 35c80acd2..28d54e9b9 100644 --- a/target/linux/brcm-2.4/patches/008-b44_bcm47xx_support.patch +++ b/target/linux/brcm-2.4/patches/008-b44_bcm47xx_support.patch @@ -1,6 +1,5 @@ -diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c ---- linux.old/drivers/net/b44.c 2006-02-12 13:49:59.000000000 +0100 -+++ linux.dev/drivers/net/b44.c 2006-03-06 22:37:14.000000000 +0100 +--- a/drivers/net/b44.c ++++ b/drivers/net/b44.c @@ -1,7 +1,9 @@ /* b44.c: Broadcom 4400 device driver. * @@ -12,15 +11,13 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c * * Distribute under GPL. */ -@@ -25,6 +27,41 @@ +@@ -25,6 +27,39 @@ #include "b44.h" +#include +#include -+#include +#include -+#include +#include +#include +#include @@ -54,7 +51,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c #define DRV_MODULE_NAME "b44" #define PFX DRV_MODULE_NAME ": " #define DRV_MODULE_VERSION "0.93" -@@ -75,7 +112,7 @@ +@@ -75,7 +110,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)"); @@ -63,7 +60,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c MODULE_LICENSE("GPL"); MODULE_PARM(b44_debug, "i"); MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value"); -@@ -89,6 +126,8 @@ +@@ -89,6 +124,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 }, @@ -72,7 +69,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c { } /* terminate list with empty entry */ }; -@@ -113,11 +152,13 @@ +@@ -113,11 +150,13 @@ static int b44_wait_bit(struct b44 *bp, udelay(10); } if (i == timeout) { @@ -86,7 +83,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c return -ENODEV; } return 0; -@@ -236,6 +277,8 @@ +@@ -236,6 +275,8 @@ static void ssb_core_reset(struct b44 *b udelay(1); } @@ -95,7 +92,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c static int ssb_core_unit(struct b44 *bp) { #if 0 -@@ -258,6 +301,9 @@ +@@ -258,6 +299,9 @@ static int ssb_core_unit(struct b44 *bp) break; }; #endif @@ -105,7 +102,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c return 0; } -@@ -267,6 +313,28 @@ +@@ -267,6 +311,28 @@ static int ssb_is_core_up(struct b44 *bp == SBTMSLOW_CLOCK); } @@ -134,7 +131,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index) { u32 val; -@@ -287,7 +355,7 @@ +@@ -287,7 +353,7 @@ static void __b44_cam_write(struct b44 * static inline void __b44_disable_ints(struct b44 *bp) { @@ -143,7 +140,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c } static void b44_disable_ints(struct b44 *bp) -@@ -303,14 +371,14 @@ +@@ -303,14 +369,14 @@ static void b44_enable_ints(struct b44 * bw32(B44_IMASK, bp->imask); } @@ -160,7 +157,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c (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 +387,42 @@ +@@ -319,23 +385,42 @@ static int b44_readphy(struct b44 *bp, i return err; } @@ -205,7 +202,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c err = b44_writephy(bp, MII_BMCR, BMCR_RESET); if (err) return err; -@@ -406,6 +493,23 @@ +@@ -406,6 +491,23 @@ static int b44_setup_phy(struct b44 *bp) u32 val; int err; @@ -229,7 +226,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0) goto out; if ((err = b44_writephy(bp, B44_MII_ALEDCTRL, -@@ -498,6 +602,19 @@ +@@ -498,6 +600,19 @@ static void b44_check_phy(struct b44 *bp { u32 bmsr, aux; @@ -249,7 +246,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c if (!b44_readphy(bp, MII_BMSR, &bmsr) && !b44_readphy(bp, B44_MII_AUXCTRL, &aux) && (bmsr != 0xffff)) { -@@ -765,6 +882,25 @@ +@@ -765,6 +880,25 @@ static int b44_rx(struct b44 *bp, int bu return received; } @@ -275,7 +272,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c static int b44_poll(struct net_device *netdev, int *budget) { struct b44 *bp = netdev->priv; -@@ -772,13 +908,13 @@ +@@ -772,13 +906,13 @@ static int b44_poll(struct net_device *n spin_lock_irq(&bp->lock); @@ -291,7 +288,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c done = 1; if (bp->istat & ISTAT_RX) { int orig_budget = *budget; -@@ -796,24 +932,18 @@ +@@ -796,24 +930,18 @@ static int b44_poll(struct net_device *n done = 0; } @@ -320,7 +317,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs) { struct net_device *dev = dev_id; -@@ -832,6 +962,18 @@ +@@ -832,6 +960,18 @@ static irqreturn_t b44_interrupt(int irq */ istat &= imask; if (istat) { @@ -339,7 +336,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c handled = 1; if (netif_rx_schedule_prep(dev)) { /* NOTE: These writes are posted by the readback of -@@ -848,6 +990,7 @@ +@@ -848,6 +988,7 @@ static irqreturn_t b44_interrupt(int irq bw32(B44_ISTAT, istat); br32(B44_ISTAT); } @@ -347,7 +344,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c spin_unlock_irqrestore(&bp->lock, flags); return IRQ_RETVAL(handled); } -@@ -859,16 +1002,7 @@ +@@ -859,16 +1000,7 @@ static void b44_tx_timeout(struct net_de printk(KERN_ERR PFX "%s: transmit timed out, resetting\n", dev->name); @@ -365,7 +362,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c netif_wake_queue(dev); } -@@ -1092,6 +1226,8 @@ +@@ -1092,6 +1224,8 @@ static void b44_clear_stats(struct b44 * /* bp->lock is held. */ static void b44_chip_reset(struct b44 *bp) { @@ -374,7 +371,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c if (ssb_is_core_up(bp)) { bw32(B44_RCV_LAZY, 0); bw32(B44_ENET_CTRL, ENET_CTRL_DISABLE); -@@ -1105,9 +1241,10 @@ +@@ -1105,9 +1239,10 @@ static void b44_chip_reset(struct b44 *b bw32(B44_DMARX_CTRL, 0); bp->rx_prod = bp->rx_cons = 0; } else { @@ -388,7 +385,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c } ssb_core_reset(bp); -@@ -1115,6 +1252,11 @@ +@@ -1115,6 +1250,11 @@ static void b44_chip_reset(struct b44 *b b44_clear_stats(bp); /* Make PHY accessible. */ @@ -400,7 +397,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c bw32(B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE | (0x0d & MDIO_CTRL_MAXF_MASK))); br32(B44_MDIO_CTRL); -@@ -1215,6 +1357,8 @@ +@@ -1216,6 +1356,8 @@ static int b44_open(struct net_device *d struct b44 *bp = dev->priv; int err; @@ -409,7 +406,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c err = b44_alloc_consistent(bp); if (err) return err; -@@ -1235,9 +1379,10 @@ +@@ -1236,9 +1378,10 @@ static int b44_open(struct net_device *d bp->timer.expires = jiffies + HZ; bp->timer.data = (unsigned long) bp; bp->timer.function = b44_timer; @@ -421,7 +418,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c return 0; -@@ -1628,7 +1773,7 @@ +@@ -1638,7 +1781,7 @@ static int b44_ioctl(struct net_device * u32 mii_regval; spin_lock_irq(&bp->lock); @@ -430,7 +427,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c spin_unlock_irq(&bp->lock); data->val_out = mii_regval; -@@ -1641,7 +1786,7 @@ +@@ -1651,7 +1794,7 @@ static int b44_ioctl(struct net_device * return -EPERM; spin_lock_irq(&bp->lock); @@ -439,7 +436,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c spin_unlock_irq(&bp->lock); return err; -@@ -1668,21 +1813,52 @@ +@@ -1678,21 +1821,52 @@ static int b44_read_eeprom(struct b44 *b static int __devinit b44_get_invariants(struct b44 *bp) { u8 eeprom[128]; @@ -505,7 +502,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c /* 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 +1868,12 @@ +@@ -1702,13 +1876,12 @@ static int __devinit b44_get_invariants( bp->imask = IMASK_DEF; bp->core_unit = ssb_core_unit(bp); @@ -521,7 +518,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c } static int __devinit b44_init_one(struct pci_dev *pdev, -@@ -1710,6 +1885,10 @@ +@@ -1720,6 +1893,10 @@ static int __devinit b44_init_one(struct struct b44 *bp; int err, i; @@ -532,9 +529,9 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c if (b44_version_printed++ == 0) printk(KERN_INFO "%s", version); -@@ -1819,11 +1998,17 @@ - - pci_save_state(bp->pdev, bp->pci_cfg_state); +@@ -1834,11 +2011,17 @@ static int __devinit b44_init_one(struct + */ + b44_chip_reset(bp); - printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name); + printk(KERN_INFO "%s: Broadcom %s 10/100BaseT Ethernet ", dev->name, @@ -551,9 +548,8 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c 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-02-12 13:49:59.000000000 +0100 -+++ linux.dev/drivers/net/b44.h 2006-01-24 20:52:08.000000000 +0100 +--- a/drivers/net/b44.h ++++ b/drivers/net/b44.h @@ -229,8 +229,6 @@ #define SBIPSFLAG_IMASK4 0x3f000000 /* Which sbflags --> mips interrupt 4 */ #define SBIPSFLAG_ISHIFT4 24 @@ -563,7 +559,7 @@ diff -urN linux.old/drivers/net/b44.h linux.dev/drivers/net/b44.h #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 @@ +@@ -461,6 +459,8 @@ struct ring_info { }; #define B44_MCAST_TABLE_SIZE 32 @@ -572,10 +568,9 @@ diff -urN linux.old/drivers/net/b44.h linux.dev/drivers/net/b44.h /* 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-02-12 13:49:59.000000000 +0100 -+++ linux.dev/include/linux/pci_ids.h 2006-01-24 20:52:08.000000000 +0100 -@@ -1735,6 +1735,7 @@ +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -1765,6 +1765,7 @@ #define PCI_DEVICE_ID_TIGON3_5901_2 0x170e #define PCI_DEVICE_ID_BCM4401 0x4401 #define PCI_DEVICE_ID_BCM4401B0 0x4402