From: Guenter Roeck <linux@roeck-us.net>
To: Steve Glendinning <steve.glendinning@shawell.net>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Guenter Roeck <linux@roeck-us.net>,
Jeremy Linton <jeremy.linton@arm.com>
Subject: [PATCH -next] smsc911x: Fix crash seen if neither ACPI nor OF is configured or used
Date: Mon, 17 Aug 2015 13:45:36 -0700 [thread overview]
Message-ID: <1439844336-21596-1-git-send-email-linux@roeck-us.net> (raw)
Commit 0b50dc4fc971 ("Convert smsc911x to use ACPI as well as DT") makes
the call to smsc911x_probe_config() unconditional, and no longer fails if
there is no device node. device_get_phy_mode() is called unconditionally,
and if there is no phy node configured returns an error code. This error
code is assigned to phy_interface, and interpreted elsewhere in the code
as valid phy mode. This in turn causes qemu to crash when running a
variant of realview_pb_defconfig.
qemu: hardware error: lan9118_read: Bad reg 0x86
Fixes: 0b50dc4fc971 ("Convert smsc911x to use ACPI as well as DT")
Cc: Jeremy Linton <jeremy.linton@arm.com>
Cc Graeme Gregory <graeme.gregory@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/net/ethernet/smsc/smsc911x.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 0f21aa3bb537..34f97684506b 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2367,12 +2367,17 @@ static const struct smsc911x_ops shifted_smsc911x_ops = {
static int smsc911x_probe_config(struct smsc911x_platform_config *config,
struct device *dev)
{
+ int phy_interface;
u32 width = 0;
if (!dev)
return -ENODEV;
- config->phy_interface = device_get_phy_mode(dev);
+ phy_interface = device_get_phy_mode(dev);
+ if (phy_interface < 0)
+ return phy_interface;
+
+ config->phy_interface = phy_interface;
device_get_mac_address(dev, config->mac, ETH_ALEN);
--
2.1.4
next reply other threads:[~2015-08-17 20:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 20:45 Guenter Roeck [this message]
2015-08-17 21:06 ` [PATCH -next] smsc911x: Fix crash seen if neither ACPI nor OF is configured or used David Miller
2015-08-17 21:19 ` Jeremy Linton
2015-08-17 22:14 ` Guenter Roeck
2015-08-17 22:35 ` Jeremy Linton
2015-08-26 17:04 ` Tony Lindgren
2015-08-26 17:31 ` Jeremy Linton
2015-08-26 17:48 ` Tony Lindgren
2015-08-26 17:36 ` Guenter Roeck
2015-08-26 17:57 ` Tony Lindgren
2015-08-26 18:34 ` Guenter Roeck
2015-08-26 20:16 ` Tony Lindgren
2015-08-26 20:55 ` Guenter Roeck
2015-08-26 21:40 ` Tony Lindgren
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=1439844336-21596-1-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jeremy.linton@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=steve.glendinning@shawell.net \
/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).