Commit 36191897 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by David S. Miller

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 8a013a9c (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: 8a013a9c ("net: macb: Include multi queue support for xilinx ZynqMP
ethernet version")
Signed-off-by: default avatarNicolas 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c39994f
...@@ -2139,7 +2139,7 @@ static void macb_configure_caps(struct macb *bp, const struct macb_config *dt_co ...@@ -2139,7 +2139,7 @@ static void macb_configure_caps(struct macb *bp, const struct macb_config *dt_co
if (dt_conf) if (dt_conf)
bp->caps = dt_conf->caps; 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; bp->caps |= MACB_CAPS_MACB_IS_GEM;
if (macb_is_gem(bp)) { if (macb_is_gem(bp)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment