Commit 42404d8f authored by Mauri Sandberg's avatar Mauri Sandberg Committed by Jakub Kicinski
Browse files

net: mv643xx_eth: process retval from of_get_mac_address 



Obtaining a MAC address may be deferred in cases when the MAC is stored
in an NVMEM block, for example, and it may not be ready upon the first
retrieval attempt and return EPROBE_DEFER.

It is also possible that a port that does not rely on NVMEM has been
already created when getting the defer request. Thus, also the resources
allocated previously must be freed when doing a roll-back.

Fixes: 76723bca ("net: mv643xx_eth: add DT parsing support")
Signed-off-by: default avatarMauri Sandberg <maukka@ext.kapsi.fi>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220223142337.41757-1-maukka@ext.kapsi.fi


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent cd33bdcb

drivers/net/ethernet/marvell/mv643xx_eth.c

+14 −10
Original line number Diff line number Diff line
@@ -2704,6 +2704,16 @@ MODULE_DEVICE_TABLE(of, mv643xx_eth_shared_ids); 


static struct platform_device *port_platdev[3];



static void mv643xx_eth_shared_of_remove(void)

{

	int n;



	for (n = 0; n < 3; n++) {

		platform_device_del(port_platdev[n]);

		port_platdev[n] = NULL;

	}

}



static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev,

					  struct device_node *pnp)

{
@@ -2740,7 +2750,9 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, 
		return -EINVAL;

	}



	of_get_mac_address(pnp, ppd.mac_addr);

	ret = of_get_mac_address(pnp, ppd.mac_addr);

	if (ret)

		return ret;



	mv643xx_eth_property(pnp, "tx-queue-size", ppd.tx_queue_size);

	mv643xx_eth_property(pnp, "tx-sram-addr", ppd.tx_sram_addr);
@@ -2804,21 +2816,13 @@ static int mv643xx_eth_shared_of_probe(struct platform_device *pdev) 
		ret = mv643xx_eth_shared_of_add_port(pdev, pnp);

		if (ret) {

			of_node_put(pnp);

			mv643xx_eth_shared_of_remove();

			return ret;

		}

	}

	return 0;

}



static void mv643xx_eth_shared_of_remove(void)

{

	int n;



	for (n = 0; n < 3; n++) {

		platform_device_del(port_platdev[n]);

		port_platdev[n] = NULL;

	}

}

#else

static inline int mv643xx_eth_shared_of_probe(struct platform_device *pdev)

{