Commit e2f5cb72 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'QorIQ-DPAA-Use-random-MAC-address-when-none-is-given' 



Sascha Hauer says:

====================
QorIQ DPAA: Use random MAC address when none is given

Use random MAC addresses when they are not provided in the device tree.
Tested on LS1046ARDB.

Changes in v3:
 addressed all MAC types, removed some redundant code in dtsec in
 the process
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 896328fe cbb961ca

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+14 −2
Original line number Diff line number Diff line
@@ -233,8 +233,20 @@ static int dpaa_netdev_init(struct net_device *net_dev, 
	net_dev->features |= net_dev->hw_features;

	net_dev->vlan_features = net_dev->features;



	if (is_valid_ether_addr(mac_addr)) {

		memcpy(net_dev->perm_addr, mac_addr, net_dev->addr_len);

		memcpy(net_dev->dev_addr, mac_addr, net_dev->addr_len);

	} else {

		eth_hw_addr_random(net_dev);

		err = priv->mac_dev->change_addr(priv->mac_dev->fman_mac,

			(enet_addr_t *)net_dev->dev_addr);

		if (err) {

			dev_err(dev, "Failed to set random MAC address\n");

			return -EINVAL;

		}

		dev_info(dev, "Using random MAC address: %pM\n",

			 net_dev->dev_addr);

	}



	net_dev->ethtool_ops = &dpaa_ethtool_ops;

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

+21 −29
Original line number Diff line number Diff line
@@ -366,13 +366,26 @@ static void set_dflts(struct dtsec_cfg *cfg) 
	cfg->maximum_frame = DEFAULT_MAXIMUM_FRAME;

}



static void set_mac_address(struct dtsec_regs __iomem *regs, u8 *adr)

{

	u32 tmp;



	tmp = (u32)((adr[5] << 24) |

		    (adr[4] << 16) | (adr[3] << 8) | adr[2]);

	iowrite32be(tmp, &regs->macstnaddr1);



	tmp = (u32)((adr[1] << 24) | (adr[0] << 16));

	iowrite32be(tmp, &regs->macstnaddr2);

}



static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg,

		phy_interface_t iface, u16 iface_speed, u8 *macaddr,

		phy_interface_t iface, u16 iface_speed, u64 addr,

		u32 exception_mask, u8 tbi_addr)

{

	bool is_rgmii, is_sgmii, is_qsgmii;

	int i;

	enet_addr_t eth_addr;

	u32 tmp;

	int i;



	/* Soft reset */

	iowrite32be(MACCFG1_SOFT_RESET, &regs->maccfg1);
@@ -501,12 +514,10 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg, 


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



	tmp = (u32)((macaddr[5] << 24) |

		    (macaddr[4] << 16) | (macaddr[3] << 8) | macaddr[2]);

	iowrite32be(tmp, &regs->macstnaddr1);



	tmp = (u32)((macaddr[1] << 24) | (macaddr[0] << 16));

	iowrite32be(tmp, &regs->macstnaddr2);

	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++) {
@@ -519,18 +530,6 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg, 
	return 0;

}



static void set_mac_address(struct dtsec_regs __iomem *regs, u8 *adr)

{

	u32 tmp;



	tmp = (u32)((adr[5] << 24) |

		    (adr[4] << 16) | (adr[3] << 8) | adr[2]);

	iowrite32be(tmp, &regs->macstnaddr1);



	tmp = (u32)((adr[1] << 24) | (adr[0] << 16));

	iowrite32be(tmp, &regs->macstnaddr2);

}



static void set_bucket(struct dtsec_regs __iomem *regs, int bucket,

		       bool enable)

{
@@ -556,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",
@@ -1391,9 +1386,8 @@ int dtsec_init(struct fman_mac *dtsec) 
{

	struct dtsec_regs __iomem *regs = dtsec->regs;

	struct dtsec_cfg *dtsec_drv_param;

	int err;

	u16 max_frm_ln;

	enet_addr_t eth_addr;

	int err;



	if (is_init_done(dtsec->dtsec_drv_param))

		return -EINVAL;
@@ -1410,10 +1404,8 @@ int dtsec_init(struct fman_mac *dtsec) 


	dtsec_drv_param = dtsec->dtsec_drv_param;



	MAKE_ENET_ADDR_FROM_UINT64(dtsec->addr, eth_addr);



	err = init(dtsec->regs, dtsec_drv_param, dtsec->phy_if,

		   dtsec->max_speed, (u8 *)eth_addr, dtsec->exceptions,

		   dtsec->max_speed, dtsec->addr, dtsec->exceptions,

		   dtsec->tbiphy->mdio.addr);

	if (err) {

		free_init_resources(dtsec);

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