[U-Boot] [PATCH 12/16] usb: dwc2_udc_otg: Add tx_fifo_sz array support

Lukasz Majewski
2019-04-08T21:55:56Z

On Fri, 29 Mar 2019 15:42:20 +0100
Patrick Delaunay <patrick.delaunay@st.com> wrote:

> From: Patrice Chotard <patrice.chotard@st.com>
>
> All TX fifo size can be different, add tx_fifo_sz_array[]
> into dwc2_plat_otg_data to be able to set them.
>
> tx_fifo_sz_array[] is 17 Bytes long and can contains max 16
> tx fifo size (synopsys IP supports max 16 IN endpoints).
> First entry of tx_fifo_sz_array[] is the number of valid
> fifo size the array contains.
>
> In case of tx_fifo_sz_array[] doesn't contains the same
> number of element than max hardware endpoint, display
> a warning message.
>
> Compatibility with board which doesn't use tx_fifo_sz_array[]
> (Rockchip rk322x/rk3128/rv1108/rk3288/rk3036) is kept.
>
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
> drivers/usb/gadget/dwc2_udc_otg.c | 14 ++++++++++++--
> include/usb/dwc2_udc.h | 3 +++
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/gadget/dwc2_udc_otg.c
> b/drivers/usb/gadget/dwc2_udc_otg.c index 5c7d131..106dec5 100644
> --- a/drivers/usb/gadget/dwc2_udc_otg.c
> +++ b/drivers/usb/gadget/dwc2_udc_otg.c
> @@ -457,6 +457,7 @@ static void reconfig_usbd(struct dwc2_udc *dev)
> uint32_t dflt_gusbcfg;
> uint32_t rx_fifo_sz, tx_fifo_sz, np_tx_fifo_sz;
> u32 max_hw_ep;
> + int pdata_hw_ep;
>
> debug("Reseting OTG controller\n");
>
> @@ -542,11 +543,20 @@ static void reconfig_usbd(struct dwc2_udc *dev)
> /* retrieve the number of IN Endpoints (excluding ep0) */
> max_hw_ep = (readl(&reg->ghwcfg4) & GHWCFG4_NUM_IN_EPS_MASK)
> >> GHWCFG4_NUM_IN_EPS_SHIFT;
> + pdata_hw_ep = dev->pdata->tx_fifo_sz_nb;
> +
> + /* tx_fifo_sz_nb should equal to number of IN Endpoint */
> + if (pdata_hw_ep && max_hw_ep != pdata_hw_ep)
> + pr_warn("Got %d hw endpoint but %d tx-fifo-size in
> array !!\n",
> + max_hw_ep, pdata_hw_ep);
> +
> + for (i = 0; i < max_hw_ep; i++) {
> + if (pdata_hw_ep)
> + tx_fifo_sz = dev->pdata->tx_fifo_sz_array[i];
>
> - for (i = 0; i < max_hw_ep; i++)
> writel((rx_fifo_sz + np_tx_fifo_sz + (tx_fifo_sz *
> i)) | tx_fifo_sz << 16, &reg->dieptxf[i]);
> -
> + }
> /* Flush the RX FIFO */
> writel(RX_FIFO_FLUSH, &reg->grstctl);
> while (readl(&reg->grstctl) & RX_FIFO_FLUSH)
> diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
> index 8a426b6..369f6fb 100644
> --- a/include/usb/dwc2_udc.h
> +++ b/include/usb/dwc2_udc.h
> @@ -9,6 +9,7 @@
> #define __DWC2_USB_GADGET
>
> #define PHY0_SLEEP (1 << 5)
> +#define DWC2_MAX_HW_ENDPOINTS 16
>
> struct dwc2_plat_otg_data {
> void *priv;
> @@ -22,6 +23,8 @@ struct dwc2_plat_otg_data {
> unsigned int rx_fifo_sz;
> unsigned int np_tx_fifo_sz;
> unsigned int tx_fifo_sz;
> + unsigned int tx_fifo_sz_array[DWC2_MAX_HW_ENDPOINTS];
> + unsigned char tx_fifo_sz_nb;
> bool force_b_session_valid;
> };
>

Reviewed-by: Lukasz Majewski <lukma@denx.de>

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190408/5e44c485/attachment.sig>