Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 2f76d8f3a7
Branches Tags
openwrt-archive
/
target
/
linux
/
brcm47xx
/
patches-4.1
/
210-b44_phy_fix.patch

210-b44_phy_fix.patch 1.4 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 
  1. --- a/drivers/net/ethernet/broadcom/b44.c
    2. 

  2. +++ b/drivers/net/ethernet/broadcom/b44.c
    3. 

  3. @@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru
    4. 

  4.  error:
    5. 

  5.  	pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
    6. 

  6.  }
    7. 

  7. +
    8. 

  8. +static void b44_bcm47xx_workarounds(struct b44 *bp)
    9. 

  9. +{
    10. 

  10. +	char buf[20];
    11. 

  11. +	struct ssb_device *sdev = bp->sdev;
    12. 

  12. +
    13. 

  13. +	/* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
    14. 

  14. +	if (sdev->bus->sprom.board_num == 100) {
    15. 

  15. +		bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
    16. 

  16. +	} else {
    17. 

  17. +		/* WL-HDD */
    18. 

  18. +		if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
    19. 

  19. +		    !strncmp(buf, "WL300-", strlen("WL300-"))) {
    20. 

  20. +			if (sdev->bus->sprom.et0phyaddr == 0 &&
    21. 

  21. +			    sdev->bus->sprom.et1phyaddr == 1)
    22. 

  22. +				bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
    23. 

  23. +		}
    24. 

  24. +	}
    25. 

  25. +	return;
    26. 

  26. +}
    27. 

  27.  #else
    28. 

  28.  static inline void b44_wap54g10_workaround(struct b44 *bp)
    29. 

  29.  {
    30. 

  30.  }
    31. 

  31. +
    32. 

  32. +static inline void b44_bcm47xx_workarounds(struct b44 *bp)
    33. 

  33. +{
    34. 

  34. +}
    35. 

  35.  #endif
    36. 

  36.  
    37. 

  37.  static int b44_setup_phy(struct b44 *bp)
    38. 

  38. @@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp)
    39. 

  39.  	int err;
    40. 

  40.  
    41. 

  41.  	b44_wap54g10_workaround(bp);
    42. 

  42. +	b44_bcm47xx_workarounds(bp);
    43. 

  43.  
    44. 

  44.  	if (bp->flags & B44_FLAG_EXTERNAL_PHY)
    45. 

  45.  		return 0;
    46. 

  46. @@ -2170,6 +2195,8 @@ static int b44_get_invariants(struct b44
    47. 

  47.  	 * valid PHY address. */
    48. 

  48.  	bp->phy_addr &= 0x1F;
    49. 

  49.  
    50. 

  50. +	b44_bcm47xx_workarounds(bp);
    51. 

  51. +
    52. 

  52.  	memcpy(bp->dev->dev_addr, addr, ETH_ALEN);
    53. 

  53.  
    54. 

  54.  	if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
    55.