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 8a013a9 (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: 8a013a9 ("net: macb: Include multi queue support for xilinx ZynqMP ethernet version") Signed-off-by: Nicolas Ferre <[email protected]> Cc: Michal Simek <[email protected]> Cc: Punnaiah Choudary Kalluri <[email protected]> Cc: <[email protected]> #4.0 (if it doesn't make it for -final) Signed-off-by: David S. Miller <[email protected]>
libos-nuse · Mar 31, 2015 · 3619189 · 3619189
1 parent 7c39994
commit 3619189
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)) {