From: Fabio Estevam <festevam@gmail.com>
To: Peter.Chen@nxp.com
Cc: linux-usb@vger.kernel.org, andrew.smirnov@gmail.com,
l.stach@pengutronix.de, sebastian.reichel@collabora.co.uk,
shawnguo@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de,
Fabio Estevam <fabio.estevam@nxp.com>
Subject: USB: chipidea: Do not hang when CONFIG_USB_CHIPIDEA_ULPI is not selected
Date: Mon, 25 Jun 2018 11:06:19 -0300 [thread overview]
Message-ID: <1529935579-30845-1-git-send-email-festevam@gmail.com> (raw)
From: Fabio Estevam <fabio.estevam@nxp.com>
Since commit 03e6275ae381087bd8 ("usb: chipidea: Fix ULPI on imx51") the
kernel hangs on a imx51-babbage board, when using the ULPI interface with
the CONFIG_USB_CHIPIDEA_ULPI option unselected.
Instead of hanging the kernel, let's warn the user that
CONFIG_USB_CHIPIDEA_ULPI needs to be selected, propagate an error
and continue with booting the kernel.
The user can then react to the warning and select
CONFIG_USB_CHIPIDEA_ULPI as needed.
Fixes: 03e6275ae381087bd8 ("usb: chipidea: Fix ULPI on imx51")
Suggested-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/usb/chipidea/core.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 85fc6db..5ab9db1 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -608,6 +608,16 @@ static int ci_get_platdata(struct device *dev,
if (!platdata->phy_mode)
platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);
+ if (platdata->phy_mode == USBPHY_INTERFACE_MODE_ULPI) {
+ /*
+ * CONFIG_USB_CHIPIDEA_ULPI needs to be selected
+ * for proper usage of the ULPI mode
+ */
+ WARN_ONCE(!IS_ENABLED(CONFIG_USB_CHIPIDEA_ULPI),
+ "Select CONFIG_USB_CHIPIDEA_ULPI in order to use ULPI mode\n");
+ return -EINVAL;
+ }
+
if (!platdata->dr_mode)
platdata->dr_mode = usb_get_dr_mode(dev);
next reply other threads:[~2018-06-25 14:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 14:06 Fabio Estevam [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-25 14:10 USB: chipidea: Do not hang when CONFIG_USB_CHIPIDEA_ULPI is not selected Fabio Estevam
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=1529935579-30845-1-git-send-email-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=Peter.Chen@nxp.com \
--cc=andrew.smirnov@gmail.com \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-usb@vger.kernel.org \
--cc=sebastian.reichel@collabora.co.uk \
--cc=shawnguo@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).