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

google/gru: Read RAM & board ids from the ADC 

- Update so that the RAM id is read from ADC instead of
hard-coded from the config array.
- Update the boardid readings so that they are bucketed instead
of within an error margin.

BRANCH=None
BUG=chrome-os-partner:54566,chrome-os-partner:53988
TEST=hexdump /proc/device-tree/firmware/coreboot/ram-code
     and boardid when OS boots up.  Also verified that
     voltage read in debug output returns correct id.

Change-Id: I963406d8c440cd90c3024c814c0de61d35ebe2fd
Signed-off-by: Martin Roth <martinroth@chromium.org>
Original-Commit-Id: 068705a38734d2604f71c8a7b5bf2cc15b0f7045
Original-Change-Id: I1c847558d54a0f7f9427904eeda853074ebb0e2e
Original-Signed-off-by: Shelley Chen <shchen@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/356584
Original-Reviewed-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/15586
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Shelley Chen 2016-06-27 18:21:34 -07:00 committed by Martin Roth
parent 1592bfb77e
commit 5d49b4a4bc
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/mainboard/google/gru/boardid.c
View File

@ -19,43 +19,49 @@
#include <soc/saradc.h> #include <soc/saradc.h>
/* /*
* This matches Kevin/Gru ADC value for board id. * ID info:
* ID : Volts : ADC value : Bucket
* == ===== ========= ======
* 0 : 0.074V: 37.888 : 0 - <=82
* 1 : 0.211V: 108.032 : 82- <=136
* 2 : 0.319V: 163.328 : 136-<=191
* 3 : 0.427V: 218.624 : 191-<=248
* 4 : 0.542V: 277.504 : 248-<=309
* 5 : 0.666V: 340.992 : 309-<=370
* 6 : 0.781V: 399.872 : 370- 512
*/ */
static const int board_id_readings[] = { 42, 120, 181, 242, 307, 378, 444, static const int id_readings[] = { 82, 136, 191, 248, 309, 370, 512 };
511, 581, 646, 704, 763, 828, static int cached_board_id = -1;
895, 956, 1023 }; static int cached_ram_id = -1;
/* static uint32_t get_index(uint32_t channel, int *cached_id)
* The ADC produces a 10 bit value, the resistor accuracy is 1%, let's leave
* 2% room for error on both sides, total variation would be 4%, which is
* approximately 40 points with a 10 bit ADC. The hardware specification
* guarantees valid readings to be at least 64 bits (2^6) apart.
*/
#define ACCEPTABLE_DELTA (int)(1024 * .02)
uint8_t board_id(void)
{ {
static int cached_board_id = -1;
int i; int i;
int adc_reading; int adc_reading;
if (cached_board_id != -1) if (*cached_id != -1)
return cached_board_id; return *cached_id;
adc_reading = get_saradc_value(1); adc_reading = get_saradc_value(channel);
for (i = 0; i < ARRAY_SIZE(board_id_readings); i++) { for (i = 0; i < ARRAY_SIZE(id_readings); i++) {
int delta = board_id_readings[i] - adc_reading; if (adc_reading <= id_readings[i]) {
printk(BIOS_DEBUG, "ADC reading %d, ID %d\n",
if ((delta < ACCEPTABLE_DELTA) && (delta > -ACCEPTABLE_DELTA)) { adc_reading, i);
printk(BIOS_DEBUG, "ADC reading %d, " *cached_id = i;
"expected value %d board ID %d\n",
adc_reading, delta + adc_reading, i);
cached_board_id = i;
return i; return i;
} }
} }
printk(BIOS_ERR, "Unmatched ADC reading of %d, using Board ID of 0\n", printk(BIOS_DEBUG, "ERROR: Unmatched ADC reading of %d\n", adc_reading);
adc_reading);
return 0; return 0;
} }
uint8_t board_id(void)
{
return get_index(1, &cached_board_id);
}
uint32_t ram_code(void)
{
return get_index(0, &cached_ram_id);
}

6
src/mainboard/google/gru/sdram_configs.c
View File

@ -58,9 +58,3 @@ const struct rk3399_sdram_params *get_sdram_config()
return &sdram_configs[speed]; return &sdram_configs[speed];
} }
uint32_t ram_code(void)
{
return get_sdram_index();
}