svn commit: r350601 - in stable/12/sys: arm/mv arm64/conf conf dev/usb/controller
Emmanuel Vadot
manu at FreeBSD.org
Mon Aug 5 17:54:10 UTC 2019
Author: manu
Date: Mon Aug 5 17:54:08 2019
New Revision: 350601
URL: https://svnweb.freebsd.org/changeset/base/350601
Log:
MFC r344633-r344634, r344638
r344633:
usb_nop_xceiv: Add support for this pseudo device
This is a "fake" phy that handle regulator, clocks and reset gpio.
Only clock and regulator is supported for now.
Sponsored-by: Rubicon Communications, LCC ("Netgate")
r344634:
xhci_mv: Move the driver to generic_xhci
Marvell XHCI is in fact generic-xhci, so move the driver and
add the compatible string.
While here, get and enable the phy if the dtb provide one.
The xhci bindings state that phys should be in a 'phys' property but
Marvell DTS uses 'usb-phy', only add support for 'usb-phy' for now.
Sponsored-by: Rubicon Communications, LCC ("Netgate")
r344638:
Fix armv6/armv7 build after the move from xhci_mv to generic_xhci
Added:
stable/12/sys/dev/usb/controller/generic_xhci.c
- copied unchanged from r344634, head/sys/dev/usb/controller/generic_xhci.c
stable/12/sys/dev/usb/controller/usb_nop_xceiv.c
- copied unchanged from r344634, head/sys/dev/usb/controller/usb_nop_xceiv.c
Deleted:
stable/12/sys/dev/usb/controller/xhci_mv.c
Modified:
stable/12/sys/arm/mv/files.arm7
stable/12/sys/arm/mv/files.mv
stable/12/sys/arm64/conf/GENERIC
stable/12/sys/conf/files.arm64
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm/mv/files.arm7
==============================================================================
--- stable/12/sys/arm/mv/files.arm7 Mon Aug 5 17:43:44 2019 (r350600)
+++ stable/12/sys/arm/mv/files.arm7 Mon Aug 5 17:54:08 2019 (r350601)
@@ -33,7 +33,7 @@ dev/mvs/mvs_soc.c optional mvs
dev/uart/uart_dev_ns8250.c optional uart
dev/uart/uart_dev_snps.c optional uart
dev/usb/controller/ehci_mv.c optional ehci
-dev/usb/controller/xhci_mv.c optional xhci
+dev/usb/controller/generic_xhci.c optional xhci
dev/ahci/ahci_mv_fdt.c optional ahci
kern/kern_clocksource.c standard
Modified: stable/12/sys/arm/mv/files.mv
==============================================================================
--- stable/12/sys/arm/mv/files.mv Mon Aug 5 17:43:44 2019 (r350600)
+++ stable/12/sys/arm/mv/files.mv Mon Aug 5 17:54:08 2019 (r350601)
@@ -31,7 +31,7 @@ dev/mvs/mvs_soc.c optional mvs
dev/uart/uart_dev_ns8250.c optional uart
dev/uart/uart_dev_snps.c optional uart
dev/usb/controller/ehci_mv.c optional ehci
-dev/usb/controller/xhci_mv.c optional xhci
+dev/usb/controller/generic_xhci.c optional xhci
dev/ahci/ahci_mv_fdt.c optional ahci
kern/kern_clocksource.c standard
Modified: stable/12/sys/arm64/conf/GENERIC
==============================================================================
--- stable/12/sys/arm64/conf/GENERIC Mon Aug 5 17:43:44 2019 (r350600)
+++ stable/12/sys/arm64/conf/GENERIC Mon Aug 5 17:54:08 2019 (r350601)
@@ -182,7 +182,6 @@ device ohci # OHCI USB interface
device ehci # EHCI USB interface (USB 2.0)
device ehci_mv # Marvell EHCI USB interface
device xhci # XHCI PCI->USB interface (USB 3.0)
-device xhci_mv # Marvell XHCI USB interface
device usb # USB Bus (required)
device ukbd # Keyboard
device umass # Disks/Mass storage - Requires scbus and da
Modified: stable/12/sys/conf/files.arm64
==============================================================================
--- stable/12/sys/conf/files.arm64 Mon Aug 5 17:43:44 2019 (r350600)
+++ stable/12/sys/conf/files.arm64 Mon Aug 5 17:54:08 2019 (r350601)
@@ -232,7 +232,8 @@ dev/usb/controller/ehci_mv.c optional ehci_mv fdt
dev/usb/controller/generic_ehci.c optional ehci acpi
dev/usb/controller/generic_ohci.c optional ohci fdt
dev/usb/controller/generic_usb_if.m optional ohci fdt
-dev/usb/controller/xhci_mv.c optional xhci_mv fdt
+dev/usb/controller/usb_nop_xceiv.c optional fdt ext_resources
+dev/usb/controller/generic_xhci.c optional xhci fdt
dev/vnic/mrml_bridge.c optional vnic fdt
dev/vnic/nic_main.c optional vnic pci
dev/vnic/nicvf_main.c optional vnic pci pci_iov
Copied: stable/12/sys/dev/usb/controller/generic_xhci.c (from r344634, head/sys/dev/usb/controller/generic_xhci.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/sys/dev/usb/controller/generic_xhci.c Mon Aug 5 17:54:08 2019 (r350601, copy of r344634, head/sys/dev/usb/controller/generic_xhci.c)
@@ -0,0 +1,243 @@
+/*-
+ * Copyright (c) 2015 Semihalf.
+ * Copyright (c) 2015 Stormshield.
+ * All rights reserved.
+ *
+ * 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_bus.h"
+
+#include <sys/stdint.h>
+#include <sys/stddef.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/sysctl.h>
+#include <sys/sx.h>
+#include <sys/unistd.h>
+#include <sys/priv.h>
+#include <sys/rman.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+
+#include <dev/usb/usb_core.h>
+#include <dev/usb/usb_busdma.h>
+#include <dev/usb/usb_process.h>
+#include <dev/usb/usb_util.h>
+
+#include <dev/usb/usb_controller.h>
+#include <dev/usb/usb_bus.h>
+#include <dev/usb/controller/xhci.h>
+#include <dev/usb/controller/xhcireg.h>
+
+#ifdef EXT_RESOURCES
+#include <dev/extres/phy/phy.h>
+#endif
+
+#define XHCI_HC_DEVSTR "Marvell Integrated USB 3.0 controller"
+#define XHCI_HC_VENDOR "Marvell"
+
+#define IS_DMA_32B 1
+
+static device_attach_t xhci_attach;
+static device_detach_t xhci_detach;
+
+static struct ofw_compat_data compat_data[] = {
+ {"marvell,armada-380-xhci", true},
+ {"marvell,armada3700-xhci", true},
+ {"marvell,armada-8k-xhci", true},
+ {"generic-xhci", true},
+ {NULL, false}
+};
+
+static int
+xhci_probe(device_t dev)
+{
+
+ if (!ofw_bus_status_okay(dev))
+ return (ENXIO);
+
+ if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
+ return (ENXIO);
+
+ device_set_desc(dev, XHCI_HC_DEVSTR);
+
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+xhci_attach(device_t dev)
+{
+ struct xhci_softc *sc = device_get_softc(dev);
+ int err = 0, rid = 0;
+#ifdef EXT_RESOURCES
+ phandle_t node;
+ phy_t phy;
+#endif
+
+ sc->sc_bus.parent = dev;
+ sc->sc_bus.devices = sc->sc_devices;
+ sc->sc_bus.devices_max = XHCI_MAX_DEVICES;
+
+ sc->sc_io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+ RF_ACTIVE);
+ if (sc->sc_io_res == NULL) {
+ device_printf(dev, "Failed to map memory\n");
+ xhci_detach(dev);
+ return (ENXIO);
+ }
+
+ sc->sc_io_tag = rman_get_bustag(sc->sc_io_res);
+ sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
+ sc->sc_io_size = rman_get_size(sc->sc_io_res);
+
+ sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+ RF_SHAREABLE | RF_ACTIVE);
+ if (sc->sc_irq_res == NULL) {
+ device_printf(dev, "Failed to allocate IRQ\n");
+ xhci_detach(dev);
+ return (ENXIO);
+ }
+
+#ifdef EXT_RESOURCES
+ node = ofw_bus_get_node(dev);
+ if (phy_get_by_ofw_property(dev, node, "usb-phy", &phy) == 0)
+ if (phy_enable(phy) != 0)
+ device_printf(dev, "Cannot enable phy\n");
+#endif
+
+ sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
+ if (sc->sc_bus.bdev == NULL) {
+ device_printf(dev, "Failed to add USB device\n");
+ xhci_detach(dev);
+ return (ENXIO);
+ }
+
+ device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
+
+ sprintf(sc->sc_vendor, XHCI_HC_VENDOR);
+ device_set_desc(sc->sc_bus.bdev, XHCI_HC_DEVSTR);
+
+ err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+ NULL, (driver_intr_t *)xhci_interrupt, sc, &sc->sc_intr_hdl);
+ if (err != 0) {
+ device_printf(dev, "Failed to setup error IRQ, %d\n", err);
+ sc->sc_intr_hdl = NULL;
+ xhci_detach(dev);
+ return (err);
+ }
+
+ err = xhci_init(sc, dev, IS_DMA_32B);
+ if (err != 0) {
+ device_printf(dev, "Failed to init XHCI, with error %d\n", err);
+ xhci_detach(dev);
+ return (ENXIO);
+ }
+
+ err = xhci_start_controller(sc);
+ if (err != 0) {
+ device_printf(dev, "Failed to start XHCI controller, with error %d\n", err);
+ xhci_detach(dev);
+ return (ENXIO);
+ }
+
+ err = device_probe_and_attach(sc->sc_bus.bdev);
+ if (err != 0) {
+ device_printf(dev, "Failed to initialize USB, with error %d\n", err);
+ xhci_detach(dev);
+ return (ENXIO);
+ }
+
+ return (0);
+}
+
+static int
+xhci_detach(device_t dev)
+{
+ struct xhci_softc *sc = device_get_softc(dev);
+ int err;
+
+ /* during module unload there are lots of children leftover */
+ device_delete_children(dev);
+
+ if (sc->sc_irq_res != NULL && sc->sc_intr_hdl != NULL) {
+ err = bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intr_hdl);
+ if (err != 0)
+ device_printf(dev, "Could not tear down irq, %d\n",
+ err);
+ sc->sc_intr_hdl = NULL;
+ }
+
+ if (sc->sc_irq_res != NULL) {
+ bus_release_resource(dev, SYS_RES_IRQ,
+ rman_get_rid(sc->sc_irq_res), sc->sc_irq_res);
+ sc->sc_irq_res = NULL;
+ }
+
+ if (sc->sc_io_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY,
+ rman_get_rid(sc->sc_io_res), sc->sc_io_res);
+ sc->sc_io_res = NULL;
+ }
+
+ xhci_uninit(sc);
+
+ return (0);
+}
+
+static device_method_t xhci_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, xhci_probe),
+ DEVMETHOD(device_attach, xhci_attach),
+ DEVMETHOD(device_detach, xhci_detach),
+ DEVMETHOD(device_suspend, bus_generic_suspend),
+ DEVMETHOD(device_resume, bus_generic_resume),
+ DEVMETHOD(device_shutdown, bus_generic_shutdown),
+
+ DEVMETHOD_END
+};
+
+static driver_t xhci_driver = {
+ "xhci",
+ xhci_methods,
+ sizeof(struct xhci_softc),
+};
+
+static devclass_t xhci_devclass;
+
+DRIVER_MODULE(xhci, simplebus, xhci_driver, xhci_devclass, 0, 0);
+MODULE_DEPEND(xhci, usb, 1, 1, 1);
Copied: stable/12/sys/dev/usb/controller/usb_nop_xceiv.c (from r344634, head/sys/dev/usb/controller/usb_nop_xceiv.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/sys/dev/usb/controller/usb_nop_xceiv.c Mon Aug 5 17:54:08 2019 (r350601, copy of r344634, head/sys/dev/usb/controller/usb_nop_xceiv.c)
@@ -0,0 +1,211 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2019 Rubicon Communications, LLC (Netgate)
+ *
+ * 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+
+#include <machine/bus.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/extres/clk/clk.h>
+#include <dev/extres/regulator/regulator.h>
+#include <dev/extres/phy/phy_usb.h>
+
+#include "phynode_if.h"
+
+struct usb_nop_xceiv_softc {
+ device_t dev;
+ regulator_t vcc_supply;
+ clk_t clk;
+ uint32_t clk_freq;
+};
+
+static struct ofw_compat_data compat_data[] = {
+ {"usb-nop-xceiv", 1},
+ {NULL, 0}
+};
+
+/* Phy class and methods. */
+static int usb_nop_xceiv_phy_enable(struct phynode *phy, bool enable);
+static phynode_usb_method_t usb_nop_xceiv_phynode_methods[] = {
+ PHYNODEMETHOD(phynode_enable, usb_nop_xceiv_phy_enable),
+
+ PHYNODEMETHOD_END
+};
+DEFINE_CLASS_1(usb_nop_xceiv_phynode, usb_nop_xceiv_phynode_class,
+ usb_nop_xceiv_phynode_methods,
+ sizeof(struct phynode_usb_sc), phynode_usb_class);
+
+static int
+usb_nop_xceiv_phy_enable(struct phynode *phynode, bool enable)
+{
+ struct usb_nop_xceiv_softc *sc;
+ device_t dev;
+ intptr_t phy;
+ int error;
+
+ dev = phynode_get_device(phynode);
+ phy = phynode_get_id(phynode);
+ sc = device_get_softc(dev);
+
+ if (phy != 0)
+ return (ERANGE);
+
+ /* Enable the phy clock */
+ if (sc->clk_freq != 0) {
+ if (enable) {
+ error = clk_set_freq(sc->clk, sc->clk_freq,
+ CLK_SET_ROUND_ANY);
+ if (error != 0) {
+ device_printf(dev, "Cannot set clock to %dMhz\n",
+ sc->clk_freq);
+ goto fail;
+ }
+
+ error = clk_enable(sc->clk);
+ } else
+ error = clk_disable(sc->clk);
+
+ if (error != 0) {
+ device_printf(dev, "Cannot %sable the clock\n",
+ enable ? "En" : "Dis");
+ goto fail;
+ }
+ }
+ if (sc->vcc_supply) {
+ if (enable)
+ error = regulator_enable(sc->vcc_supply);
+ else
+ error = regulator_disable(sc->vcc_supply);
+ if (error != 0) {
+ device_printf(dev, "Cannot %sable the regulator\n",
+ enable ? "En" : "Dis");
+ goto fail;
+ }
+ }
+
+ return (0);
+
+fail:
+ return (ENXIO);
+}
+
+static int
+usb_nop_xceiv_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, "USB NOP PHY");
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+usb_nop_xceiv_attach(device_t dev)
+{
+ struct usb_nop_xceiv_softc *sc;
+ struct phynode *phynode;
+ struct phynode_init_def phy_init;
+ phandle_t node;
+ int error;
+
+ sc = device_get_softc(dev);
+ sc->dev = dev;
+ node = ofw_bus_get_node(dev);
+
+ /* Parse the optional properties */
+ OF_getencprop(node, "clock-frequency", &sc->clk_freq, sizeof(uint32_t));
+
+ error = clk_get_by_ofw_name(dev, node, "main_clk", &sc->clk);
+ if (error != 0 && sc->clk_freq != 0) {
+ device_printf(dev, "clock property is mandatory if clock-frequency is present\n");
+ return (ENXIO);
+ }
+
+ regulator_get_by_ofw_property(dev, node, "vcc-supply", &sc->vcc_supply);
+
+ phy_init.id = 0;
+ phy_init.ofw_node = node;
+ phynode = phynode_create(dev, &usb_nop_xceiv_phynode_class,
+ &phy_init);
+ if (phynode == NULL) {
+ device_printf(dev, "failed to create USB NOP PHY\n");
+ return (ENXIO);
+ }
+ if (phynode_register(phynode) == NULL) {
+ device_printf(dev, "failed to create USB NOP PHY\n");
+ return (ENXIO);
+ }
+
+ OF_device_register_xref(OF_xref_from_node(node), dev);
+
+ return (0);
+}
+
+static int
+usb_nop_xceiv_detach(device_t dev)
+{
+
+ return (EBUSY);
+}
+
+static device_method_t usb_nop_xceiv_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, usb_nop_xceiv_probe),
+ DEVMETHOD(device_attach, usb_nop_xceiv_attach),
+ DEVMETHOD(device_detach, usb_nop_xceiv_detach),
+
+ DEVMETHOD_END
+};
+
+static devclass_t usb_nop_xceiv_devclass;
+
+static driver_t usb_nop_xceiv_driver = {
+ "usb_nop_xceiv",
+ usb_nop_xceiv_methods,
+ sizeof(struct usb_nop_xceiv_softc),
+};
+
+EARLY_DRIVER_MODULE(usb_nop_xceiv, simplebus, usb_nop_xceiv_driver,
+ usb_nop_xceiv_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
More information about the svn-src-all
mailing list