lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 06/12] usb: dwc2/gadget: ensure that all fifos have correct memory buffers
    Date
    From: Marek Szyprowski <m.szyprowski@samsung.com>

    Print warning if FIFOs are configured in such a way that they don't fit
    into the SPRAM available on the s3c hsotg module.

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
    ---
    drivers/usb/dwc2/core.h | 1 +
    drivers/usb/dwc2/gadget.c | 15 ++++++++++-----
    2 files changed, 11 insertions(+), 5 deletions(-)

    diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
    index 1efd10c..067390e 100644
    --- a/drivers/usb/dwc2/core.h
    +++ b/drivers/usb/dwc2/core.h
    @@ -194,6 +194,7 @@ struct s3c_hsotg {
    struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsotg_supply_names)];

    u32 phyif;
    + int fifo_mem;
    unsigned int dedicated_fifos:1;
    unsigned char num_of_eps;

    diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
    index 95b6dcb..21d21de 100644
    --- a/drivers/usb/dwc2/gadget.c
    +++ b/drivers/usb/dwc2/gadget.c
    @@ -194,6 +194,8 @@ static void s3c_hsotg_init_fifo(struct s3c_hsotg *hsotg)
    for (ep = 1; ep <= 15; ep++) {
    val = addr;
    val |= size << FIFOSIZE_DEPTH_SHIFT;
    + WARN_ONCE(addr + size > hsotg->fifo_mem,
    + "insufficient fifo memory");
    addr += size;

    writel(val, hsotg->regs + DPTXFSIZN(ep));
    @@ -3030,19 +3032,22 @@ static void s3c_hsotg_initep(struct s3c_hsotg *hsotg,
    */
    static void s3c_hsotg_hw_cfg(struct s3c_hsotg *hsotg)
    {
    - u32 cfg2, cfg4;
    + u32 cfg2, cfg3, cfg4;
    /* check hardware configuration */

    cfg2 = readl(hsotg->regs + 0x48);
    hsotg->num_of_eps = (cfg2 >> 10) & 0xF;

    - dev_info(hsotg->dev, "EPs:%d\n", hsotg->num_of_eps);
    + cfg3 = readl(hsotg->regs + 0x4C);
    + hsotg->fifo_mem = (cfg3 >> 16);

    cfg4 = readl(hsotg->regs + 0x50);
    hsotg->dedicated_fifos = (cfg4 >> 25) & 1;

    - dev_info(hsotg->dev, "%s fifos\n",
    - hsotg->dedicated_fifos ? "dedicated" : "shared");
    + dev_info(hsotg->dev, "EPs: %d, %s fifos, %d entries in SPRAM\n",
    + hsotg->num_of_eps,
    + hsotg->dedicated_fifos ? "dedicated" : "shared",
    + hsotg->fifo_mem);
    }

    /**
    @@ -3495,8 +3500,8 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
    s3c_hsotg_phy_enable(hsotg);

    s3c_hsotg_corereset(hsotg);
    - s3c_hsotg_init(hsotg);
    s3c_hsotg_hw_cfg(hsotg);
    + s3c_hsotg_init(hsotg);

    /* hsotg->num_of_eps holds number of EPs other than ep0 */

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-16 13:01    [W:4.060 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site