From nobody Tue Dec 28 02:27:39 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 951AC1904F38; Tue, 28 Dec 2021 02:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNJND25s4z3q5V; Tue, 28 Dec 2021 02:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1FFF0E6A; Tue, 28 Dec 2021 02:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BS2Rdj8012076; Tue, 28 Dec 2021 02:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BS2RdLA012075; Tue, 28 Dec 2021 02:27:39 GMT (envelope-from git) Date: Tue, 28 Dec 2021 02:27:39 GMT Message-Id: <202112280227.1BS2RdLA012075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 86f0c3ec13aa - main - ipq4018_usb_phy: add USB 2.0 and 3.0 PHY support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86f0c3ec13aa6d583a586f343329d15faf22bd75 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640658460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8Rr8YMEGQy9wOMSboeviRJykx0L6RuFwXaTxvbCldw=; b=tx3lzTL4y6gq2D+bTgGmglzBwE1sWgdwJu7iKpHXvVQt6oDwQQ9G6uSrvHN1M12qU9ekqZ zuPDYADjeFeKrzcyal5i1AeK2Dl9ywQeWetanx7j4tBjSSeAHeqHIFEKXvqT9ePXqST/LM wBUJyHM006ncdYbtPqQKhpR3Tr4cigQOLDF73RiYr/0D6NJrsoqmK1k0txrPEX5KWNGmRb IeSeBYgJZ3oCdCl5KRclyNnbZuQ/3fUIVYrfup3FF963JtcHKoLn8rnhhZKMqfZPi2/JV/ 47dx1YlqVKMnzS9PprnJcG85yRPqd5CAZgfVIQykmMU8B//R87ySEPXRRXfA6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640658460; a=rsa-sha256; cv=none; b=gnrstlTjBXs2lELIzx0ZTtlzF4dhzs62aLhN8wTkIPDOsKMhe90YaQE9ksBxztKrQoXy2T MaJViOM4L2BuoEZkhxFxT5A5ZX1tcWC7bW4Ta4Smw+r3Pt18ai+4zunru8Z3JAzeen+JRm RWp8k4x+X3aGoeA+c5EYpCRe24w7FZnWJ6pDNi3sy63mG7bLYMxIMw5XyVlQ1a7EE4WJsr jmnJO+rFoo1sZayMlh509dcOLuwrD9xY+3C5UWBthA+2Di0125QaTZE5QylUjqcrhojc2M otHBq8XaAlYwWnJyp1KO5AyQM+n5wePrU26IWD1QOZt0Sl0BFCtpu/qtHCKWVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=86f0c3ec13aa6d583a586f343329d15faf22bd75 commit 86f0c3ec13aa6d583a586f343329d15faf22bd75 Author: Adrian Chadd AuthorDate: 2021-12-28 02:21:36 +0000 Commit: Adrian Chadd CommitDate: 2021-12-28 02:21:36 +0000 ipq4018_usb_phy: add USB 2.0 and 3.0 PHY support This adds the USB 2.0 and 3.0 PHY support for the IPQ4018/IPQ4019. All it really needs to do is gate the relevant clocks on/off in the right order with the right delays. --- sys/arm/conf/std.qca | 4 + sys/arm/qualcomm/ipq4018_usb_hs_phy.c | 236 ++++++++++++++++++++++++++++++++++ sys/arm/qualcomm/ipq4018_usb_ss_phy.c | 218 +++++++++++++++++++++++++++++++ sys/arm/qualcomm/std.ipq4018 | 3 + 4 files changed, 461 insertions(+) diff --git a/sys/arm/conf/std.qca b/sys/arm/conf/std.qca index bb884531508b..c835b3c94616 100644 --- a/sys/arm/conf/std.qca +++ b/sys/arm/conf/std.qca @@ -61,3 +61,7 @@ options FDT # Disable CP14 work in DDB as TZ won't let us by default options ARM_FORCE_DBG_MONITOR_DISABLE + +# USB PHY support +device qcom_ipq4018_hs_usbphy +device qcom_ipq4018_ss_usbphy diff --git a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c new file mode 100644 index 000000000000..8e03d2f27e6f --- /dev/null +++ b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c @@ -0,0 +1,236 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2019 Michal Meloun + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include "phynode_if.h" +#include "phynode_usb_if.h" + +static struct ofw_compat_data compat_data[] = { + {"qcom,usb-hs-ipq4019-phy", 1}, + {NULL, 0}, +}; + +struct ipq4018_usb_hs_phy_softc { + device_t dev; +}; + +struct ipq4018_usb_hs_phynode_sc { + struct phynode_usb_sc usb_sc; + int mode; + hwreset_t por_rst; + hwreset_t srif_rst; +}; + +static int +ipq4018_usb_hs_phynode_phy_enable(struct phynode *phynode, bool enable) +{ + struct ipq4018_usb_hs_phynode_sc *sc; + device_t dev; + int rv; + + dev = phynode_get_device(phynode); + sc = phynode_get_softc(phynode); + + /* + * + * For power-off - assert por, sleep for 10ms, assert srif, + * sleep for 10ms + */ + rv = hwreset_assert(sc->por_rst); + if (rv != 0) + goto done; + DELAY(10*1000); + rv = hwreset_assert(sc->srif_rst); + if (rv != 0) + goto done; + DELAY(10*1000); + + /* + * For power-on - power off first, then deassert srif, then + * sleep for 10ms, then deassert por. + */ + if (enable) { + rv = hwreset_deassert(sc->srif_rst); + if (rv != 0) + goto done; + DELAY(10*1000); + rv = hwreset_deassert(sc->por_rst); + if (rv != 0) + goto done; + DELAY(10*1000); + } + +done: + if (rv != 0) { + device_printf(dev, "%s: failed, rv=%d\n", __func__, rv); + } + return (rv); +} + + /* Phy controller class and methods. */ +static phynode_method_t ipq4018_usb_hs_phynode_methods[] = { + PHYNODEUSBMETHOD(phynode_enable, ipq4018_usb_hs_phynode_phy_enable), + PHYNODEUSBMETHOD_END +}; +DEFINE_CLASS_1(ipq4018_usb_hs_phynode, ipq4018_usb_hs_phynode_class, + ipq4018_usb_hs_phynode_methods, + sizeof(struct ipq4018_usb_hs_phynode_sc), phynode_usb_class); + +static int +ipq4018_usb_hs_usbphy_init_phy(struct ipq4018_usb_hs_phy_softc *sc, + phandle_t node) +{ + struct phynode *phynode; + struct phynode_init_def phy_init; + struct ipq4018_usb_hs_phynode_sc *phy_sc; + int rv; + hwreset_t por_rst = NULL, srif_rst = NULL; + + /* FDT resources */ + rv = hwreset_get_by_ofw_name(sc->dev, node, "por_rst", &por_rst); + if (rv != 0 && rv != ENOENT) { + device_printf(sc->dev, "Cannot get 'por_rst' reset\n"); + goto fail; + } + rv = hwreset_get_by_ofw_name(sc->dev, node, "srif_rst", &srif_rst); + if (rv != 0 && rv != ENOENT) { + device_printf(sc->dev, "Cannot get 'srif_rst' reset\n"); + goto fail; + } + + /* Create and register phy. */ + bzero(&phy_init, sizeof(phy_init)); + phy_init.id = 1; + phy_init.ofw_node = node; + phynode = phynode_create(sc->dev, &ipq4018_usb_hs_phynode_class, + &phy_init); + if (phynode == NULL) { + device_printf(sc->dev, "Cannot create phy.\n"); + return (ENXIO); + } + + phy_sc = phynode_get_softc(phynode); + phy_sc->por_rst = por_rst; + phy_sc->srif_rst = srif_rst; + + if (phynode_register(phynode) == NULL) { + device_printf(sc->dev, "Cannot register phy.\n"); + return (ENXIO); + } + + (void) ipq4018_usb_hs_phynode_phy_enable(phynode, true); + + return (0); + +fail: + if (por_rst != NULL) + hwreset_release(por_rst); + if (srif_rst != NULL) + hwreset_release(srif_rst); + + return (ENXIO); +} + +static int +ipq4018_usb_hs_usbphy_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "IPQ4018/IPQ4019 USB HS PHY"); + return (BUS_PROBE_DEFAULT); +} + +static int +ipq4018_usb_hs_usbphy_attach(device_t dev) +{ + struct ipq4018_usb_hs_phy_softc *sc; + phandle_t node; + int rv; + + sc = device_get_softc(dev); + sc->dev = dev; + node = ofw_bus_get_node(sc->dev); + + rv = ipq4018_usb_hs_usbphy_init_phy(sc, node); + if (rv != 0) + goto fail; + return (bus_generic_attach(dev)); + +fail: + return (ENXIO); +} + +static int +ipq4018_usb_hs_usbphy_detach(device_t dev) +{ + struct ipq4018_usb_hs_phy_softc *sc; + sc = device_get_softc(dev); + + return (0); +} + +static device_method_t ipq4018_usb_hs_usbphy_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ipq4018_usb_hs_usbphy_probe), + DEVMETHOD(device_attach, ipq4018_usb_hs_usbphy_attach), + DEVMETHOD(device_detach, ipq4018_usb_hs_usbphy_detach), + DEVMETHOD_END +}; + +static devclass_t ipq4018_usb_hs_usbphy_devclass; +static DEFINE_CLASS_0(ipq4018_usb_hs_usbphy, ipq4018_usb_hs_usbphy_driver, + ipq4018_usb_hs_usbphy_methods, + sizeof(struct ipq4018_usb_hs_phy_softc)); +EARLY_DRIVER_MODULE(ipq4018_usb_hs_usbphy, simplebus, + ipq4018_usb_hs_usbphy_driver, + ipq4018_usb_hs_usbphy_devclass, NULL, NULL, + BUS_PASS_TIMER + BUS_PASS_ORDER_LAST); diff --git a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c new file mode 100644 index 000000000000..4751213e8cab --- /dev/null +++ b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c @@ -0,0 +1,218 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2019 Michal Meloun + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include "phynode_if.h" +#include "phynode_usb_if.h" + +static struct ofw_compat_data compat_data[] = { + {"qcom,usb-ss-ipq4019-phy", 1}, + {NULL, 0}, +}; + +struct ipq4018_usb_ss_phy_softc { + device_t dev; +}; + +struct ipq4018_usb_ss_phynode_sc { + struct phynode_usb_sc usb_sc; + int mode; + hwreset_t por_rst; +}; + +static int +ipq4018_usb_ss_phynode_phy_enable(struct phynode *phynode, bool enable) +{ + struct ipq4018_usb_ss_phynode_sc *sc; + device_t dev; + int rv; + + dev = phynode_get_device(phynode); + sc = phynode_get_softc(phynode); + + device_printf(dev, "%s: called, enable=%d\n", __func__, enable); + + /* + * For power-off - assert por, sleep for 10ms + */ + rv = hwreset_assert(sc->por_rst); + if (rv != 0) + goto done; + DELAY(10*1000); + + /* + * For power-on - power off first, then deassert por. + */ + if (enable) { + rv = hwreset_deassert(sc->por_rst); + if (rv != 0) + goto done; + DELAY(10*1000); + } + +done: + if (rv != 0) { + device_printf(dev, "%s: failed, rv=%d\n", __func__, rv); + } + return (rv); +} + + /* Phy controller class and methods. */ +static phynode_method_t ipq4018_usb_ss_phynode_methods[] = { + PHYNODEUSBMETHOD(phynode_enable, ipq4018_usb_ss_phynode_phy_enable), + PHYNODEUSBMETHOD_END +}; +DEFINE_CLASS_1(ipq4018_usb_ss_phynode, ipq4018_usb_ss_phynode_class, + ipq4018_usb_ss_phynode_methods, + sizeof(struct ipq4018_usb_ss_phynode_sc), phynode_usb_class); + +static int +ipq4018_usb_ss_usbphy_init_phy(struct ipq4018_usb_ss_phy_softc *sc, + phandle_t node) +{ + struct phynode *phynode; + struct phynode_init_def phy_init; + struct ipq4018_usb_ss_phynode_sc *phy_sc; + int rv; + hwreset_t por_rst = NULL; + + /* FDT resources */ + rv = hwreset_get_by_ofw_name(sc->dev, node, "por_rst", &por_rst); + if (rv != 0 && rv != ENOENT) { + device_printf(sc->dev, "Cannot get 'por_rst' reset\n"); + goto fail; + } + + /* Create and register phy. */ + bzero(&phy_init, sizeof(phy_init)); + phy_init.id = 1; + phy_init.ofw_node = node; + phynode = phynode_create(sc->dev, &ipq4018_usb_ss_phynode_class, + &phy_init); + if (phynode == NULL) { + device_printf(sc->dev, "Cannot create phy.\n"); + return (ENXIO); + } + + phy_sc = phynode_get_softc(phynode); + phy_sc->por_rst = por_rst; + + if (phynode_register(phynode) == NULL) { + device_printf(sc->dev, "Cannot register phy.\n"); + return (ENXIO); + } + + (void) ipq4018_usb_ss_phynode_phy_enable(phynode, true); + + return (0); + +fail: + if (por_rst != NULL) + hwreset_release(por_rst); + + return (ENXIO); +} + +static int +ipq4018_usb_ss_usbphy_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "IPQ4018/IPQ4019 USB SS PHY"); + return (BUS_PROBE_DEFAULT); +} + +static int +ipq4018_usb_ss_usbphy_attach(device_t dev) +{ + struct ipq4018_usb_ss_phy_softc *sc; + phandle_t node; + int rv; + + sc = device_get_softc(dev); + sc->dev = dev; + node = ofw_bus_get_node(sc->dev); + + rv = ipq4018_usb_ss_usbphy_init_phy(sc, node); + if (rv != 0) + goto fail; + return (bus_generic_attach(dev)); + +fail: + return (ENXIO); +} + +static int +ipq4018_usb_ss_usbphy_detach(device_t dev) +{ + struct ipq4018_usb_ss_phy_softc *sc; + sc = device_get_softc(dev); + + return (0); +} + +static device_method_t ipq4018_usb_ss_usbphy_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ipq4018_usb_ss_usbphy_probe), + DEVMETHOD(device_attach, ipq4018_usb_ss_usbphy_attach), + DEVMETHOD(device_detach, ipq4018_usb_ss_usbphy_detach), + DEVMETHOD_END +}; + +static devclass_t ipq4018_usb_ss_usbphy_devclass; +static DEFINE_CLASS_0(ipq4018_usb_ss_usbphy, ipq4018_usb_ss_usbphy_driver, + ipq4018_usb_ss_usbphy_methods, + sizeof(struct ipq4018_usb_ss_phy_softc)); +EARLY_DRIVER_MODULE(ipq4018_usb_ss_usbphy, simplebus, + ipq4018_usb_ss_usbphy_driver, + ipq4018_usb_ss_usbphy_devclass, NULL, NULL, + BUS_PASS_TIMER + BUS_PASS_ORDER_LAST); diff --git a/sys/arm/qualcomm/std.ipq4018 b/sys/arm/qualcomm/std.ipq4018 index d4bb26fe8167..ed771179b3a0 100644 --- a/sys/arm/qualcomm/std.ipq4018 +++ b/sys/arm/qualcomm/std.ipq4018 @@ -3,6 +3,9 @@ arm/qualcomm/ipq4018_mp.c optional smp arm/qualcomm/qcom_scm_legacy.c standard arm/qualcomm/qcom_cpu_kpssv2.c optional smp +arm/qualcomm/ipq4018_usb_hs_phy.c optional qcom_ipq4018_hs_usbphy +arm/qualcomm/ipq4018_usb_ss_phy.c optional qcom_ipq4018_ss_usbphy + dev/qcom_rnd/qcom_rnd.c optional qcom_rnd dev/qcom_qup/qcom_spi.c optional qcom_qup_spi