Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: mach-snapdrgon: misc: Simplify msm_generate_mac_addr()

Browse source 
The logic in msm_generate_mac_addr() was originally taken from the LK
bootloader where the serial number is a string and must be parsed first.
However, in U-Boot msm_board_serial() returns an u32 and
msm_generate_mac_addr() has quite complicated code that will first
print it as a hex string and then immediately parse it again.

What this function actually does at the end is to put the serial number
encoded as big endian (the order used for the hex string) into the u8 *mac.
Use put_unaligned_be32() to do that with bit shifts instead of going
through the string format.

This should be slightly more efficient and cleaner but does not result
in any functional difference.

Cc: Ramon Fried <rfried.dev@gmail.com>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Stephan Gerhold 2021-08-03 12:12:38 +02:00 committed by Tom Rini
parent 1eb006249e
commit 15dd941202
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/arm/mach-snapdragon/misc.c
View file

@ -9,6 +9,7 @@
#include <common.h>
#include <mmc.h>
#include <asm/arch/misc.h>
#include <asm/unaligned.h>
/* UNSTUFF_BITS macro taken from Linux Kernel: drivers/mmc/core/sd.c */
#define UNSTUFF_BITS(resp, start, size) \
@ -41,16 +42,14 @@ u32 msm_board_serial(void)
void msm_generate_mac_addr(u8 *mac)
{
int i;
char sn[9];
snprintf(sn, 9, "%08x", msm_board_serial());
/* fill in the mac with serialno, use locally adminstrated pool */
/* use locally adminstrated pool */
mac[0] = 0x02;
mac[1] = 00;
for (i = 3; i >= 0; i--) {
mac[i + 2] = hextoul(&sn[2 * i], NULL);
sn[2 * i] = 0;
}
mac[1] = 0x00;
/*
* Put the 32-bit serial number in the last 32-bit of the MAC address.
* Use big endian order so it is consistent with the serial number
* written as a hexadecimal string, e.g. 0x1234abcd -> 02:00:12:34:ab:cd
*/
put_unaligned_be32(msm_board_serial(), &mac[2]);
}