On Wed, May 23, 2018 at 1:21 AM, Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:
> On Tue, May 22, 2018 at 04:05:13PM -0700, Andrey Smirnov wrote:
>> For reasons unclear VFxxx port of U-Boot chose to store MAC address in
>> OCOTP using a layout that is incompatible with rest of i.MX
>> world (both in U-Boot and Barebox). Unfortunately for us, that means
>> that there are a number of boards out there that have had their MAC
>> addresses programmed using U-Boot and in order to properly support
>> those boards we need to change VFxxx port of Barebox to be compatible.
>>
>> Since the number of Barebox users on VFxx is in single digits, just
>> chage the layout to that of U-Boot without trying to make this a
>> configurable option.
>>
>> Cc: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
>> Tested-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
>> Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
>> ---
>> arch/arm/mach-imx/ocotp.c | 64 +++++++++++++++++++++++++++++++++------
>> 1 file changed, 54 insertions(+), 10 deletions(-)
>>
>> diff --git a/arch/arm/mach-imx/ocotp.c b/arch/arm/mach-imx/ocotp.c
>> index d5e6b3d3e..a70adee37 100644
>> --- a/arch/arm/mach-imx/ocotp.c
>> +++ b/arch/arm/mach-imx/ocotp.c
>> @@ -76,9 +76,16 @@
>> #define MAX_MAC_OFFSETS 2
>> #define MAC_BYTES 8
>>
>> +enum imx_ocotp_format_mac_direction {
>> + OCOTP_HW_TO_MAC,
>> + OCOTP_MAC_TO_HW,
>> +};
>> +
>> struct imx_ocotp_data {
>> int num_regs;
>> u32 (*addr_to_offset)(u32 addr);
>> + void (*format_mac)(u8 *dst, const u8 *src,
>> + enum imx_ocotp_format_mac_direction dir);
>> u8 mac_offsets[MAX_MAC_OFFSETS];
>> u8 mac_offsets_num;
>> };
>> @@ -87,6 +94,7 @@ struct ocotp_priv_ethaddr {
>> char value[MAC_BYTES];
>> struct regmap *map;
>> u8 offset;
>> + const struct imx_ocotp_data *data;
>> };
>>
>> struct ocotp_priv {
>> @@ -368,16 +376,46 @@ bool imx_ocotp_sense_enable(bool enable)
>> return old_value;
>> }
>>
>> -static void memreverse(void *dest, const void *src, size_t n)
>> +static void imx_ocotp_format_mac(u8 *dst, const u8 *src,
>> + enum imx_ocotp_format_mac_direction dir)
>> {
>> - char *destp = dest;
>> - const char *srcp = src + n - 1;
>> + /*
>> + * This transformation is symmetic, so we don't care about the
>> + * value of 'dir'.
>> + */
>> + dst[5] = src[0];
>> + dst[4] = src[1];
>> + dst[3] = src[2];
>> + dst[2] = src[3];
>> + dst[1] = src[4];
>> + dst[0] = src[5];
>> +}
>>
>> - while(n--)
>> - *destp++ = *srcp--;
>> +static void vf610_ocotp_format_mac(u8 *dst, const u8 *src,
>> + enum imx_ocotp_format_mac_direction dir)
>> +{
>> + switch (dir) {
>> + case OCOTP_HW_TO_MAC:
>> + dst[1] = src[0];
>> + dst[0] = src[1];
>> + dst[5] = src[4];
>> + dst[4] = src[5];
>> + dst[3] = src[6];
>> + dst[2] = src[7];
>> + break;
>> + case OCOTP_MAC_TO_HW:
>> + dst[0] = src[1];
>> + dst[1] = dst[0];
>> + dst[4] = dst[5];
>> + dst[5] = dst[4];
>> + dst[6] = dst[3];
>> + dst[7] = dst[2];
>> + break;
>
> only src[1] used? This looks wrong.
Yeah, that's wrong for sure. Will fix in v2.
Thanks,
Andrey Smrinov
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
