mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 14:10:43 +00:00
15dd941202
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>
55 lines
1.2 KiB
C
55 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Miscellaneous Snapdragon functionality
|
|
*
|
|
* (C) Copyright 2018 Ramon Fried <ramon.fried@gmail.com>
|
|
*
|
|
*/
|
|
|
|
#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) \
|
|
({ \
|
|
const int __size = size; \
|
|
const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
|
|
const int __off = 3 - ((start) / 32); \
|
|
const int __shft = (start) & 31; \
|
|
u32 __res; \
|
|
\
|
|
__res = resp[__off] >> __shft; \
|
|
if (__size + __shft > 32) \
|
|
__res |= resp[__off - 1] << ((32 - __shft) % 32); \
|
|
__res & __mask; \
|
|
})
|
|
|
|
u32 msm_board_serial(void)
|
|
{
|
|
struct mmc *mmc_dev;
|
|
|
|
mmc_dev = find_mmc_device(0);
|
|
if (!mmc_dev)
|
|
return 0;
|
|
|
|
if (mmc_init(mmc_dev))
|
|
return 0;
|
|
|
|
return UNSTUFF_BITS(mmc_dev->cid, 16, 32);
|
|
}
|
|
|
|
void msm_generate_mac_addr(u8 *mac)
|
|
{
|
|
/* use locally adminstrated pool */
|
|
mac[0] = 0x02;
|
|
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]);
|
|
}
|