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

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

Merge branch 'renesas-read-mac' 



Sergei Shtylyov says:

====================
Renesas: read MAC address registers only once

Here's 2 patches against DaveM's 'net-next.git' repo. Here we optimize
the MAC address register reading (left over from a bootloader).

[1/2] ravb: read MAC address registers only once
[2/2] sh_eth: read MAC address registers only once
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 04f96468 37742f02

drivers/net/ethernet/renesas/ravb_main.c

+9 −6
Original line number Diff line number Diff line
@@ -115,12 +115,15 @@ static void ravb_read_mac_address(struct net_device *ndev, const u8 *mac) 
	if (mac) {

		ether_addr_copy(ndev->dev_addr, mac);

	} else {

		ndev->dev_addr[0] = (ravb_read(ndev, MAHR) >> 24);

		ndev->dev_addr[1] = (ravb_read(ndev, MAHR) >> 16) & 0xFF;

		ndev->dev_addr[2] = (ravb_read(ndev, MAHR) >> 8) & 0xFF;

		ndev->dev_addr[3] = (ravb_read(ndev, MAHR) >> 0) & 0xFF;

		ndev->dev_addr[4] = (ravb_read(ndev, MALR) >> 8) & 0xFF;

		ndev->dev_addr[5] = (ravb_read(ndev, MALR) >> 0) & 0xFF;

		u32 mahr = ravb_read(ndev, MAHR);

		u32 malr = ravb_read(ndev, MALR);



		ndev->dev_addr[0] = (mahr >> 24) & 0xFF;

		ndev->dev_addr[1] = (mahr >> 16) & 0xFF;

		ndev->dev_addr[2] = (mahr >>  8) & 0xFF;

		ndev->dev_addr[3] = (mahr >>  0) & 0xFF;

		ndev->dev_addr[4] = (malr >>  8) & 0xFF;

		ndev->dev_addr[5] = (malr >>  0) & 0xFF;

	}

}

drivers/net/ethernet/renesas/sh_eth.c

+9 −6
Original line number Diff line number Diff line
@@ -989,12 +989,15 @@ static void read_mac_address(struct net_device *ndev, unsigned char *mac) 
	if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) {

		memcpy(ndev->dev_addr, mac, ETH_ALEN);

	} else {

		ndev->dev_addr[0] = (sh_eth_read(ndev, MAHR) >> 24);

		ndev->dev_addr[1] = (sh_eth_read(ndev, MAHR) >> 16) & 0xFF;

		ndev->dev_addr[2] = (sh_eth_read(ndev, MAHR) >> 8) & 0xFF;

		ndev->dev_addr[3] = (sh_eth_read(ndev, MAHR) & 0xFF);

		ndev->dev_addr[4] = (sh_eth_read(ndev, MALR) >> 8) & 0xFF;

		ndev->dev_addr[5] = (sh_eth_read(ndev, MALR) & 0xFF);

		u32 mahr = sh_eth_read(ndev, MAHR);

		u32 malr = sh_eth_read(ndev, MALR);



		ndev->dev_addr[0] = (mahr >> 24) & 0xFF;

		ndev->dev_addr[1] = (mahr >> 16) & 0xFF;

		ndev->dev_addr[2] = (mahr >>  8) & 0xFF;

		ndev->dev_addr[3] = (mahr >>  0) & 0xFF;

		ndev->dev_addr[4] = (malr >>  8) & 0xFF;

		ndev->dev_addr[5] = (malr >>  0) & 0xFF;

	}

}