Commit f3353b99 authored by Madalin Bucur's avatar Madalin Bucur Committed by David S. Miller
Browse files

fsl/fman: tolerate missing MAC address in device tree 



Allow the initialization of the MAC to be performed even if the
device tree does not provide a valid MAC address. Later a random
MAC address should be assigned by the Ethernet driver.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMadalin Bucur <madalin.bucur@oss.nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b995bde

drivers/net/ethernet/freescale/fman/fman_dtsec.c

+4 −6
Original line number Diff line number Diff line
@@ -514,8 +514,10 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg, 


	iowrite32be(0xffffffff, &regs->ievent);



	if (addr) {

		MAKE_ENET_ADDR_FROM_UINT64(addr, eth_addr);

		set_mac_address(regs, (u8 *)eth_addr);

	}



	/* HASH */

	for (i = 0; i < NUM_OF_HASH_REGS; i++) {
@@ -553,10 +555,6 @@ static int check_init_parameters(struct fman_mac *dtsec) 
		pr_err("1G MAC driver supports 1G or lower speeds\n");

		return -EINVAL;

	}

	if (dtsec->addr == 0) {

		pr_err("Ethernet MAC Must have a valid MAC Address\n");

		return -EINVAL;

	}

	if ((dtsec->dtsec_drv_param)->rx_prepend >

	    MAX_PACKET_ALIGNMENT) {

		pr_err("packetAlignmentPadding can't be > than %d\n",

drivers/net/ethernet/freescale/fman/fman_memac.c

+4 −6
Original line number Diff line number Diff line
@@ -596,10 +596,6 @@ static void setup_sgmii_internal_phy_base_x(struct fman_mac *memac) 


static int check_init_parameters(struct fman_mac *memac)

{

	if (memac->addr == 0) {

		pr_err("Ethernet MAC must have a valid MAC address\n");

		return -EINVAL;

	}

	if (!memac->exception_cb) {

		pr_err("Uninitialized exception handler\n");

		return -EINVAL;
@@ -1057,8 +1053,10 @@ int memac_init(struct fman_mac *memac) 
	}



	/* MAC Address */

	if (memac->addr != 0) {

		MAKE_ENET_ADDR_FROM_UINT64(memac->addr, eth_addr);

		add_addr_in_paddr(memac->regs, (u8 *)eth_addr, 0);

	}



	fixed_link = memac_drv_param->fixed_link;

drivers/net/ethernet/freescale/fman/fman_tgec.c

+4 −6
Original line number Diff line number Diff line
@@ -273,10 +273,6 @@ static int check_init_parameters(struct fman_mac *tgec) 
		pr_err("10G MAC driver only support 10G speed\n");

		return -EINVAL;

	}

	if (tgec->addr == 0) {

		pr_err("Ethernet 10G MAC Must have valid MAC Address\n");

		return -EINVAL;

	}

	if (!tgec->exception_cb) {

		pr_err("uninitialized exception_cb\n");

		return -EINVAL;
@@ -706,8 +702,10 @@ int tgec_init(struct fman_mac *tgec) 


	cfg = tgec->cfg;



	if (tgec->addr) {

		MAKE_ENET_ADDR_FROM_UINT64(tgec->addr, eth_addr);

		set_mac_address(tgec->regs, (u8 *)eth_addr);

	}



	/* interrupts */

	/* FM_10G_REM_N_LCL_FLT_EX_10GMAC_ERRATA_SW005 Errata workaround */

drivers/net/ethernet/freescale/fman/mac.c

+6 −7
Original line number Diff line number Diff line
@@ -724,11 +724,9 @@ static int mac_probe(struct platform_device *_of_dev) 


	/* Get the MAC address */

	mac_addr = of_get_mac_address(mac_node);

	if (IS_ERR(mac_addr)) {

		dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node);

		err = -EINVAL;

		goto _return_of_get_parent;

	}

	if (IS_ERR(mac_addr))

		dev_warn(dev, "of_get_mac_address(%pOF) failed\n", mac_node);

	else

		ether_addr_copy(mac_dev->addr, mac_addr);



	/* Get the port handles */
@@ -855,6 +853,7 @@ static int mac_probe(struct platform_device *_of_dev) 
	if (err < 0)

		dev_err(dev, "fman_set_mac_active_pause() = %d\n", err);



	if (!IS_ERR(mac_addr))

		dev_info(dev, "FMan MAC address: %pM\n", mac_dev->addr);



	priv->eth_dev = dpaa_eth_add_device(fman_id, mac_dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE