Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6970505 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by David S. Miller
Browse files

net/macb: fix capabilities configuration 



Capabilities configuration by macb_configure_caps() was moved far too late by
421d9df0 (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: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da120112

drivers/net/ethernet/cadence/macb.c

+18 −18
Original line number Diff line number Diff line
@@ -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)