1 From 538e4563198cd3d1a8e74c47fee3e49dc93e4a95 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
3 Date: Wed, 26 Aug 2015 17:53:45 +0200
4 Subject: [PATCH] bgmac: support up to 3 cores (devices) on a bus
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Broadcom buses may have more than 1 Ethernet device. This is used e.g.
10 to have few interfaces connected to different switch ports. So far we
11 saw chipsets with only 2 devices (e.g. BCM4706) but recent ones have
12 up to 3 (e.g. Netgear R8000 uses 3rd interface for most of switch
13 traffic, lower interfaces are for some kind of offloading).
15 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
16 Signed-off-by: David S. Miller <davem@davemloft.net>
18 drivers/net/ethernet/broadcom/bgmac.c | 28 +++++++++++++++++++++++-----
19 1 file changed, 23 insertions(+), 5 deletions(-)
21 --- a/drivers/net/ethernet/broadcom/bgmac.c
22 +++ b/drivers/net/ethernet/broadcom/bgmac.c
23 @@ -1549,11 +1549,20 @@ static int bgmac_probe(struct bcma_devic
24 struct net_device *net_dev;
26 struct ssb_sprom *sprom = &core->bus->sprom;
27 - u8 *mac = core->core_unit ? sprom->et1mac : sprom->et0mac;
31 - /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */
32 - if (core->core_unit > 1) {
33 + switch (core->core_unit) {
35 + mac = sprom->et0mac;
38 + mac = sprom->et1mac;
41 + mac = sprom->et2mac;
44 pr_err("Unsupported core_unit %d\n", core->core_unit);
47 @@ -1588,8 +1597,17 @@ static int bgmac_probe(struct bcma_devic
49 bgmac->cmn = core->bus->drv_gmac_cmn.core;
51 - bgmac->phyaddr = core->core_unit ? sprom->et1phyaddr :
53 + switch (core->core_unit) {
55 + bgmac->phyaddr = sprom->et0phyaddr;
58 + bgmac->phyaddr = sprom->et1phyaddr;
61 + bgmac->phyaddr = sprom->et2phyaddr;
64 bgmac->phyaddr &= BGMAC_PHY_MASK;
65 if (bgmac->phyaddr == BGMAC_PHY_MASK) {
66 bgmac_err(bgmac, "No PHY found\n");