lkml.org 
[lkml]   [2015]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/8] net/macb: fix capabilities configuration
    Date
    Capabilities configuration by macb_configure_caps() was moved far too late by
    421d9df0628b (net/macb: merge at91_ether driver into macb driver) which would
    lead to badly configured hardware.
    So, move this function to early probe and modify its prototype to re-gain its
    original behavior.
    DT data retrieval is also moved to simplify the probe code flow.

    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com>
    Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
    ---

    Changes in v2: None

    drivers/net/ethernet/cadence/macb.c | 36 ++++++++++++++++++------------------
    1 file changed, 18 insertions(+), 18 deletions(-)

    diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
    index 68d59b3900b1..680e1eebb7ea 100644
    --- a/drivers/net/ethernet/cadence/macb.c
    +++ b/drivers/net/ethernet/cadence/macb.c
    @@ -2132,10 +2132,13 @@ static const struct net_device_ops macb_netdev_ops = {
    * Configure peripheral capacities according to device tree
    * and integration options used
    */
    -static void macb_configure_caps(struct macb *bp)
    +static void macb_configure_caps(struct macb *bp, const struct macb_config *dt_conf)
    {
    u32 dcfg;

    + if (dt_conf)
    + bp->caps = dt_conf->caps;
    +
    if (MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2)
    bp->caps |= MACB_CAPS_MACB_IS_GEM;

    @@ -2313,9 +2316,6 @@ static int macb_init(struct platform_device *pdev)

    macb_or_gem_writel(bp, USRIO, val);

    - /* setup capacities */
    - macb_configure_caps(bp);
    -
    /* Set MII management clock divider */
    val = macb_mdc_clk_div(bp);
    val |= macb_dbw(bp);
    @@ -2720,6 +2720,20 @@ static int macb_probe(struct platform_device *pdev)
    bp->queue_mask = queue_mask;
    spin_lock_init(&bp->lock);

    + if (np) {
    + const struct of_device_id *match;
    +
    + match = of_match_node(macb_dt_ids, np);
    + if (match && match->data) {
    + macb_config = match->data;
    + bp->dma_burst_length = macb_config->dma_burst_length;
    + init = macb_config->init;
    + }
    + }
    +
    + /* setup capacities */
    + macb_configure_caps(bp, macb_config);
    +
    platform_set_drvdata(pdev, dev);

    dev->irq = platform_get_irq(pdev, 0);
    @@ -2743,20 +2757,6 @@ static int macb_probe(struct platform_device *pdev)
    bp->phy_interface = err;
    }

    - if (np) {
    - const struct of_device_id *match;
    -
    - match = of_match_node(macb_dt_ids, np);
    - if (match)
    - macb_config = match->data;
    - }
    -
    - if (macb_config) {
    - bp->caps = macb_config->caps;
    - bp->dma_burst_length = macb_config->dma_burst_length;
    - init = macb_config->init;
    - }
    -
    /* IP specific init */
    err = init(pdev);
    if (err)
    --
    2.1.3


    \
     
     \ /
      Last update: 2015-03-31 15:41    [W:5.533 / U:1.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site