linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: heikki.krogerus@linux.intel.com (Heikki Krogerus)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 03/22] usb: ulpi: Support device discovery via device properties
Date: Fri, 2 Sep 2016 17:09:22 +0300	[thread overview]
Message-ID: <20160902140922.GC21737@kuha.fi.intel.com> (raw)
In-Reply-To: <20160901004036.23936-4-stephen.boyd@linaro.org>

Hi,

On Wed, Aug 31, 2016 at 05:40:17PM -0700, Stephen Boyd wrote:
> @@ -174,14 +219,37 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
>  	ulpi->id.product = ulpi_read(ulpi, ULPI_PRODUCT_ID_LOW);
>  	ulpi->id.product |= ulpi_read(ulpi, ULPI_PRODUCT_ID_HIGH) << 8;
>  
> +	return 0;
> +}
> +
> +static int ulpi_register(struct device *dev, struct ulpi *ulpi)
> +{
> +	int ret;
> +
>  	ulpi->dev.parent = dev;
>  	ulpi->dev.bus = &ulpi_bus;
>  	ulpi->dev.type = &ulpi_dev_type;
>  	dev_set_name(&ulpi->dev, "%s.ulpi", dev_name(dev));
>  
> +	if (IS_ENABLED(CONFIG_OF)) {

I don't think you need to check that in this case.

> +		ret = ulpi_of_register(ulpi);
> +		if (ret)
> +			return ret;
> +	}
> +
>  	ACPI_COMPANION_SET(&ulpi->dev, ACPI_COMPANION(dev));

ACPI_COMPANION_SET will overwrite the primary fwnode unconditionally,
so just to play it safe, do this before you call ulpi_of_register().

> -	request_module("ulpi:v%04xp%04x", ulpi->id.vendor, ulpi->id.product);
> +	ret = ulpi_read_id(ulpi);
> +	/*
> +	 * Ignore failure in case of DT node because the device may
> +	 * not be powered up yet but we can still match by compatible
> +	 */
> +	if (ret && !ulpi->dev.of_node)
> +		return ret;
> +
> +	if (of_device_request_module(&ulpi->dev))
> +		request_module("ulpi:v%04xp%04x", ulpi->id.vendor,
> +			       ulpi->id.product);

I don't think this works in all cases. If of_device_request_module()
fails and we don't have the id.vendor/product set, we should not
register the device. It also looks a bit messy.

How about just using of_device_request_module() call as fallback in
ulpi_read_id() and moving also request_module() call there:

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 30ea770..667246c 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -205,14 +205,14 @@ static int ulpi_read_id(struct ulpi *ulpi)
        /* Test the interface */
        ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa);
        if (ret < 0)
-               return ret;
+               goto err;
 
        ret = ulpi_read(ulpi, ULPI_SCRATCH);
        if (ret < 0)
-               return ret;
+               goto err;
 
        if (ret != 0xaa)
-               return -ENODEV;
+               goto err;
 
        ulpi->id.vendor = ulpi_read(ulpi, ULPI_VENDOR_ID_LOW);
        ulpi->id.vendor |= ulpi_read(ulpi, ULPI_VENDOR_ID_HIGH) << 8;
@@ -220,7 +220,11 @@ static int ulpi_read_id(struct ulpi *ulpi)
        ulpi->id.product = ulpi_read(ulpi, ULPI_PRODUCT_ID_LOW);
        ulpi->id.product |= ulpi_read(ulpi, ULPI_PRODUCT_ID_HIGH) << 8;
 
+       request_module("ulpi:v%04xp%04x", ulpi->id.vendor, ulpi->id.product);
+
        return 0;
+err:
+       return of_device_request_module(&ulpi->dev);
 }
 
 static int ulpi_register(struct device *dev, struct ulpi *ulpi)
@@ -232,25 +236,15 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
        ulpi->dev.type = &ulpi_dev_type;
        dev_set_name(&ulpi->dev, "%s.ulpi", dev_name(dev));
 
-       if (IS_ENABLED(CONFIG_OF)) {
-               ret = ulpi_of_register(ulpi);
-               if (ret)
-                       return ret;
-       }
-
        ACPI_COMPANION_SET(&ulpi->dev, ACPI_COMPANION(dev));
 
-       ret = ulpi_read_id(ulpi);
-       /*
-        * Ignore failure in case of DT node because the device may
-        * not be powered up yet but we can still match by compatible
-        */
-       if (ret && !ulpi->dev.of_node)
+       ret = ulpi_of_register(ulpi);
+       if (ret)
                return ret;
 
-       if (of_device_request_module(&ulpi->dev))
-               request_module("ulpi:v%04xp%04x", ulpi->id.vendor,
-                              ulpi->id.product);
+       ret = ulpi_read_id(ulpi);
+       if (ret)
+               return ret;
 
        ret = device_register(&ulpi->dev);
        if (ret)


Cheers,

-- 
heikki

  reply	other threads:[~2016-09-02 14:09 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-01  0:40 [PATCH v3 00/22] Support qcom's HSIC USB and rewrite USB2 HS phy support Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 01/22] of: device: Support loading a module with OF based modalias Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 02/22] of: device: Export of_device_{get_modalias, uvent_modalias} to modules Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 03/22] usb: ulpi: Support device discovery via device properties Stephen Boyd
2016-09-02 14:09   ` Heikki Krogerus [this message]
2016-09-03  1:14     ` Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 04/22] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd
2016-09-02  2:43   ` Peter Chen
2016-09-01  0:40 ` [PATCH v3 05/22] usb: chipidea: Handle extcon events properly Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 06/22] usb: chipidea: Add platform flag for wrapper phy management Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 07/22] usb: chipidea: Notify events when switching host mode Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 08/22] usb: chipidea: Remove locking in ci_udc_start() Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 09/22] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd
2016-09-02  2:47   ` Peter Chen
2016-09-01  0:40 ` [PATCH v3 10/22] usb: chipidea: Consolidate extcon notifiers Stephen Boyd
2016-09-02  3:17   ` Peter Chen
2016-09-03  1:03     ` Stephen Boyd
2016-09-05  2:39       ` Peter Chen
2016-09-06 17:48         ` Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 11/22] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 12/22] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 13/22] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 14/22] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 15/22] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 16/22] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 17/22] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 18/22] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd
2016-09-02  3:33   ` Peter Chen
2016-09-01  0:40 ` [PATCH v3 19/22] usb: chipidea: msm: Handle phy power states Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 20/22] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd
2016-09-01  0:40 ` [PATCH v3 21/22] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd
2016-09-01  6:17   ` Vivek Gautam
2016-09-01 22:00     ` Stephen Boyd
2016-09-02 11:28       ` vivek.gautam at codeaurora.org
2016-09-01  0:40 ` [PATCH v3 22/22] phy: Add support for Qualcomm's USB HS phy Stephen Boyd

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=20160902140922.GC21737@kuha.fi.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=linux-arm-kernel@lists.infradead.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).