From patchwork Thu Jun 27 07:17:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 167887 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1961125ilk; Thu, 27 Jun 2019 00:17:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQ2xO8cHMsmU4D7LnKDjeTiukoc6kuynbvD8fTa+HPjvE+5XD4Ht6Wy02prjw7xnIVDOdr X-Received: by 2002:a17:90a:2627:: with SMTP id l36mr4305351pje.71.1561619874423; Thu, 27 Jun 2019 00:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561619874; cv=none; d=google.com; s=arc-20160816; b=GuxqWTvFXrBNwlRyf8k1tMLwU055L+wQGpA3d77Krqs0Xqr+lcjJ+n7rZ4uVGogi4z muF/7aOd4qmOYDAR2UT8GhgWXIv9dJxEtNvksWEGC+nIGCiFQ83ODMtPaUYPo7FNmcsv 10eR69FMnHQ4PFuw2iu++q3yZm0s5sDlHrjyzaz6tWp1nEkJzC5CUO4EM2MmKGnqt33W EYP1ithuy/KfpNQpRgVVD1Ij0UYVfa0lYWBVe9+cRNKOE1us8NjWiz3/n25BlTSEABKw jL7JnflyczSH7t1RVeZPK4mCJ1U602ysOqp2mo35ck/qmhL5q66Wmec7hAbK3orwBsTV VQrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=016809SWLiNavtpgbPWJW68VdPyatI3WBJsEnZ1/Se0=; b=MAiYNLf3q635HBH0qY5xGBNbXRndcqZS2AgjauP29cPtjEB4vTDzoWYPX20M3O7dTw XiB0Xl0Q4iTaZvKMbvcmc5gUtIrDK42DMNFLRYfsdYdG3xs+d+Oxud22L/Gq1+UEAlJ5 2wA+romAaIEInoP2jehckiHI4jkTvmwmDRfj8EdYz0XZBYu3ZsUeo1Qeo7t5eZQyZ2gY 0tEXzt78h1QVqcLrsqcIkjVdPlQNXevNbOd3pyDnm/FHoS7lVYNhv98D60Jm1SxU3J4+ pGs1zWBhykgYKgKu9j0hL6KJ3GLgIf8ekK+cyrXveqKnVKrcXlaqL+TmpEXXygtSXZWC ZWZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=iPVqE4qx; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v19si4189516pjn.96.2019.06.27.00.17.54; Thu, 27 Jun 2019 00:17:54 -0700 (PDT) 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=@samsung.com header.s=mail20170921 header.b=iPVqE4qx; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726566AbfF0HRx (ORCPT + 30 others); Thu, 27 Jun 2019 03:17:53 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47705 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726514AbfF0HRs (ORCPT ); Thu, 27 Jun 2019 03:17:48 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190627071746euoutp02764a5fa9ad0c0cd9d3dd3b9daf242323~r-P6PV5Py2029420294euoutp02c; Thu, 27 Jun 2019 07:17:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190627071746euoutp02764a5fa9ad0c0cd9d3dd3b9daf242323~r-P6PV5Py2029420294euoutp02c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1561619866; bh=016809SWLiNavtpgbPWJW68VdPyatI3WBJsEnZ1/Se0=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=iPVqE4qxmuTCvCkJTcCAfNqrZySc3Am9lt3bejUWnKJIR16tmn5bXQbMlJjiGjrUl dvkuFvXvD+hBU+uNTfc4luK/BinCGDUMmeQFYxkqFdRGmTCo9g40YWBpT13h/WnXnW EoXB62EK2MfE/if2ur8vLf1gQegM3HZiZPaZbPO4= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190627071745eucas1p2f7c4bcaf2fe632d92a8304d837279499~r-P512Hj_0726707267eucas1p2t; Thu, 27 Jun 2019 07:17:45 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id D4.96.04377.99D641D5; Thu, 27 Jun 2019 08:17:45 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190627071744eucas1p164b065a96afa23f2f5534fbc73660dae~r-P5GyKvj0969409694eucas1p15; Thu, 27 Jun 2019 07:17:44 +0000 (GMT) X-AuditID: cbfec7f4-5632c9c000001119-ba-5d146d9932e3 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 69.9A.04146.89D641D5; Thu, 27 Jun 2019 08:17:44 +0100 (BST) Received: from AMDC2765.DIGITAL.local ([106.120.51.73]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PTQ00HYSXLCML00@eusync4.samsung.com>; Thu, 27 Jun 2019 08:17:44 +0100 (BST) From: Marek Szyprowski To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Marek Szyprowski , Mathias Nyman , Felipe Balbi , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , Jochen Sprickerhof , Anand Moon Subject: [PATCH 1/3] usb: host: xhci-plat: Add support for Exynos5/DWC3 specific variant Date: Thu, 27 Jun 2019 09:17:24 +0200 Message-id: <20190627071726.30467-2-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190627071726.30467-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsWy7djPc7ozc0ViDTYsFLXYOGM9q8Wxtifs Fs2L17NZLP17j9Hi/PkN7BaXd81hs5hxfh+TxaJlrcwW6zbeYrdYe+QuUN2mKawO3B47Z91l 91i85yWTx6ZVnWwe++euYffo27KK0WPDln8sHp83yQWwR3HZpKTmZJalFunbJXBl7Dv8irmg xb5izb9TrA2Mx026GDk5JARMJOb2fmDrYuTiEBJYwShxcuFGVgjnM6PEteVrWLoYOcCqNr5L hogvY5S4v2IhC4Tzn1HiVHs/E8goNgFDia63XWwgtoiAg8SSpXfAxjIL/GeSmH7jBCtIQlgg SqK15TyYzSKgKvHq10OwZl4BW4mjXxYxQtwkL7F6wwFmEJtTwE7i6LTJ7CCDJAS2sElM/Pec GeIkF4nH20sh6mUkOjsOMkHUNDNKPDy3Fqqhh1HictMMqKnWEoePXwTbzCzAJzFp23SoQbwS HW1CECUeEodebmaEeG0io0TftY1sExglFjAyrGIUTy0tzk1PLTbKSy3XK07MLS7NS9dLzs/d xAiM09P/jn/ZwbjrT9IhRgEORiUeXoY9wrFCrIllxZW5hxglOJiVRHjzw0RihXhTEiurUovy 44tKc1KLDzFKc7AoifNWMzyIFhJITyxJzU5NLUgtgskycXBKNTBOkvjB/sP70MkLn+0eCWi+ tds6PeLpp+dnXk2zubHUZk7A8wdry+f6+bYvv8uduNDK6NDZt1UPao+lHtzWGyx3OV3huuqS R3s+Mot7Fy9dp7/KkDmrY3Xj5R2qUZd2nNm/PWbu/oy99ZP4E5id/9zyfvBw3z5vSw1HCeue oJgmec+tMspxZ3ZlKrEUZyQaajEXFScCAEhNeUrPAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKLMWRmVeSWpSXmKPExsVy+t/xa7ozckViDTpvqVhsnLGe1eJY2xN2 i+bF69kslv69x2hx/vwGdovLu+awWcw4v4/JYtGyVmaLdRtvsVusPXIXqG7TFFYHbo+ds+6y eyze85LJY9OqTjaP/XPXsHv0bVnF6LFhyz8Wj8+b5ALYo7hsUlJzMstSi/TtErgy9h1+xVzQ Yl+x5t8p1gbG4yZdjBwcEgImEhvfJXcxcnEICSxhlGg7coYVwmlkkpgxYzGQw8nBJmAo0fW2 iw3EFhFwkFiy9A4bSBGzQCOzxO8dZ8GKhAWiJFpbzoPZLAKqEq9+PWQCsXkFbCWOflnECGJL CMhLrN5wgBnE5hSwkzg6bTI7iC0EVHO1fT37BEaeBYwMqxhFUkuLc9Nziw31ihNzi0vz0vWS 83M3MQIDb9uxn5t3MF7aGHyIUYCDUYmHd8VO4Vgh1sSy4srcQ4wSHMxKIrz5YSKxQrwpiZVV qUX58UWlOanFhxilOViUxHk7BA7GCAmkJ5akZqemFqQWwWSZODilGhglHkR1ZkzQ+77oZVX6 P/ea6DgGb5EU6YNnyi9y5blJiE1QXP70tXn8tU01/UJztKbnTJ0w+3XRlN9Zi2a9vaWa56I4 7UXXpg1Ba6WX2RkyG+2beGzu9a/c/+4/EvEpfe4R+UGBIeWx6UaB4sz0UJXT74pKNx7M/6f7 X/8s9ybu9rqXG46qXTVUYinOSDTUYi4qTgQAwDMo0DgCAAA= X-CMS-MailID: 20190627071744eucas1p164b065a96afa23f2f5534fbc73660dae CMS-TYPE: 201P X-CMS-RootMailID: 20190627071744eucas1p164b065a96afa23f2f5534fbc73660dae References: <20190627071726.30467-1-m.szyprowski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org USB3.0 DRD PHY found in Exynos5 SoCs requires calibration to be done after every HCD reset. This was initially handled by DWC3 core by commit d8c80bb3b55b ("phy: exynos5-usbdrd: Calibrate LOS levels for exynos5420/5800"), but it turned out that the mentioned patch worked only by the pure luck and fixed only one use case. PHY calibration was done in DWC3 driver, just before initializing XHCI core. This approach was prone to a race. It worked for the fresh boot case iff XHCI-plat driver was compiled into the kernel or it's module has been loaded before DWC3 probe. In other cases (XHCI-plat module loaded on demand after DWC3 probe or during suspend/resume cycle) - the calibration was not performed at proper time and had no effect. This patch creates Exynos5/DWC3 specific variant of XHCI-plat driver, which takes care of proper PHY calibration after XHCI core reset, what fixes all known use cases (XHCI driver compiled as module and loaded on demand as well as during system suspend/resume cycle). Signed-off-by: Marek Szyprowski --- drivers/usb/host/Kconfig | 8 ++++++ drivers/usb/host/Makefile | 3 ++ drivers/usb/host/xhci-exynos.c | 51 ++++++++++++++++++++++++++++++++++ drivers/usb/host/xhci-exynos.h | 26 +++++++++++++++++ drivers/usb/host/xhci-plat.c | 38 ++++++++++++++++++++++++- drivers/usb/host/xhci-plat.h | 2 ++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 drivers/usb/host/xhci-exynos.c create mode 100644 drivers/usb/host/xhci-exynos.h -- 2.17.1 Tested-by: Anand Moon diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 40b5de597112..5a17a9b1fbff 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -53,6 +53,14 @@ config USB_XHCI_PLATFORM If unsure, say N. +config USB_XHCI_EXYNOS + tristate "xHCI support for Samsung Exynos SoCs" + depends on USB_XHCI_PLATFORM + depends on ARCH_EXYNOS || COMPILE_TEST + ---help--- + Say 'Y' to enable the support for the xHCI host controller + found in Samsung Exynos ARM SoCs. + config USB_XHCI_HISTB tristate "xHCI support for HiSilicon STB SoCs" depends on USB_XHCI_PLATFORM && (ARCH_HISI || COMPILE_TEST) diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 84514f71ae44..34afd6680751 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -30,6 +30,9 @@ endif ifneq ($(CONFIG_USB_XHCI_RCAR), ) xhci-plat-hcd-y += xhci-rcar.o endif +ifneq ($(CONFIG_USB_XHCI_EXYNOS), ) + xhci-plat-hcd-y += xhci-exynos.o +endif ifneq ($(CONFIG_DEBUG_FS),) xhci-hcd-y += xhci-debugfs.o diff --git a/drivers/usb/host/xhci-exynos.c b/drivers/usb/host/xhci-exynos.c new file mode 100644 index 000000000000..446d33998382 --- /dev/null +++ b/drivers/usb/host/xhci-exynos.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * xHCI host controller driver for Samsung Exynos5 SoCs + * + * Copyright (C) 2019 Samsung Electronics Co., Ltd. + */ + +#include +#include +#include + +#include "xhci.h" +#include "xhci-plat.h" +#include "xhci-exynos.h" + +int xhci_exynos_init_quirk(struct usb_hcd *hcd) +{ + struct xhci_hcd *xhci = hcd_to_xhci(hcd); + struct device *dev = hcd->self.controller; + struct xhci_plat_priv *xhci_priv = hcd_to_xhci_priv(hcd); + struct phy *usb2_generic_phy; + int ret; + + usb2_generic_phy = devm_phy_get(dev->parent, "usb2-phy"); + if (IS_ERR(usb2_generic_phy)) { + ret = PTR_ERR(usb2_generic_phy); + if (ret == -EPROBE_DEFER) { + return ret; + } else { + dev_err(dev, "no usb2 phy configured\n"); + return ret; + } + } + + phy_calibrate(usb2_generic_phy); + xhci_priv->priv = usb2_generic_phy; + + xhci->quirks |= XHCI_RESET_ON_RESUME; + + return 0; +} + +int xhci_exynos_post_resume_quirk(struct usb_hcd *hcd) +{ + struct xhci_plat_priv *xhci_priv = hcd_to_xhci_priv(hcd); + struct phy *usb2_generic_phy = xhci_priv->priv; + + phy_calibrate(usb2_generic_phy); + + return 0; +} diff --git a/drivers/usb/host/xhci-exynos.h b/drivers/usb/host/xhci-exynos.h new file mode 100644 index 000000000000..58ea3e9aea8d --- /dev/null +++ b/drivers/usb/host/xhci-exynos.h @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * drivers/usb/host/xhci-exynos.h + * + * Copyright (C) 2019 Samsung Electronics Co., Ltd. + */ + +#ifndef _XHCI_EXYNOS_H +#define _XHCI_EXYNOS_H + + +#if IS_ENABLED(CONFIG_USB_XHCI_EXYNOS) +int xhci_exynos_init_quirk(struct usb_hcd *hcd); +int xhci_exynos_post_resume_quirk(struct usb_hcd *hcd); +#else +static inline int xhci_exynos_init_quirk(struct usb_hcd *hcd) +{ + return 0; +} + +static inline int xhci_exynos_post_resume_quirk(struct usb_hcd *hcd) +{ + return 0; +} +#endif +#endif /* _XHCI_EXYNOS_H */ diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 998241f5fce3..6bc03cdb2f21 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -24,6 +24,7 @@ #include "xhci-plat.h" #include "xhci-mvebu.h" #include "xhci-rcar.h" +#include "xhci-exynos.h" static struct hc_driver __read_mostly xhci_plat_hc_driver; @@ -64,6 +65,16 @@ static int xhci_priv_resume_quirk(struct usb_hcd *hcd) return priv->resume_quirk(hcd); } +static int xhci_priv_post_resume_quirk(struct usb_hcd *hcd) +{ + struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd); + + if (!priv->post_resume_quirk) + return 0; + + return priv->post_resume_quirk(hcd); +} + static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci) { /* @@ -102,6 +113,11 @@ static const struct xhci_plat_priv xhci_plat_marvell_armada3700 = { .init_quirk = xhci_mvebu_a3700_init_quirk, }; +static const struct xhci_plat_priv xhci_plat_samsung_exynos5 = { + .init_quirk = xhci_exynos_init_quirk, + .post_resume_quirk = xhci_exynos_post_resume_quirk, +}; + static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = { .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1, .init_quirk = xhci_rcar_init_quirk, @@ -260,6 +276,13 @@ static int xhci_plat_probe(struct platform_device *pdev) goto disable_reg_clk; priv_match = of_device_get_match_data(&pdev->dev); + if (!priv_match) { + const struct platform_device_id *id = + platform_get_device_id(pdev); + if (id) + priv_match = (const struct xhci_plat_priv *) + id->driver_data; + } if (priv_match) { struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd); @@ -413,7 +436,11 @@ static int __maybe_unused xhci_plat_resume(struct device *dev) if (ret) return ret; - return xhci_resume(xhci, 0); + ret = xhci_resume(xhci, 0); + if (ret) + return ret; + + return xhci_priv_post_resume_quirk(hcd); } static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) @@ -447,9 +474,18 @@ static const struct acpi_device_id usb_xhci_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match); +static struct platform_device_id xhci_plat_driver_ids[] = { + { + .name = "exynos5-dwc3-xhci", + .driver_data = (long) &xhci_plat_samsung_exynos5, + }, { }, +}; +MODULE_DEVICE_TABLE(platform, xhci_plat_driver_ids); + static struct platform_driver usb_xhci_driver = { .probe = xhci_plat_probe, .remove = xhci_plat_remove, + .id_table = xhci_plat_driver_ids, .driver = { .name = "xhci-hcd", .pm = &xhci_plat_pm_ops, diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h index ae29f22ff5bd..f8a8e84b4ebe 100644 --- a/drivers/usb/host/xhci-plat.h +++ b/drivers/usb/host/xhci-plat.h @@ -12,9 +12,11 @@ struct xhci_plat_priv { const char *firmware_name; + void *priv; void (*plat_start)(struct usb_hcd *); int (*init_quirk)(struct usb_hcd *); int (*resume_quirk)(struct usb_hcd *); + int (*post_resume_quirk)(struct usb_hcd *); }; #define hcd_to_xhci_priv(h) ((struct xhci_plat_priv *)hcd_to_xhci(h)->priv) From patchwork Thu Jun 27 07:17:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 167886 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1961103ilk; Thu, 27 Jun 2019 00:17:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiVflpajpiRakrsLSFYI7oWv5dIRFbDYWbnD4ESsP/xK8JWPR/Vdoq22ZgiWdM3ifDYOah X-Received: by 2002:a17:90a:a008:: with SMTP id q8mr4271305pjp.114.1561619872432; Thu, 27 Jun 2019 00:17:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561619872; cv=none; d=google.com; s=arc-20160816; b=tsJzxlnhO+73x8Dh8RRh4tWiNrG9p8Yf6kz7T6DwZUNz5m5E7YQuWS9K3aS1JQpLsS FamtYSz1zipHj+KHAkucM4ZtYAwIApDws0vOg9V1jyrvVa5i4zFaNiuyFxOTH0NuRcwO sG7tKuN4+MQJc48EXHUnNwwadAgkUmCiPeRiWfq8ynhfPXi3cwjHbwjTvQtTq9cRZoFj r43DY0rNutM+pH8jY0Ml7z61J2p6eo3mUEMpsehw0Sp83Jf6QlsxkC6j8XrZJPhrj/C0 CP+h9zp4W6X/8FYNVB8ha/RF8XzgnWmkzGTs0mBJqZqhxAS+FqDSwduW/z8BkCcW/SOu jFfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=ijdorqqTkcn1o5m8sGtGI6GyhJS7V9aRwUoQkFw7p7U=; b=hWcOlP38/qfz/D2ySazsyJQWZxLPuugfttQ45XW6ELwaA4DI3qNFO2wzdyTvktebzg 0vtjbQxrFPEz4ZXc7viGllMxMl3T51NlF5gJ3fVU0+4tUlmS/6u8CpujzBNm2s+0kHQw CjiWGk4sUXKbI1tpYOAemcusGCO8py0PqAy1egkMU1ykEILKIJyi8rXce7ehVwYsf+pY 4mwrp///nilPSqRvlfSfRNPSYyLbqgCmI9f0sczzm91qCsspLjoLkkXG0gh0DNtIi/T6 GTC79mrXXvmVibDl+/7b8MWps+0atmgyinkisX0mNXExa3crM0b6naPQJQQSx/ChdbE3 QFdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=qOv2ErHz; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j4si1342420pgh.209.2019.06.27.00.17.52; Thu, 27 Jun 2019 00:17:52 -0700 (PDT) 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=@samsung.com header.s=mail20170921 header.b=qOv2ErHz; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726549AbfF0HRu (ORCPT + 30 others); Thu, 27 Jun 2019 03:17:50 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47715 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725787AbfF0HRs (ORCPT ); Thu, 27 Jun 2019 03:17:48 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190627071746euoutp023d0db8c3480bbdf75390a32f2578c13d~r-P6a_c1b2044920449euoutp02A; Thu, 27 Jun 2019 07:17:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190627071746euoutp023d0db8c3480bbdf75390a32f2578c13d~r-P6a_c1b2044920449euoutp02A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1561619866; bh=ijdorqqTkcn1o5m8sGtGI6GyhJS7V9aRwUoQkFw7p7U=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=qOv2ErHzIekbzYxR/pZ3xlmMWP5Ld5MDBIOylDL9LAnFPV09aZmXU0OKaOokpx4f1 Z+NAqu20suNXBfOnOanu1lW5ZTmQNEjkslEUys8hHbNe601tqiCzx+wFkZWU8SlDkQ ub3ZBu99Ok2QuHE+uKLTYSxo3rTvLCMaDLiGr/OA= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190627071745eucas1p1559f45320f6ea101c65ce9487dba63f9~r-P6EfmdH2386123861eucas1p1v; Thu, 27 Jun 2019 07:17:45 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 95.96.04377.99D641D5; Thu, 27 Jun 2019 08:17:45 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190627071745eucas1p1fa1b9d46e67b131522f49d73ac12d8ed~r-P5dDztj2388423884eucas1p1w; Thu, 27 Jun 2019 07:17:45 +0000 (GMT) X-AuditID: cbfec7f4-113ff70000001119-bb-5d146d999ce4 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id CA.9A.04146.99D641D5; Thu, 27 Jun 2019 08:17:45 +0100 (BST) Received: from AMDC2765.DIGITAL.local ([106.120.51.73]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PTQ00HYSXLCML00@eusync4.samsung.com>; Thu, 27 Jun 2019 08:17:45 +0100 (BST) From: Marek Szyprowski To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Marek Szyprowski , Mathias Nyman , Felipe Balbi , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , Jochen Sprickerhof , Anand Moon Subject: [PATCH 2/3] usb: dwc3: exynos: Use Exynos specific XHCI-plat driver variant Date: Thu, 27 Jun 2019 09:17:25 +0200 Message-id: <20190627071726.30467-3-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190627071726.30467-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsWy7djPc7ozc0ViDfacV7PYOGM9q8Wxtifs Fs2L17NZLP17j9Hi/PkN7BaXd81hs5hxfh+TxaJlrcwW6zbeYrdYe+QuUN2mKawO3B47Z91l 91i85yWTx6ZVnWwe++euYffo27KK0WPDln8sHp83yQWwR3HZpKTmZJalFunbJXBlzPqyh7Hg rnbFrNbNTA2MO1W6GDk5JARMJPavecrexcjFISSwglHi0aE7bBDOZ0aJD/Na2GGq/l9ZzQJi CwksY5S4d7wMoug/o0THxhdMIAk2AUOJrrddbCC2iICDxJKlEJOYBf4zSUy/cYIVJCEsECYx 82gD2FQWAVWJby+ngk3lFbCV6D2whBVim7zE6g0HmEFsTgE7iaPTJoPdJyGwhk1i2bkzzBBF LhJvp/9khLBlJDo7DjJBFDUzSjw8txaqo4dR4nLTDKgqa4nDxy+CrWAW4JOYtG060CQOoDiv REebEESJh8SO0zuZIf6cyChxfq3uBEaJBYwMqxjFU0uLc9NTi43yUsv1ihNzi0vz0vWS83M3 MQLj9PS/4192MO76k3SIUYCDUYmHl2GPcKwQa2JZcWXuIUYJDmYlEd78MJFYId6UxMqq1KL8 +KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxSDYzRvHd2yCYv6jqwmyvg2YaI Jq3Glam8s27ZyuftZ8iOe8T67u9z1jndfoECx1aLLXxWFpBiJpDpFFkyYfNE0TDzSWcaPGc7 XfxjXyzx68DTT7N1N/hsjfMVZNqk0jN/yrnKpvj/Udzlkxa7dRw78tN5SmgXY+Tehd+8rYPa r3wLlffe1rTlBJsSS3FGoqEWc1FxIgCy+3ohzwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCLMWRmVeSWpSXmKPExsVy+t/xa7ozc0ViDVqXs1tsnLGe1eJY2xN2 i+bF69kslv69x2hx/vwGdovLu+awWcw4v4/JYtGyVmaLdRtvsVusPXIXqG7TFFYHbo+ds+6y eyze85LJY9OqTjaP/XPXsHv0bVnF6LFhyz8Wj8+b5ALYo7hsUlJzMstSi/TtErgyZn3Zw1hw V7tiVutmpgbGnSpdjJwcEgImEv+vrGYBsYUEljBKzN9ZAWE3Mkm8/CMIYrMJGEp0ve1iA7FF BBwkliy9A2RzcTALNDJL/N5xlhUkISwQJjHzaAM7iM0ioCrx7eVUsKG8ArYSvQeWsEIsk5dY veEAM4jNKWAncXTaZHaIZbYSV9vXs09g5FnAyLCKUSS1tDg3PbfYUK84Mbe4NC9dLzk/dxMj MOy2Hfu5eQfjpY3BhxgFOBiVeHhX7BSOFWJNLCuuzD3EKMHBrCTCmx8mEivEm5JYWZValB9f VJqTWnyIUZqDRUmct0PgYIyQQHpiSWp2ampBahFMlomDU6qBMWfLblMZ47meaZnhL763mZ7d XRl6bv8r5+D9HDM7n76+7X0rJ3rymU+zrH5dW9oTsNniyZQ10XpPxawXvlRd5baoujf/z7Lf zUwCP97GOMs+PTnvIHvK8U0/LnBu3fPmfRen1i0x14/SgY6xriEf3oZJm5e8P+wn/3VJo0im ZKga455JuUEMEUosxRmJhlrMRcWJAIazBdE3AgAA X-CMS-MailID: 20190627071745eucas1p1fa1b9d46e67b131522f49d73ac12d8ed CMS-TYPE: 201P X-CMS-RootMailID: 20190627071745eucas1p1fa1b9d46e67b131522f49d73ac12d8ed References: <20190627071726.30467-1-m.szyprowski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Exynos5 SoCs needs to calibrate USB3.0 DRD PHY after every XHCI HCD reset. This patch adds support for instantiating Exynos5-specific variant of XHCI-plat driver, which handles the required USB3.0 DRD PHY calibration. Signed-off-by: Marek Szyprowski --- drivers/usb/dwc3/Kconfig | 1 + drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/dwc3-exynos.c | 64 +++++++++++++++++++++++----------- drivers/usb/dwc3/host.c | 2 +- 5 files changed, 47 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 89abc6078703..badf86dfb027 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -67,6 +67,7 @@ config USB_DWC3_OMAP config USB_DWC3_EXYNOS tristate "Samsung Exynos Platform" depends on (ARCH_EXYNOS || COMPILE_TEST) && OF + select USB_XHCI_EXYNOS if USB_XHCI_PLATFORM default USB_DWC3 help Recent Exynos5 SoCs ship with one DesignWare Core USB3 IP inside, diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index c9bb93a2c81e..baa029ceede9 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1303,6 +1303,7 @@ static void dwc3_get_properties(struct dwc3 *dwc) &dwc->hsphy_interface); device_property_read_u32(dev, "snps,quirk-frame-length-adjustment", &dwc->fladj); + device_property_read_string(dev, "snps,xhci_variant", &dwc->hcd_name); dwc->dis_metastability_quirk = device_property_read_bool(dev, "snps,dis_metastability_quirk"); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 3dd783b889cb..1b8f5f5814a4 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1176,6 +1176,7 @@ struct dwc3 { u8 tx_max_burst_prd; const char *hsphy_interface; + const char *hcd_name; unsigned connected:1; unsigned delayed_status:1; diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c index c1e9ea621f41..4e847073e85e 100644 --- a/drivers/usb/dwc3/dwc3-exynos.c +++ b/drivers/usb/dwc3/dwc3-exynos.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -35,22 +36,20 @@ struct dwc3_exynos { struct regulator *vdd33; struct regulator *vdd10; + struct platform_device *dwc3; }; -static int dwc3_exynos_remove_child(struct device *dev, void *unused) -{ - struct platform_device *pdev = to_platform_device(dev); - - platform_device_unregister(pdev); - - return 0; -} +static const struct property_entry dwc3_exynos_properties[] = { + PROPERTY_ENTRY_STRING("snps,xhci_variant", "exynos5-dwc3-xhci"), + {} +}; static int dwc3_exynos_probe(struct platform_device *pdev) { struct dwc3_exynos *exynos; struct device *dev = &pdev->dev; - struct device_node *node = dev->of_node; + struct device_node *node = dev->of_node, *child; + struct platform_device *dwc3; const struct dwc3_exynos_driverdata *driver_data; int i, ret; @@ -109,21 +108,43 @@ static int dwc3_exynos_probe(struct platform_device *pdev) goto vdd10_err; } - if (node) { - ret = of_platform_populate(node, NULL, NULL, dev); - if (ret) { - dev_err(dev, "failed to add dwc3 core\n"); - goto populate_err; - } - } else { - dev_err(dev, "no device node, failed to add dwc3 core\n"); - ret = -ENODEV; - goto populate_err; + child = of_get_next_child(node, NULL); + if (!child) { + dev_err(dev, "Failed to find DWC3 core device node\n"); + goto dwc3_child_err; + } + + dwc3 = of_device_alloc(child, NULL, dev); + if (!dwc3) { + dev_err(dev, "Failed to allocate DWC3 core device\n"); + goto dwc3_alloc_err; + } + + dwc3->dev.coherent_dma_mask = DMA_BIT_MASK(32); + dwc3->dev.dma_mask = &dwc3->dev.coherent_dma_mask; + dwc3->dev.bus = &platform_bus_type; + + ret = platform_device_add_properties(dwc3, dwc3_exynos_properties); + if (ret < 0) { + dev_err(dev, "Failed to add properties to DWC3 device\n"); + goto dwc3_props_err; + } + + ret = of_device_add(dwc3); + if (ret) { + dev_err(&pdev->dev, "Failed to register DWC3 core device\n"); + goto dwc3_props_err; } + exynos->dwc3 = dwc3; + of_node_put(child); return 0; -populate_err: +dwc3_props_err: + platform_device_put(dwc3); +dwc3_alloc_err: + of_node_put(child); +dwc3_child_err: regulator_disable(exynos->vdd10); vdd10_err: regulator_disable(exynos->vdd33); @@ -142,7 +163,8 @@ static int dwc3_exynos_remove(struct platform_device *pdev) struct dwc3_exynos *exynos = platform_get_drvdata(pdev); int i; - device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child); + of_device_unregister(exynos->dwc3); + platform_device_put(exynos->dwc3); for (i = exynos->num_clks - 1; i >= 0; i--) clk_disable_unprepare(exynos->clks[i]); diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index f55947294f7c..b526d0c78c3b 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -71,7 +71,7 @@ int dwc3_host_init(struct dwc3 *dwc) dwc->xhci_resources[1].flags = res->flags; dwc->xhci_resources[1].name = res->name; - xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO); + xhci = platform_device_alloc(dwc->hcd_name, PLATFORM_DEVID_AUTO); if (!xhci) { dev_err(dwc->dev, "couldn't allocate xHCI device\n"); return -ENOMEM; From patchwork Thu Jun 27 07:17:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 167888 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1961235ilk; Thu, 27 Jun 2019 00:18:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqzKVfVJGAqJZgLzKNZyM1Wp3Qr3XvTJT/PL0GIGhRk1optBchEZoJJMDbkslegGKxejFNfy X-Received: by 2002:a17:902:9897:: with SMTP id s23mr2877118plp.47.1561619881907; Thu, 27 Jun 2019 00:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561619881; cv=none; d=google.com; s=arc-20160816; b=TMrnHBW/UGSYPgZDtiW8sGSxbnNbh8k/CJIWVDcr+KRQC1jjzDWqtjKRFVXWLcOzo+ F4cFHgHKQzxT6ounq2y4bIuLFMV4Tz4onq9Hrle4iEQ05pLY1gFrP19bLrd68McIqQ0c azargRCMmudCT5AXuZCUVznqnOO8abZJdNhuEMXexBuLN7DnvXMcJtt10FGVWnVN+4CG T++9c1xQbB8arX2+b03jP28U6b33J9+m2qDe9bIf3tLb4uTTYjpNIzIhRgkJzDqcR1l4 xMqihrwxBJk9rTebrhzzwlYe9xbQEJxtNBPekN5ZhpJXO36reEpHE4litClSrKcC2z5k 9Nxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=01kyvHj/JU4j5qOUAe5VfR1X7QHg7wasRsZbbGpVbbw=; b=Hef7nxjaCG4WE7xyV9uyI+vCYqjg9/PX7Saecfbjfe9d23+aMn/coeazMaiOjM5gIa Hr1ZPtRe+h6Sps2TFUyUWXHJWpd+O9521yga+9Qoump+8HkStWDNZ4pNh3YaXO3Ow7Si H3SFoZ1nVQRIwJFctdfcvslJZH0tS3XzYWgHGCCxuRMbWb3VELTVP3uAOFBBhyDiqa9x rsNlLB5QUAzSEmM8M6mldHX5iMxJgch69j0o1vbgGmTJ28K40nt2CEVpjYlKKjAqiCFs 47anpANVo2T4mOvmZQz5Y1syVOhAhlDOlZtkcqWHS7Qx7yZm4dy4owOkhkgH0ofRpafy IxFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b="E/yhBor6"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g2si1578983plp.1.2019.06.27.00.18.01; Thu, 27 Jun 2019 00:18:01 -0700 (PDT) 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=@samsung.com header.s=mail20170921 header.b="E/yhBor6"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726589AbfF0HSA (ORCPT + 30 others); Thu, 27 Jun 2019 03:18:00 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47724 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726516AbfF0HRs (ORCPT ); Thu, 27 Jun 2019 03:17:48 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190627071746euoutp029723f62e89c482599e05322598b1dd1e~r-P7AhdVh2029320293euoutp02d; Thu, 27 Jun 2019 07:17:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190627071746euoutp029723f62e89c482599e05322598b1dd1e~r-P7AhdVh2029320293euoutp02d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1561619866; bh=01kyvHj/JU4j5qOUAe5VfR1X7QHg7wasRsZbbGpVbbw=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=E/yhBor6ZVpi/rnR27i5Tdi7K+zxt3YxLolJaxBpAKZpJ0dbz8fBZecP2m4y8MVZU Eu4sSZ18+75yKcaPqz9yi9KhBEd0iIsCo7N2DIcsNg2jo5wsljjcVsDXKEeuSbLf+c wmSbZu/N1wtWWzQbCyq3a6FOCmXgtLpAUscQQRDU= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190627071746eucas1p24a7e1eec98d8e78a1f7a848bdde63816~r-P6nTk9s1039310393eucas1p2N; Thu, 27 Jun 2019 07:17:46 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id BB.62.04298.A9D641D5; Thu, 27 Jun 2019 08:17:46 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190627071745eucas1p1c171dcafd92fe51c99dc102949de6c99~r-P56WsyL2388423884eucas1p1x; Thu, 27 Jun 2019 07:17:45 +0000 (GMT) X-AuditID: cbfec7f2-3615e9c0000010ca-18-5d146d9a0a2a Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id EA.F3.04140.99D641D5; Thu, 27 Jun 2019 08:17:45 +0100 (BST) Received: from AMDC2765.DIGITAL.local ([106.120.51.73]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PTQ00HYSXLCML00@eusync4.samsung.com>; Thu, 27 Jun 2019 08:17:45 +0100 (BST) From: Marek Szyprowski To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Marek Szyprowski , Mathias Nyman , Felipe Balbi , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , Jochen Sprickerhof , Anand Moon Subject: [PATCH 3/3] usb: dwc3: Remove generic PHY calibrate() calls Date: Thu, 27 Jun 2019 09:17:26 +0200 Message-id: <20190627071726.30467-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190627071726.30467-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsWy7djP87qzckViDZp/8lhsnLGe1eJY2xN2 i+bF69kslv69x2hx/vwGdovLu+awWcw4v4/JYtGyVmaLdRtvsVusPXIXqG7TFFYHbo+ds+6y eyze85LJY9OqTjaP/XPXsHv0bVnF6LFhyz8Wj8+b5ALYo7hsUlJzMstSi/TtErgyLlw/x1Lw m6vi0qXVTA2MfZxdjJwcEgImEvdnzmTqYuTiEBJYwShxYtYcRpCEkMBnRolVt8S6GDnAinb9 r4aoWcYo8ezyLqiG/4wSHRtfMIE0sAkYSnS97WIDsUUEHCSWLL3DBlLELPCfSWL6jROsIAlh AReJ5beawRpYBFQlps0+zA5i8wrYSrR8f88OcZK8xOoNB5hBbE4BO4mj0yazgwySENjCJrH/ 4xeoIheJ92f2skDYMhKXJ3ezQBQ1M0o8PLcWqqOHUeJy0wxGiCpricPHL4KdwSzAJzFp23Rm iOd4JTrahCBKPCTuHtzGAvHbREaJSbP3ME5glFjAyLCKUTy1tDg3PbXYMC+1XK84Mbe4NC9d Lzk/dxMjME5P/zv+aQfj10tJhxgFOBiVeHgZ9gjHCrEmlhVX5h5ilOBgVhLhzQ8TiRXiTUms rEotyo8vKs1JLT7EKM3BoiTOW83wIFpIID2xJDU7NbUgtQgmy8TBKdXAuKRkwr/St1//m3Ic anee57BI7c70FyFeM8w/Zp2sk/bbxpu2Kv/I9Uv5c+cfvttzY6JkeMwpT9WVjyL0FnLwrrV8 9Man8ZqMbp/6Fe5mO0nm7V1+9mczlcSFreP7Ui/PZTdzamC2WyXhtX1n8seWh5slqvY/fqvu niupL7zKUlQjc5PyjlemSizFGYmGWsxFxYkAxmRefM8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCLMWRmVeSWpSXmKPExsVy+t/xa7ozc0ViDf63qFtsnLGe1eJY2xN2 i+bF69kslv69x2hx/vwGdovLu+awWcw4v4/JYtGyVmaLdRtvsVusPXIXqG7TFFYHbo+ds+6y eyze85LJY9OqTjaP/XPXsHv0bVnF6LFhyz8Wj8+b5ALYo7hsUlJzMstSi/TtErgyLlw/x1Lw m6vi0qXVTA2MfZxdjBwcEgImErv+V3cxcnEICSxhlHjQ+4mxi5ETyGlkknj5RxDEZhMwlOh6 28UGYosIOEgsWXqHDaSBWaCRWeL3jrOsIAlhAReJ5beamUBsFgFViWmzD7OD2LwCthIt39+D 2RIC8hKrNxxgBrE5Bewkjk6bzA6xzFbiavt69gmMPAsYGVYxiqSWFuem5xYb6RUn5haX5qXr JefnbmIEht22Yz+37GDsehd8iFGAg1GJh3fFTuFYIdbEsuLK3EOMEhzMSiK8+WEisUK8KYmV ValF+fFFpTmpxYcYpTlYlMR5OwQOxggJpCeWpGanphakFsFkmTg4pRoYmz9f8Oq7xJd8R9Eo Q2aViKuc3MEjX2Wl5Qw+WbZf359rYTD/x2f+M7u5Jj7JMf56e8bSteorHCdMepyf+dZNSaF5 xfnE7cZ7PYLnvhIXKRH0mHXt34e9Nz+kuueHcNn9qm891VJT+cbUVnG5hRyvp22f5JMM2Rei Exd+0bjzOMt475pz5dMClViKMxINtZiLihMBqBqAYzcCAAA= X-CMS-MailID: 20190627071745eucas1p1c171dcafd92fe51c99dc102949de6c99 CMS-TYPE: 201P X-CMS-RootMailID: 20190627071745eucas1p1c171dcafd92fe51c99dc102949de6c99 References: <20190627071726.30467-1-m.szyprowski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calls to USB2 generic PHY calibrate() method were added by commit d8c80bb3b55b ("phy: exynos5-usbdrd: Calibrate LOS levels for exynos5420/5800"), but it turned out that the mentioned patch worked only by the pure luck and fixed only one use case. To fix the issues with PHY calibration it has been moved to XHCI HCD driver, what allows to perform calibration in the proper time window. This patch removes those calls from DWC3 driver, as they are no longer needed there. Signed-off-by: Marek Szyprowski --- drivers/usb/dwc3/core.c | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index baa029ceede9..f62e8442c614 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -168,7 +168,6 @@ static void __dwc3_set_mode(struct work_struct *work) otg_set_vbus(dwc->usb2_phy->otg, true); phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST); phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); - phy_calibrate(dwc->usb2_generic_phy); } break; case DWC3_GCTL_PRTCAP_DEVICE: @@ -1166,7 +1165,6 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) dev_err(dev, "failed to initialize host\n"); return ret; } - phy_calibrate(dwc->usb2_generic_phy); break; case USB_DR_MODE_OTG: INIT_WORK(&dwc->drd_work, __dwc3_set_mode);