From: Daniel Hellstrom <daniel@gaisler.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, kristoffer@gaisler.com
Subject: [PATCH 03/10] GRETH: added no_gbit option
Date: Thu, 13 Jan 2011 09:25:28 +0100 [thread overview]
Message-ID: <1294907135-24884-3-git-send-email-daniel@gaisler.com> (raw)
In-Reply-To: <1294907135-24884-1-git-send-email-daniel@gaisler.com>
For debug only. The driver does not report that it is GBit capable, instead
it will report 10/100 mode to the generic PHY layer.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
drivers/net/greth.c | 15 +++++++++++++--
drivers/net/greth.h | 1 +
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 1b10186..ef8da22 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -66,6 +66,10 @@ static int greth_edcl = 1;
module_param(greth_edcl, int, 0);
MODULE_PARM_DESC(greth_edcl, "GRETH EDCL usage indicator. Set to 1 if EDCL is used.");
+static int no_gbit = 0;
+module_param(no_gbit, int, S_IRUGO);
+MODULE_PARM_DESC(no_gbit, "GRETH reports only 10/100 support to PHY layer if set to 1. Only affects GRETH GBit MAC, default 0 (off).");
+
static int greth_open(struct net_device *dev);
static netdev_tx_t greth_start_xmit(struct sk_buff *skb,
struct net_device *dev);
@@ -1284,7 +1288,7 @@ static int greth_mdio_probe(struct net_device *dev)
}
ret = phy_connect_direct(dev, phy, &greth_link_change,
- 0, greth->gbit_mac ?
+ 0, greth->gbit_phy_support ?
PHY_INTERFACE_MODE_GMII :
PHY_INTERFACE_MODE_MII);
if (ret) {
@@ -1293,7 +1297,7 @@ static int greth_mdio_probe(struct net_device *dev)
return ret;
}
- if (greth->gbit_mac)
+ if (greth->gbit_phy_support)
phy->supported &= PHY_GBIT_FEATURES;
else
phy->supported &= PHY_BASIC_FEATURES;
@@ -1447,6 +1451,13 @@ static int __devinit greth_of_probe(struct platform_device *ofdev, const struct
tmp = GRETH_REGLOAD(regs->control);
greth->gbit_mac = (tmp >> 27) & 1;
+ /* Let user skip GBit link mode by telling MDIO layer that MAC does
+ * not support GBIT (for debug) */
+ if (greth->gbit_mac && !no_gbit)
+ greth->gbit_phy_support = 1;
+ else
+ greth->gbit_phy_support = 0;
+
/* Check for multicast capability */
greth->multicast = (tmp >> 25) & 1;
diff --git a/drivers/net/greth.h b/drivers/net/greth.h
index 03ad903..9414169 100644
--- a/drivers/net/greth.h
+++ b/drivers/net/greth.h
@@ -138,6 +138,7 @@ struct greth_private {
u8 gbit_mac;
u8 mdio_int_en;
u8 edcl;
+ u8 gbit_phy_support;
};
#endif
--
1.5.4
next prev parent reply other threads:[~2011-01-13 9:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 8:25 [PATCH 01/10] GRETH: added raw AMBA vendor/device number to match against Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 02/10] GRETH: added option to disable a device node from bootloader Daniel Hellstrom
2011-01-14 6:12 ` David Miller
2011-01-14 7:45 ` Daniel Hellstrom
2011-01-13 8:25 ` Daniel Hellstrom [this message]
2011-01-14 6:13 ` [PATCH 03/10] GRETH: added no_gbit option David Miller
2011-01-14 7:51 ` Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 04/10] GRETH: added greth_compat_mode module parameter Daniel Hellstrom
2011-01-14 6:14 ` David Miller
2011-01-14 8:10 ` Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 05/10] GRETH: fix opening/closing Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 06/10] GRETH: GBit transmit descriptor handling optimization Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 07/10] GRETH: fixed skb buffer memory leak on frame errors Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 08/10] GRETH: avoid writing bad speed/duplex when setting transfer mode Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 09/10] GRETH: handle frame error interrupts Daniel Hellstrom
2011-01-13 8:25 ` [PATCH 10/10] GRETH: resolve SMP issues and other problems Daniel Hellstrom
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=1294907135-24884-3-git-send-email-daniel@gaisler.com \
--to=daniel@gaisler.com \
--cc=davem@davemloft.net \
--cc=kristoffer@gaisler.com \
--cc=netdev@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).