From patchwork Fri Sep 2 14:09:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 9311065 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3A494607D2 for ; Fri, 2 Sep 2016 14:11:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B66A297B2 for ; Fri, 2 Sep 2016 14:11:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FB7A297B7; Fri, 2 Sep 2016 14:11:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1575297B2 for ; Fri, 2 Sep 2016 14:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753440AbcIBOKw (ORCPT ); Fri, 2 Sep 2016 10:10:52 -0400 Received: from mga02.intel.com ([134.134.136.20]:64466 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752007AbcIBOKv (ORCPT ); Fri, 2 Sep 2016 10:10:51 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 02 Sep 2016 07:09:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,271,1470726000"; d="scan'208";a="1034728694" Received: from kuha.fi.intel.com ([10.237.72.189]) by fmsmga001.fm.intel.com with SMTP; 02 Sep 2016 07:09:23 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Fri, 02 Sep 2016 17:09:22 +0300 Date: Fri, 2 Sep 2016 17:09:22 +0300 From: Heikki Krogerus To: Stephen Boyd Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman , devicetree@vger.kernel.org, Rob Herring Subject: Re: [PATCH v3 03/22] usb: ulpi: Support device discovery via device properties Message-ID: <20160902140922.GC21737@kuha.fi.intel.com> References: <20160901004036.23936-1-stephen.boyd@linaro.org> <20160901004036.23936-4-stephen.boyd@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160901004036.23936-4-stephen.boyd@linaro.org> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: Cheers, 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)