random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-19 15:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

KM/IVM: split the IVM reading and parsing in 2 parts

Browse Source 
This allows to first read the IVM content (earlier in the boot sequence)
and define the ethaddr env variable thanks to the ivm_read_eepromi().
Later, the IVM content can be parsed and used to define some hush
variables, when the hush subsystem is available thanks to
ivm_analyze_eeprom().

To avoid the HW read to happen twice, the buffer passed to
ivm_read_eeprom() has to be reused by ivm_analyze_eeprom (and thus
allocated before calling ivm_read_eeprom()).

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
This commit is contained in:
Valentin Longchamp 2015-02-10 17:10:13 +01:00 committed by Tom Rini
parent b9ea0c3a20
commit 16ac90c7ee
2 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/keymile/common/common.h
View File

@ -127,6 +127,8 @@ struct bfticu_iomap {
int ethernet_present(void); int ethernet_present(void);
int ivm_read_eeprom(void); int ivm_read_eeprom(void);
int ivm_simple_read_eeprom(unsigned char *buf, int len);
int ivm_analyze_eeprom(unsigned char *buf, int len);
int trigger_fpga_config(void); int trigger_fpga_config(void);
int wait_for_fpga_config(void); int wait_for_fpga_config(void);

86
board/keymile/common/ivm.c
View File

@ -10,6 +10,8 @@
#include <i2c.h> #include <i2c.h>
#include "common.h" #include "common.h"
#define MAC_STR_SZ 20
static int ivm_calc_crc(unsigned char *buf, int len) static int ivm_calc_crc(unsigned char *buf, int len)
{ {
const unsigned short crc_tab[16] = { const unsigned short crc_tab[16] = {
@ -185,45 +187,37 @@ static int ivm_check_crc(unsigned char *buf, int block)
return 0; return 0;
} }
static int calculate_mac_offset(unsigned char *valbuf, unsigned char *buf, /* take care of the possible MAC address offset and the IVM content offset */
static int process_mac(unsigned char *valbuf, unsigned char *buf,
int offset) int offset)
{ {
unsigned char mac[6];
unsigned long val = (buf[4] << 16) + (buf[5] << 8) + buf[6]; unsigned long val = (buf[4] << 16) + (buf[5] << 8) + buf[6];
if (offset == 0) /* use an intermediate buffer, to not change IVM content
return 0; * MAC address is at offset 1
*/
memcpy(mac, buf+1, 6);
val += offset; if (offset) {
buf[4] = (val >> 16) & 0xff; val += offset;
buf[5] = (val >> 8) & 0xff; mac[3] = (val >> 16) & 0xff;
buf[6] = val & 0xff; mac[4] = (val >> 8) & 0xff;
sprintf((char *)valbuf, "%pM", buf + 1); mac[5] = val & 0xff;
}
sprintf((char *)valbuf, "%pM", mac);
return 0; return 0;
} }
static int ivm_analyze_block2(unsigned char *buf, int len) static int ivm_analyze_block2(unsigned char *buf, int len)
{ {
unsigned char valbuf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN]; unsigned char valbuf[MAC_STR_SZ];
unsigned long count; unsigned long count;
/* IVM_MAC Adress begins at offset 1 */ /* IVM_MAC Adress begins at offset 1 */
sprintf((char *)valbuf, "%pM", buf + 1); sprintf((char *)valbuf, "%pM", buf + 1);
ivm_set_value("IVM_MacAddress", (char *)valbuf); ivm_set_value("IVM_MacAddress", (char *)valbuf);
/* if an offset is defined, add it */
calculate_mac_offset(buf, valbuf, CONFIG_PIGGY_MAC_ADRESS_OFFSET);
#ifdef MACH_TYPE_KM_KIRKWOOD
setenv((char *)"ethaddr", (char *)valbuf);
#else
if (getenv("ethaddr") == NULL)
setenv((char *)"ethaddr", (char *)valbuf);
#endif
#ifdef CONFIG_KMVECT1
/* KMVECT1 has two ethernet interfaces */
if (getenv("eth1addr") == NULL) {
calculate_mac_offset(buf, valbuf, 1);
setenv((char *)"eth1addr", (char *)valbuf);
}
#endif
/* IVM_MacCount */ /* IVM_MacCount */
count = (buf[10] << 24) + count = (buf[10] << 24) +
(buf[11] << 16) + (buf[11] << 16) +
@ -236,7 +230,7 @@ static int ivm_analyze_block2(unsigned char *buf, int len)
return 0; return 0;
} }
static int ivm_analyze_eeprom(unsigned char *buf, int len) int ivm_analyze_eeprom(unsigned char *buf, int len)
{ {
unsigned short val; unsigned short val;
unsigned char valbuf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN]; unsigned char valbuf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN];
@ -296,6 +290,48 @@ static int ivm_analyze_eeprom(unsigned char *buf, int len)
return 0; return 0;
} }
static int ivm_populate_env(unsigned char *buf, int len)
{
unsigned char *page2;
unsigned char valbuf[MAC_STR_SZ];
/* do we have the page 2 filled ? if not return */
if (ivm_check_crc(buf, 2))
return 0;
page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN*2];
/* if an offset is defined, add it */
process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET);
if (getenv("ethaddr") == NULL)
setenv((char *)"ethaddr", (char *)valbuf);
#ifdef CONFIG_KMVECT1
/* KMVECT1 has two ethernet interfaces */
if (getenv("eth1addr") == NULL) {
process_mac(valbuf, page2, 1);
setenv((char *)"eth1addr", (char *)valbuf);
}
#endif
return 0;
}
int ivm_simple_read_eeprom(unsigned char *buf, int len)
{
int ret;
i2c_set_bus_num(CONFIG_KM_IVM_BUS);
/* add deblocking here */
i2c_make_abort();
ret = i2c_read(CONFIG_SYS_IVM_EEPROM_ADR, 0, 1, buf, len);
if (ret != 0) {
printf("Error reading EEprom\n");
return -2;
}
return ivm_populate_env(buf, len);
}
int ivm_read_eeprom(void) int ivm_read_eeprom(void)
{ {
uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN];