From patchwork Tue Dec 3 22:33:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180765 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2170973ile; Tue, 3 Dec 2019 15:05:30 -0800 (PST) X-Google-Smtp-Source: APXvYqzH01o6ohbdmTMKz7ZkCzx0iyxSa+maeLDRb90kqXTs3Eba8X70djQ7I6uapkhKV4l4U54B X-Received: by 2002:a9d:5388:: with SMTP id w8mr251320otg.368.1575414330355; Tue, 03 Dec 2019 15:05:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414330; cv=none; d=google.com; s=arc-20160816; b=I6y60lorlg+kWqvSNkZcqcuVyESttQ0vk6cnozmbttgbAlKqfv/LcFrjU67/n2/LJr vRCcWZRCMUoQOEhahwIhFZXd2D9p42oFh1XrzhE3nIUZ/KsoGv1XXrKUJh/Cz/wmaMiY 5wqHkegLfbWL4bT5z66VR8d7u4jrlyerziNk34tvq5qA+Zp46QXTJe4KCgqU30y3gVHr XBtyvslWt9Y8wcyCAYKtknhLhd+vRnG/ef1z82BQWapgR5B8rGHcnpQlAnI7JeJSYpiE jpgRRSMH2OQ6DCfWd1T6SqY/FEFTMZPUwG0+gkdxu4Irw17CgUaiiOVDw9Xaro2vKDII G2og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vjMvLM+M4+ncS7sNu+b7al4QjfK/jf5Qc90em9tyGjo=; b=fajNlLRAga8K8rqjV8fR0PjWnQauMUPOeynlnO7FaGr4hl8JkVPI2H8qrnmv2qd0sA nkS82WhEZDG9JZbzwLOOSxfB082f/216ExiZShfmCkM3mDO8Ifhy9Woh6oPlNWMX0ZpO WxZlsuZNUCLtqPLoFB+bW/PoHsJZGW8X5uHVC698mamhUTEew8tbPUvf2Jp5/PK2ffwn KWrrJe352pV4rFGkNQdoc0veAWMKDZk8XBXlb9aXoZ+vP1TcK+3a/+10XwbagTUNOHJU ephT5ILdYsNE04KIGlB1gvZybQxXw63J83EcXdpBa3ymHUfEQWjUSnwLnYcIsqcM0b7P 41dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E5ATwxt3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y186si2320417oia.108.2019.12.03.15.05.30; Tue, 03 Dec 2019 15:05:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E5ATwxt3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727953AbfLCWuQ (ORCPT + 27 others); Tue, 3 Dec 2019 17:50:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:41662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729709AbfLCWuL (ORCPT ); Tue, 3 Dec 2019 17:50:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F04BC20656; Tue, 3 Dec 2019 22:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413410; bh=ifwruHAoHqHKLv+HjbF5JGJp7pgttRgm2PgncmfAWrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5ATwxt3U9nExAcPozaFCfeUjqBfr1MlMKqF2Opy+j/yozm+8FGDwYm1aZtSCifEu 5G349eM9TcEZXwwUEs/zh8oxM009Bvyof+aWl5WWPifQJ3I0JSzeujOH1ucCOZ3oGY Cbkwbo0DVrFFSpI/fI///NoVWOoxvE5OtCC474Eo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Ladislav Michl , Peter Ujfalusi , Roger Quadros , Tony Lindgren , Alan Stern , Sasha Levin Subject: [PATCH 4.19 116/321] usb: ehci-omap: Fix deferred probe for phy handling Date: Tue, 3 Dec 2019 23:33:02 +0100 Message-Id: <20191203223433.182056324@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roger Quadros [ Upstream commit 8dc7623bf608495b6e6743e805807c7840673573 ] PHY model is being used on omap5 platforms even if port mode is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required or not based on PHY mode. If PHY is provided in device tree, it must be required. So, if devm_usb_get_phy_by_phandle() gives us an error code other than -ENODEV (no PHY) then error out. This fixes USB Ethernet on omap5-uevm if PHY happens to probe after EHCI thus causing a -EPROBE_DEFER. Cc: Johan Hovold Cc: Ladislav Michl Reported-by: Peter Ujfalusi Signed-off-by: Roger Quadros Tested-by: Peter Ujfalusi Acked-by: Tony Lindgren Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/ehci-omap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 7e4c13346a1ee..7d20296cbe9f9 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -159,11 +159,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) /* get the PHY device */ phy = devm_usb_get_phy_by_phandle(dev, "phys", i); if (IS_ERR(phy)) { - /* Don't bail out if PHY is not absolutely necessary */ - if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) + ret = PTR_ERR(phy); + if (ret == -ENODEV) { /* no PHY */ + phy = NULL; continue; + } - ret = PTR_ERR(phy); if (ret != -EPROBE_DEFER) dev_err(dev, "Can't get PHY for port %d: %d\n", i, ret);