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>
Subject: [PATCH v2 2/8] net/macb: add comment in macb_probe_queues
Date: Tue, 31 Mar 2015 15:02:00 +0200 [thread overview]
Message-ID: <1427806926-18887-3-git-send-email-nicolas.ferre@atmel.com> (raw)
In-Reply-To: <1427806926-18887-1-git-send-email-nicolas.ferre@atmel.com>
As we access the MID register directly, we need to tell why
we don't use the macb_is_gem() dedicated function.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Changes in v2: None
drivers/net/ethernet/cadence/macb.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index ac1f18142f7e..68d59b3900b1 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2161,9 +2161,13 @@ static void macb_probe_queues(void __iomem *mem,
*queue_mask = 0x1;
*num_queues = 1;
- /* is it macb or gem ? */
+ /* is it macb or gem ?
+ *
+ * We need to read directly from the hardware here because
+ * we are early in the probe process and don't have the
+ * MACB_CAPS_MACB_IS_GEM flag positioned
+ */
mid = readl_relaxed(mem + MACB_MID);
-
if (MACB_BFEXT(IDNUM, mid) < 0x2)
return;
--
2.1.3
next prev 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 ` Nicolas Ferre [this message]
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 ` [PATCH v2 7/8] net/macb: fix the peripheral version test Nicolas Ferre
2015-03-31 15:08 ` 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-3-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 \
/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).