brcm47xx: b44: This updates the phylib patches to the version send upstream
[openwrt.git] / target / linux / brcm47xx / patches-3.10 / 203-b44-abort-when-no-PHY-is-available-at-all.patch
1 From 7befa6abe09c84269b8af614a166409090346cf8 Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Fri, 20 Dec 2013 02:16:08 +0100
4 Subject: [PATCH 203/208] b44: abort when no PHY is available at all
5
6 When the phy address is 31, this means that there is no PHY connected
7 to this MAC at all, no internal and no external PHY. Reading these PHY
8 registers causes a system reset on some routers.
9
10 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
11 Signed-off-by: David S. Miller <davem@davemloft.net>
12 ---
13  drivers/net/ethernet/broadcom/b44.c |    6 ++++++
14  drivers/net/ethernet/broadcom/b44.h |    1 +
15  2 files changed, 7 insertions(+)
16
17 --- a/drivers/net/ethernet/broadcom/b44.c
18 +++ b/drivers/net/ethernet/broadcom/b44.c
19 @@ -2207,6 +2207,12 @@ static int b44_init_one(struct ssb_devic
20                 goto err_out_powerdown;
21         }
22  
23 +       if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
24 +               dev_err(sdev->dev, "No PHY present on this MAC, aborting\n");
25 +               err = -ENODEV;
26 +               goto err_out_powerdown;
27 +       }
28 +
29         bp->mii_if.dev = dev;
30         bp->mii_if.mdio_read = b44_mii_read;
31         bp->mii_if.mdio_write = b44_mii_write;
32 --- a/drivers/net/ethernet/broadcom/b44.h
33 +++ b/drivers/net/ethernet/broadcom/b44.h
34 @@ -282,6 +282,7 @@ struct ring_info {
35  
36  #define B44_MCAST_TABLE_SIZE           32
37  #define B44_PHY_ADDR_NO_LOCAL_PHY      30 /* no local phy regs */
38 +#define B44_PHY_ADDR_NO_PHY            31 /* no phy present at all */
39  #define B44_MDC_RATIO                  5000000
40  
41  #define        B44_STAT_REG_DECLARE            \