netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: <linux-arm-kernel@lists.infradead.org>, <netdev@vger.kernel.org>,
	"David S. Miller" <davem@davemloft.net>
Cc: <linux-kernel@vger.kernel.org>,
	Boris BREZILLON <boris.brezillon@free-electrons.com>,
	Cyrille Pitchen <cyrille.pitchen@atmel.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	<michal.simek@xilinx.com>, <punnaia@xilinx.com>,
	Nicolas Ferre <nicolas.ferre@atmel.com>, <stable@vger.kernel.org>
Subject: [PATCH v2 7/8] net/macb: fix the peripheral version test
Date: Tue, 31 Mar 2015 15:02:05 +0200	[thread overview]
Message-ID: <1427806926-18887-8-git-send-email-nicolas.ferre@atmel.com> (raw)
In-Reply-To: <1427806926-18887-1-git-send-email-nicolas.ferre@atmel.com>

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)
---

Changes in v2:
- fix peripheral version test

 drivers/net/ethernet/cadence/macb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)) {
-- 
2.1.3

  parent reply	other threads:[~2015-03-31 13:02 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-31 13:01 [PATCH v2 0/8] net/macb: fixes after big driver update Nicolas Ferre
2015-03-31 13:01 ` [PATCH v2 1/8] net/macb: only probe queues once and use stored values Nicolas Ferre
2015-03-31 13:02 ` [PATCH v2 2/8] net/macb: add comment in macb_probe_queues Nicolas Ferre
2015-03-31 13:02 ` [PATCH v2 3/8] net/macb: fix capabilities configuration Nicolas Ferre
2015-03-31 13:02 ` [PATCH v2 4/8] net/macb: trivial: correct wording for caps Nicolas Ferre
2015-03-31 13:02 ` [PATCH v2 5/8] net/macb: fix probe sequence to setup clocks earlier Nicolas Ferre
2015-03-31 13:02 ` [PATCH v2 6/8] net/macb: add the user i/o to ethtool register dump Nicolas Ferre
2015-03-31 13:02 ` Nicolas Ferre [this message]
2015-03-31 15:08   ` [PATCH v2 7/8] net/macb: fix the peripheral version test Punnaiah Choudary Kalluri
2015-03-31 13:02 ` [PATCH v2 8/8] net/macb: unify peripheral version testing Nicolas Ferre
2015-03-31 14:58   ` Punnaiah Choudary Kalluri
2015-03-31 20:52 ` [PATCH v2 0/8] net/macb: fixes after big driver update David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427806926-18887-8-git-send-email-nicolas.ferre@atmel.com \
    --to=nicolas.ferre@atmel.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=cyrille.pitchen@atmel.com \
    --cc=davem@davemloft.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michal.simek@xilinx.com \
    --cc=netdev@vger.kernel.org \
    --cc=punnaia@xilinx.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).