Get rid of the b44 'BUG! Timeout waiting for bit 80000000 of register 428 to clear...

more and more users are getting confused by this, and consider it a regression in brcm47xx,
because brcm-2.4 was not showing this message. It's not particularly interesting for debugging,
most of the time it only happens because of an unconnected port.

SVN-Revision: 22110

diff --git a/target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch
new file mode 100644 (file)
index 0000000..dbd46ae
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.32/211-b44_timeout_spam.patch
@@ -0,0 +1,17 @@
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
+@@ -189,11 +189,13 @@ static int b44_wait_bit(struct b44 *bp, 
+               udelay(10);
+       }
+       if (i == timeout) {
+-              printk(KERN_ERR PFX "%s: BUG!  Timeout waiting for bit %08x of register "
++#if 0
++              printk(KERN_DEBUG PFX "%s: BUG!  Timeout waiting for bit %08x of register "
+                      "%lx to %s.\n",
+                      bp->dev->name,
+                      bit, reg,
+                      (clear ? "clear" : "set"));
++#endif
+               return -ENODEV;
+       }
+       return 0;

diff --git a/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch b/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
index a9b2db586a2a74c12fabd4a77a0d07fa58f2d87b..2cfa824cc7e60c91cef59d219d8c1bd43e04390f 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c

-@@ -848,7 +848,7 @@ static int b44_rx(struct b44 *bp, int bu
+@@ -850,7 +850,7 @@ static int b44_rx(struct b44 *bp, int bu

                        struct sk_buff *copy_skb;
  
                        b44_recycle_rx(bp, cons, bp->rx_prod);
                        struct sk_buff *copy_skb;
  
                        b44_recycle_rx(bp, cons, bp->rx_prod);

diff --git a/target/linux/brcm47xx/patches-2.6.33/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.33/211-b44_timeout_spam.patch
new file mode 100644 (file)
index 0000000..dbd46ae
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.33/211-b44_timeout_spam.patch
@@ -0,0 +1,17 @@
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
+@@ -189,11 +189,13 @@ static int b44_wait_bit(struct b44 *bp, 
+               udelay(10);
+       }
+       if (i == timeout) {
+-              printk(KERN_ERR PFX "%s: BUG!  Timeout waiting for bit %08x of register "
++#if 0
++              printk(KERN_DEBUG PFX "%s: BUG!  Timeout waiting for bit %08x of register "
+                      "%lx to %s.\n",
+                      bp->dev->name,
+                      bit, reg,
+                      (clear ? "clear" : "set"));
++#endif
+               return -ENODEV;
+       }
+       return 0;

diff --git a/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch b/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch
index a9b2db586a2a74c12fabd4a77a0d07fa58f2d87b..2cfa824cc7e60c91cef59d219d8c1bd43e04390f 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/813-use_netdev_alloc_skb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c

-@@ -848,7 +848,7 @@ static int b44_rx(struct b44 *bp, int bu
+@@ -850,7 +850,7 @@ static int b44_rx(struct b44 *bp, int bu

                        struct sk_buff *copy_skb;
  
                        b44_recycle_rx(bp, cons, bp->rx_prod);
                        struct sk_buff *copy_skb;
  
                        b44_recycle_rx(bp, cons, bp->rx_prod);

diff --git a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
new file mode 100644 (file)
index 0000000..d5ade16
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
@@ -0,0 +1,16 @@
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
+@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp, 
+                       break;
+               udelay(10);
+       }
++#if 0
+       if (i == timeout) {
+               if (net_ratelimit())
+                       netdev_err(bp->dev, "BUG!  Timeout waiting for bit %08x of register %lx to %s\n",
+                                  bit, reg, clear ? "clear" : "set");
+-
++#endif
+               return -ENODEV;
+       }
+       return 0;

diff --git a/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch
new file mode 100644 (file)
index 0000000..d5ade16
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch
@@ -0,0 +1,16 @@
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
+@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp, 
+                       break;
+               udelay(10);
+       }
++#if 0
+       if (i == timeout) {
+               if (net_ratelimit())
+                       netdev_err(bp->dev, "BUG!  Timeout waiting for bit %08x of register %lx to %s\n",
+                                  bit, reg, clear ? "clear" : "set");
+-
++#endif
+               return -ENODEV;
+       }
+       return 0;