diff options
| author |   Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-31 15:02:05 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-31 16:51:17 -0400 |
| commit | 361918970b7426bba97a64678ef2b2679c37199b (patch) | |
| tree | 7c4e2b81348c211458c6623c891da2de32469251 /drivers/net/ethernet/cadence/macb.c | |
| parent | net/macb: add the user i/o to ethtool register dump (diff) | |
| download | linux-dev-361918970b7426bba97a64678ef2b2679c37199b.tar.xz linux-dev-361918970b7426bba97a64678ef2b2679c37199b.zip | |
net/macb: fix the peripheral version test
We currently need two checks of the peripheral version in MACB_MID register.
One of them got out of sync after modification by 8a013a9c71b2 (net: macb:
Include multi queue support for xilinx ZynqMP ethernet version).
Fix this in macb_configure_caps() so that xilinx ZynqMP will be considered
as a GEM flavor.
Fixes: 8a013a9c71b2 ("net: macb: Include multi queue support for xilinx ZynqMP
ethernet version")
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Cc: <stable@vger.kernel.org> #4.0 (if it doesn't make it for -final)
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index babe972a7c32..4412895cf4a8 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2139,7 +2139,7 @@ static void macb_configure_caps(struct macb *bp, const struct macb_config *dt_co if (dt_conf) bp->caps = dt_conf->caps; - if (MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2) + if (MACB_BFEXT(IDNUM, macb_readl(bp, MID)) >= 0x2) bp->caps |= MACB_CAPS_MACB_IS_GEM; if (macb_is_gem(bp)) { |