target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch

   1 From f5d5afc0b1402aae0f6a2350e43241603dbaff1e Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Wed, 13 May 2015 10:46:47 +0200
   4 Subject: [PATCH] bgmac: add support for the 3rd bus core (device)
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 So far we were supporting up to 2 cores but recent devices (e.g. Netgear
  10 R8000) may use 3rd as well. Lower ones (1st, 2nd) are usually used for
  11 some offloading then.
  12
  13 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  14 ---
  15  drivers/net/ethernet/broadcom/bgmac.c | 28 +++++++++++++++++++++++-----
  16  1 file changed, 23 insertions(+), 5 deletions(-)
  17
  18 --- a/drivers/net/ethernet/broadcom/bgmac.c
  19 +++ b/drivers/net/ethernet/broadcom/bgmac.c
  20 @@ -1561,11 +1561,20 @@ static int bgmac_probe(struct bcma_devic
  21         struct net_device *net_dev;
  22         struct bgmac *bgmac;
  23         struct ssb_sprom *sprom = &core->bus->sprom;
  24 -       u8 *mac = core->core_unit ? sprom->et1mac : sprom->et0mac;
  25 +       u8 *mac;
  26         int err;
  27
  28 -       /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */
  29 -       if (core->core_unit > 1) {
  30 +       switch (core->core_unit) {
  31 +       case 0:
  32 +               mac = sprom->et0mac;
  33 +               break;
  34 +       case 1:
  35 +               mac = sprom->et1mac;
  36 +               break;
  37 +       case 2:
  38 +               mac = sprom->et2mac;
  39 +               break;
  40 +       default:
  41                 pr_err("Unsupported core_unit %d\n", core->core_unit);
  42                 return -ENOTSUPP;
  43         }
  44 @@ -1600,8 +1609,17 @@ static int bgmac_probe(struct bcma_devic
  45         }
  46         bgmac->cmn = core->bus->drv_gmac_cmn.core;
  47
  48 -       bgmac->phyaddr = core->core_unit ? sprom->et1phyaddr :
  49 -                        sprom->et0phyaddr;
  50 +       switch (core->core_unit) {
  51 +       case 0:
  52 +               bgmac->phyaddr = sprom->et0phyaddr;
  53 +               break;
  54 +       case 1:
  55 +               bgmac->phyaddr = sprom->et1phyaddr;
  56 +               break;
  57 +       case 2:
  58 +               bgmac->phyaddr = sprom->et2phyaddr;
  59 +               break;
  60 +       }
  61         bgmac->phyaddr &= BGMAC_PHY_MASK;
  62         if (bgmac->phyaddr == BGMAC_PHY_MASK) {
  63                 bgmac_err(bgmac, "No PHY found\n");