GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: cros: include mac addresses in coreboot table 

Pass MAC addresses found in coreboot table into lib_sysinfo.

BUG=chrome-os-partner:32152
TEST=with all changes in place MAC addresses are properly inserted
     into the kernel device tree.

Change-Id: I6b13c1c2c246362256abce3efa4a97b355647ef8
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e2fe74f86b4ed43eb8a3c9d99055afc5d6fb7b78
Original-Change-Id: I1d0bd437fb27fabd14b9ba1fb5415586cd8847bb
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/219444
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8751
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Vadim Bendebury 2014-09-22 19:36:28 -07:00 committed by Patrick Georgi
parent 864ec8c488
commit b7d7412261
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
payloads/libpayload/include/coreboot_tables.h
View File

@ -224,6 +224,18 @@ struct cb_x86_rom_mtrr {
uint32_t index; uint32_t index;
}; };
#define CB_TAG_MAC_ADDRS 0x0026
struct mac_address {
uint8_t mac_addr[6];
uint8_t pad[2]; /* Pad it to 8 bytes to keep it simple. */
};
struct cb_macs {
uint32_t tag;
uint32_t size;
uint32_t count;
struct mac_address mac_addrs[0];
};
#define CB_TAG_CMOS_OPTION_TABLE 0x00c8 #define CB_TAG_CMOS_OPTION_TABLE 0x00c8
struct cb_cmos_option_table { struct cb_cmos_option_table {

5
payloads/libpayload/include/sysinfo.h
View File

@ -35,6 +35,9 @@
/* Allow a maximum of 8 GPIOs */ /* Allow a maximum of 8 GPIOs */
#define SYSINFO_MAX_GPIOS 8 #define SYSINFO_MAX_GPIOS 8
/* Up to 10 MAC addresses */
#define SYSINFO_MAX_MACS 10
#include <coreboot_tables.h> #include <coreboot_tables.h>
struct cb_serial; struct cb_serial;
@ -86,6 +89,8 @@ struct sysinfo_t {
#ifdef CONFIG_LP_CHROMEOS #ifdef CONFIG_LP_CHROMEOS
int num_gpios; int num_gpios;
struct cb_gpio gpios[SYSINFO_MAX_GPIOS]; struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
int num_macs;
struct mac_address macs[SYSINFO_MAX_MACS];
#endif #endif
unsigned long *mbtable; /** Pointer to the multiboot table */ unsigned long *mbtable; /** Pointer to the multiboot table */

17
payloads/libpayload/libc/coreboot.c
View File

@ -114,6 +114,20 @@ static void cb_parse_vdat(unsigned char *ptr, struct sysinfo_t *info)
info->vdat_addr = phys_to_virt(vdat->range_start); info->vdat_addr = phys_to_virt(vdat->range_start);
info->vdat_size = vdat->range_size; info->vdat_size = vdat->range_size;
} }
static void cb_parse_mac_addresses(unsigned char *ptr,
struct sysinfo_t *info)
{
struct cb_macs *macs = (struct cb_macs *)ptr;
int i;
info->num_macs = (macs->count < ARRAY_SIZE(info->macs)) ?
macs->count : ARRAY_SIZE(info->macs);
for (i = 0; i < info->num_macs; i++)
info->macs[i] = macs->mac_addrs[i];
}
#endif #endif
static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info) static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info)
@ -291,6 +305,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_VBOOT_HANDOFF: case CB_TAG_VBOOT_HANDOFF:
cb_parse_vboot_handoff(ptr, info); cb_parse_vboot_handoff(ptr, info);
break; break;
case CB_TAG_MAC_ADDRS:
cb_parse_mac_addresses(ptr, info);
break;
#endif #endif
case CB_TAG_TIMESTAMPS: case CB_TAG_TIMESTAMPS:
cb_parse_tstamp(ptr, info); cb_parse_tstamp(ptr, info);