d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generic_ehci: Enable all phys and resets

Browse Source 
The number of phys and resets is not defined and it controller dependent
so enable/disable every one of them.
This commit is contained in:
Emmanuel Vadot 2019-10-01 22:20:03 +00:00
parent fbf39b9767
commit 150c95edfe
1 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sys/dev/usb/controller/generic_ohci.c
View File

@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include <dev/extres/clk/clk.h>
#include <dev/extres/hwreset/hwreset.h>
#include <dev/extres/phy/phy.h>
#include <dev/extres/phy/phy_usb.h>
#endif
#include "generic_usb_if.h"
@ -69,15 +70,23 @@ struct clk_list {
TAILQ_ENTRY(clk_list) next;
clk_t clk;
};
struct phy_list {
TAILQ_ENTRY(phy_list) next;
phy_t phy;
};
struct hwrst_list {
TAILQ_ENTRY(hwrst_list) next;
hwreset_t rst;
};
#endif
struct generic_ohci_softc {
ohci_softc_t ohci_sc;
#ifdef EXT_RESOURCES
hwreset_t rst;
phy_t phy;
TAILQ_HEAD(, clk_list) clk_list;
TAILQ_HEAD(, phy_list) phy_list;
TAILQ_HEAD(, hwrst_list) rst_list;
#endif
};
@ -106,8 +115,11 @@ generic_ohci_attach(device_t dev)
#ifdef EXT_RESOURCES
int off;
struct clk_list *clkp;
struct phy_list *phyp;
struct hwrst_list *rstp;
clk_t clk;
phandle_t node;
phy_t phy;
hwreset_t rst;
#endif
sc->ohci_sc.sc_bus.parent = dev;
@ -115,8 +127,6 @@ generic_ohci_attach(device_t dev)
sc->ohci_sc.sc_bus.devices_max = OHCI_MAX_DEVICES;
sc->ohci_sc.sc_bus.dma_bits = 32;
node = ofw_bus_get_node(dev);
/* get all DMA memory */
if (usb_bus_mem_alloc_all(&sc->ohci_sc.sc_bus,
USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) {
@ -176,22 +186,34 @@ generic_ohci_attach(device_t dev)
}
/* De-assert reset */
if (hwreset_get_by_ofw_idx(dev, 0, 0, &sc->rst) == 0) {
err = hwreset_deassert(sc->rst);
TAILQ_INIT(&sc->rst_list);
for (off = 0; hwreset_get_by_ofw_idx(dev, 0, off, &rst) == 0; off++) {
err = hwreset_deassert(rst);
if (err != 0) {
device_printf(dev, "Could not de-assert reset %d\n",
off);
device_printf(dev, "Could not de-assert reset\n");
goto error;
}
rstp = malloc(sizeof(*rstp), M_DEVBUF, M_WAITOK | M_ZERO);
rstp->rst = rst;
TAILQ_INSERT_TAIL(&sc->rst_list, rstp, next);
}
/* Enable phy */
if (phy_get_by_ofw_idx(dev, node, 0, &sc->phy) == 0) {
err = phy_enable(sc->phy);
TAILQ_INIT(&sc->phy_list);
for (off = 0; phy_get_by_ofw_idx(dev, 0, off, &phy) == 0; off++) {
err = phy_usb_set_mode(phy, PHY_USB_MODE_HOST);
if (err != 0) {
device_printf(dev, "Could not set phy to host mode\n");
goto error;
}
err = phy_enable(phy);
if (err != 0) {
device_printf(dev, "Could not enable phy\n");
goto error;
}
phyp = malloc(sizeof(*phyp), M_DEVBUF, M_WAITOK | M_ZERO);
phyp->phy = phy;
TAILQ_INSERT_TAIL(&sc->phy_list, phyp, next);
}
#endif
@ -219,6 +241,8 @@ generic_ohci_detach(device_t dev)
int err;
#ifdef EXT_RESOURCES
struct clk_list *clk, *clk_tmp;
struct phy_list *phy, *phy_tmp;
struct hwrst_list *rst, *rst_tmp;
#endif
/* during module unload there are lots of children leftover */
@ -260,11 +284,21 @@ generic_ohci_detach(device_t dev)
#ifdef EXT_RESOURCES
/* Disable phy */
if (sc->phy) {
err = phy_disable(sc->phy);
TAILQ_FOREACH_SAFE(phy, &sc->phy_list, next, phy_tmp) {
err = phy_disable(phy->phy);
if (err != 0)
device_printf(dev, "Could not disable phy\n");
phy_release(sc->phy);
phy_release(phy->phy);
TAILQ_REMOVE(&sc->phy_list, phy, next);
free(phy, M_DEVBUF);
}
/* Assert reset */
TAILQ_FOREACH_SAFE(rst, &sc->rst_list, next, rst_tmp) {
hwreset_assert(rst->rst);
hwreset_release(rst->rst);
TAILQ_REMOVE(&sc->rst_list, rst, next);
free(rst, M_DEVBUF);
}
/* Disable clock */
@ -280,14 +314,6 @@ generic_ohci_detach(device_t dev)
TAILQ_REMOVE(&sc->clk_list, clk, next);
free(clk, M_DEVBUF);
}
/* De-assert reset */
if (sc->rst) {
err = hwreset_assert(sc->rst);
if (err != 0)
device_printf(dev, "Could not assert reset\n");
hwreset_release(sc->rst);
}
#endif
if (GENERIC_USB_DEINIT(dev) != 0)