123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263 |
- From f5d5afc0b1402aae0f6a2350e43241603dbaff1e Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- Date: Wed, 13 May 2015 10:46:47 +0200
- Subject: [PATCH] bgmac: add support for the 3rd bus core (device)
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- So far we were supporting up to 2 cores but recent devices (e.g. Netgear
- R8000) may use 3rd as well. Lower ones (1st, 2nd) are usually used for
- some offloading then.
- Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- ---
- drivers/net/ethernet/broadcom/bgmac.c | 28 +++++++++++++++++++++++-----
- 1 file changed, 23 insertions(+), 5 deletions(-)
- --- a/drivers/net/ethernet/broadcom/bgmac.c
- +++ b/drivers/net/ethernet/broadcom/bgmac.c
- @@ -1561,11 +1561,20 @@ static int bgmac_probe(struct bcma_devic
- struct net_device *net_dev;
- struct bgmac *bgmac;
- struct ssb_sprom *sprom = &core->bus->sprom;
- - u8 *mac = core->core_unit ? sprom->et1mac : sprom->et0mac;
- + u8 *mac;
- int err;
-
- - /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */
- - if (core->core_unit > 1) {
- + switch (core->core_unit) {
- + case 0:
- + mac = sprom->et0mac;
- + break;
- + case 1:
- + mac = sprom->et1mac;
- + break;
- + case 2:
- + mac = sprom->et2mac;
- + break;
- + default:
- pr_err("Unsupported core_unit %d\n", core->core_unit);
- return -ENOTSUPP;
- }
- @@ -1600,8 +1609,17 @@ static int bgmac_probe(struct bcma_devic
- }
- bgmac->cmn = core->bus->drv_gmac_cmn.core;
-
- - bgmac->phyaddr = core->core_unit ? sprom->et1phyaddr :
- - sprom->et0phyaddr;
- + switch (core->core_unit) {
- + case 0:
- + bgmac->phyaddr = sprom->et0phyaddr;
- + break;
- + case 1:
- + bgmac->phyaddr = sprom->et1phyaddr;
- + break;
- + case 2:
- + bgmac->phyaddr = sprom->et2phyaddr;
- + break;
- + }
- bgmac->phyaddr &= BGMAC_PHY_MASK;
- if (bgmac->phyaddr == BGMAC_PHY_MASK) {
- bgmac_err(bgmac, "No PHY found\n");
|