coreboot-gerrit August 2019

coreboot-gerrit@coreboot.org

1 participants
1942 discussions

Change in ...coreboot[master]: drivers/i2c: Add LP5562 LED driver
by SANTHOSH JANARDHANA HASSAN (Code Review) 11 Mar '20

11 Mar '20

Hello Yuji Sasaki, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/32692 to review the following change. Change subject: drivers/i2c: Add LP5562 LED driver ...................................................................... drivers/i2c: Add LP5562 LED driver Add LP5562 LED driver in Coreboot. BUG=b:116352348 TEST=Apply board support for LP5562 LED driver, build coreboot. Signed-off-by: Yuji Sasaki <sasakiy(a)chromium.org> Change-Id: I0206dc6bfd367a258af88ab61e0928e32e9aa60f --- A src/drivers/i2c/Kconfig A src/drivers/i2c/Makefile.inc A src/drivers/i2c/lp5562/Kconfig A src/drivers/i2c/lp5562/Makefile.inc A src/drivers/i2c/lp5562/led_lp5562.c A src/drivers/i2c/lp5562/led_lp5562.h A src/drivers/i2c/lp5562/led_lp5562_programs.c A src/drivers/i2c/lp5562/led_lp5562_programs.h 8 files changed, 863 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/32692/1 diff --git a/src/drivers/i2c/Kconfig b/src/drivers/i2c/Kconfig new file mode 100644 index 0000000..47b79e6 --- /dev/null +++ b/src/drivers/i2c/Kconfig @@ -0,0 +1,28 @@ +source src/drivers/i2c/adm1026/Kconfig +source src/drivers/i2c/adm1027/Kconfig +source src/drivers/i2c/adt7463/Kconfig +source src/drivers/i2c/at24rf08c/Kconfig +source src/drivers/i2c/ck505/Kconfig +source src/drivers/i2c/da7219/Kconfig +source src/drivers/i2c/designware/Kconfig +source src/drivers/i2c/generic/Kconfig +source src/drivers/i2c/hid/Kconfig +source src/drivers/i2c/i2cmux/Kconfig +source src/drivers/i2c/i2cmux2/Kconfig +source src/drivers/i2c/lm63/Kconfig +source src/drivers/i2c/lm96000/Kconfig +source src/drivers/i2c/lp5562/Kconfig +source src/drivers/i2c/max98373/Kconfig +source src/drivers/i2c/max98927/Kconfig +source src/drivers/i2c/nau8825/Kconfig +source src/drivers/i2c/nct7802y/Kconfig +source src/drivers/i2c/pca9538/Kconfig +source src/drivers/i2c/pcf8523/Kconfig +source src/drivers/i2c/rt5663/Kconfig +source src/drivers/i2c/rtd2132/Kconfig +source src/drivers/i2c/rx6110sa/Kconfig +source src/drivers/i2c/sx9310/Kconfig +source src/drivers/i2c/tpm/Kconfig +source src/drivers/i2c/w83793/Kconfig +source src/drivers/i2c/w83795/Kconfig +source src/drivers/i2c/ww_ring/Kconfig diff --git a/src/drivers/i2c/Makefile.inc b/src/drivers/i2c/Makefile.inc new file mode 100644 index 0000000..7b5ae0c --- /dev/null +++ b/src/drivers/i2c/Makefile.inc @@ -0,0 +1,28 @@ +subdirs-y += adm1026 +subdirs-y += adm1027 +subdirs-y += adt7463 +subdirs-y += at24rf08c +subdirs-y += ck505 +subdirs-y += da7219 +subdirs-y += designware +subdirs-y += generic +subdirs-y += hid +subdirs-y += i2cmux +subdirs-y += i2cmux2 +subdirs-y += lm63 +subdirs-y += lm96000 +subdirs-y += lp5562 +subdirs-y += max98373 +subdirs-y += max98927 +subdirs-y += nau8825 +subdirs-y += nct7802y +subdirs-y += pca9538 +subdirs-y += pcf8523 +subdirs-y += rt5663 +subdirs-y += rtd2132 +subdirs-y += rx6110sa +subdirs-y += sx9310 +subdirs-y += tpm +subdirs-y += w83793 +subdirs-y += w83795 +subdirs-y += ww_ring diff --git a/src/drivers/i2c/lp5562/Kconfig b/src/drivers/i2c/lp5562/Kconfig new file mode 100644 index 0000000..cd7041a --- /dev/null +++ b/src/drivers/i2c/lp5562/Kconfig @@ -0,0 +1,2 @@ +config DRIVERS_I2C_LED_LP5562 + bool diff --git a/src/drivers/i2c/lp5562/Makefile.inc b/src/drivers/i2c/lp5562/Makefile.inc new file mode 100644 index 0000000..bfdb408 --- /dev/null +++ b/src/drivers/i2c/lp5562/Makefile.inc @@ -0,0 +1,5 @@ +verstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562.c +verstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562_programs.c + +ramstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562.c +ramstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562_programs.c diff --git a/src/drivers/i2c/lp5562/led_lp5562.c b/src/drivers/i2c/lp5562/led_lp5562.c new file mode 100644 index 0000000..6eafee3 --- /dev/null +++ b/src/drivers/i2c/lp5562/led_lp5562.c @@ -0,0 +1,430 @@ +/* + * Copyright (C) 2019 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This is a driver for the TI LP5562 (http://www.ti.com/product/lp5562), + * driving a tri-color LED. + * + * The only connection between the LED and the main board is an i2c bus. + * + * This driver imitates a depthcharge display device. On initialization the + * driver sets up the controllers to prepare them to accept programs to run. + * + * When a certain vboot state needs to be indicated, the program for that + * state is loaded into the controllers, resulting in the state appropriate + * LED behavior. + */ + +#include <console/console.h> +#include <delay.h> +#include <device/i2c_simple.h> +#include <string.h> + +#include "drivers/i2c/lp5562/led_lp5562_programs.h" + +/* Key lp5562 registers. */ +#define LP5562_ENABLE_REG 0x00 +#define LP5562_OPMODE_REG 0x01 +#define LP5562_PWMREG_B 0x02 +#define LP5562_PWMREG_G 0x03 +#define LP5562_PWMREG_R 0x04 +#define LP5562_CURRENT_B 0x05 +#define LP5562_CURRENT_G 0x06 +#define LP5562_CURRENT_R 0x07 +#define LP5562_CONFIG_REG 0x08 +#define LP5562_ENGINE1_PC 0x09 +#define LP5562_ENGINE2_PC 0x0a +#define LP5562_ENGINE3_PC 0x0b +#define LP5562_STATUS_REG 0x0c +#define LP5562_RESET_REG 0x0d +#define LP5562_PWMREG_W 0x0e +#define LP5562_CURRENT_W 0x0f +#define LP5562_LED_MAP_REG 0x70 +#define LP5562_PROG_MEM_ENG1 0x10 +#define LP5562_PROG_MEM_ENG2 0x30 +#define LP5562_PROG_MEM_ENG3 0x50 + +/* LP5562 ENABLE REG fields. */ +#define LP5562_ENABLE_LOG_EN 0x80 +#define LP5562_ENABLE_CHIP_EN 0x40 +#define LP5562_ENABLE_EXEC_HOLD 0x00 +#define LP5562_ENABLE_EXEC_STEP 0x01 +#define LP5562_ENABLE_EXEC_RUN 0x02 +#define LP5562_ENABLE_EXEC_MASK 0x03 +#define LP5562_ENABLE_ENG1_SHIFT 4 +#define LP5562_ENABLE_ENG2_SHIFT 2 +#define LP5562_ENABLE_ENG3_SHIFT 0 +#define LP5562_ENABLE_ALL_MASK 0x3f +#define LP5562_ENABLE_ALL_HOLD 0x00 +#define LP5562_ENABLE_ALL_RUN 0x2a + +/* LP5562 OPMODE REG fields. */ +#define LP5562_OPMODE_DISABLED 0x00 +#define LP5562_OPMODE_LOAD 0x01 +#define LP5562_OPMODE_RUN 0x02 +#define LP5562_OPMODE_DIRECT 0x03 +#define LP5562_OPMODE_MASK 0x03 +#define LP5562_OPMODE_ENG1_SHIFT 4 +#define LP5562_OPMODE_ENG2_SHIFT 2 +#define LP5562_OPMODE_ENG3_SHIFT 0 +#define LP5562_OPMODE_ALL_DISABLE 0x00 +#define LP5562_OPMODE_ALL_LOAD 0x15 +#define LP5562_OPMODE_ALL_RUN 0x2a + +/* + * LP5562_ENABLE_REG, default value + */ +#define LP5562_ENABLE_REG_DEFAULT (LP5562_ENABLE_CHIP_EN) + +/* + * LP5562_CONFIG_REG, default value + * PWM_HF=0(256Hz) + * PWRSAVE_EN=0 (Disable) + * CLKDET_EN/INT_CLK_EN=1 (Internal Clock) + */ +#define LP5562_CONFIG_REG_DEFAULT 0x03 + +/* + * LP5562_LED_MAP_REG, default value + * B:ENG1, G:ENG2, R:ENG3 + */ +#define LP5562_LED_MAP_REG_DEFAULT 0x39 + +/* LP5562 Current default value, applies to all four of them */ +#define LP5562_CRT_CTRL_DEFAULT 0xaf + +/* Goes into LP5562_RESET_REG to reset the chip. */ +#define LP5562_RESET_VALUE 0xff + +/* + * The controller has 96 bytes of SRAM for code/data, availabe as three 32 byte + * pages. + */ +#define LP5562_PROG_PAGE_SIZE 32 +#define LP5562_PROG_PAGES 3 +#define LP5562_MAX_PROG_SIZE LP5562_PROG_PAGE_SIZE + +/* + * Structure to cache data relevant to accessing one controller. I2c interface + * to use, device address on the i2c bus and a data buffer for write + * transactions. The most bytes sent at a time is the register address plus + * the program page size. + */ +typedef struct { + unsigned i2c_bus; + uint8_t dev_addr; + uint8_t data_buffer[LP5562_PROG_PAGE_SIZE + 1]; +} TiLp5562; + +static void led_lp5562_init(unsigned i2c_bus); + +/* Controller descriptors. */ +static TiLp5562 lp5562s[LED_LP5562_NUM_LED_CONTROLLERS]; + +/* + * i2c transfer function for the driver. To keep things simple, the function + * repeats the transfer, if the first attempt fails. This is OK with the + * controller and makes it easier to handle errors. + * + * Note that the reset register accesses are expected to fail on writes, but + * due to a bug in the ipq806x i2c controller, the error is reported on the + * following read attempt. + * + * To work around this the driver writes and then reads the reset register, + * the transfer function ignores errors when accessing the reset register. + */ +static int ledc_transfer(TiLp5562 *ledc, struct i2c_msg *segs, + int seg_count, int reset) +{ + int rv, max_attempts = 2; + + while (max_attempts--) { + rv = i2c_transfer(ledc->i2c_bus, segs, seg_count); + + /* Accessing reset regsiter is expected to fail. */ + if (!rv || reset) + break; + } + + if (rv) { + if (!reset) + printk(BIOS_WARNING, + "%s: dev %#x, reg %#x, %s transaction error.\n", + __func__, segs->slave, segs->buf[0], + seg_count == 1 ? "write" : "read"); + else + rv = 0; + } + + return rv; +} + +/* + * The controller is programmed to autoincrement on writes, so up to page size + * bytes can be transmitted in one write transaction. + */ +static int ledc_write(TiLp5562 *ledc, uint8_t start_addr, + const uint8_t *data, unsigned count) +{ + struct i2c_msg seg; + + if (count > (sizeof(ledc->data_buffer) - 1)) { + printk(BIOS_WARNING, "%s: transfer size too large (%d bytes)\n", + __func__, count); + return -1; + } + + memcpy(ledc->data_buffer + 1, data, count); + ledc->data_buffer[0] = start_addr; + + seg.flags = 0; + seg.slave = ledc->dev_addr; + seg.buf = ledc->data_buffer; + seg.len = count + 1; + + return ledc_transfer(ledc, &seg, 1, start_addr == LP5562_RESET_REG); +} + +/* To keep things simple, read is limited to one byte at a time. */ +static int ledc_read(TiLp5562 *ledc, uint8_t addr, uint8_t *data) +{ + struct i2c_msg seg[2]; + + seg[0].flags = 0; + seg[0].slave = ledc->dev_addr; + seg[0].buf = &addr; + seg[0].len = 1; + + seg[1].flags = I2C_M_RD; + seg[1].slave = ledc->dev_addr; + seg[1].buf = data; + seg[1].len = 1; + + return ledc_transfer(ledc, seg, ARRAY_SIZE(seg), + addr == LP5562_RESET_REG); +} + +/* + * Reset transaction is expected to result in a failing i2c command. But even + * before trying it, read the reset register, which is supposed to always + * return 0. If this fails - there is no lp5562 at this address. + * + * Return 0 on success, -1 on failure to detect controller. + */ +static int ledc_reset(TiLp5562 *ledc) +{ + uint8_t data; + + data = ~0; + ledc_read(ledc, LP5562_RESET_REG, &data); + if (data) { + printk(BIOS_WARNING, + "LED_LP5562: no controller found at address %#2.2x\n", + ledc->dev_addr); + return -1; + } + + data = LP5562_RESET_VALUE; + ledc_write(ledc, LP5562_RESET_REG, &data, 1); + + /* + * This read is not necessary for the chip reset, but is required to + * work around the i2c driver bug where the missing ACK on the last + * byte of the write transaction is ignored, but the next transaction + * fails. + */ + ledc_read(ledc, LP5562_RESET_REG, &data); + return 0; +} + +/* + * Write a program into the internal lp5562 memory. + */ +static void ledc_write_program(TiLp5562 *ledc, uint8_t load_addr, + const uint8_t *program, unsigned count) +{ + if (count > LP5562_MAX_PROG_SIZE) { + printk(BIOS_WARNING, + "%s: program of size %#x does not fit at addr %#x\n", + __func__, count, load_addr); + return; + } + ledc_write(ledc, load_addr, program, count); +} + +static void ledc_write_enable(TiLp5562 *ledc, uint8_t value) +{ + ledc_write(ledc, LP5562_ENABLE_REG, &value, 1); + udelay(500); /* Must wait longer than 488usec */ +} + +static void ledc_write_opmode(TiLp5562 *ledc, uint8_t value) +{ + ledc_write(ledc, LP5562_OPMODE_REG, &value, 1); + udelay(160); /* Must wait longer than 153usec */ +} + +/* Run an lp5562 program on a controller. */ +static void ledc_run_program(TiLp5562 *ledc, + const TiLp5562Program *program_desc) +{ + int i; + uint8_t data; + uint8_t enable_reg; + uint8_t load_addr; + + /* All engines on hold. */ + ledc_read(ledc, LP5562_ENABLE_REG, &enable_reg); + enable_reg &= ~LP5562_ENABLE_ALL_MASK; + enable_reg |= LP5562_ENABLE_CHIP_EN; + enable_reg |= LP5562_ENABLE_ALL_HOLD; + ledc_write_enable(ledc, enable_reg); + + /* All engines in LOAD mode. */ + ledc_write_opmode(ledc, LP5562_OPMODE_ALL_LOAD); + + /* Inject program code for each engine and start address */ + load_addr = LP5562_PROG_MEM_ENG1; + for (i = 0; i < LED_LP5562_NUM_OF_ENGINES; i++) { + ledc_write_program(ledc, load_addr, + program_desc->engine_program[i].program_text, + program_desc->engine_program[i].program_size); + data = program_desc->engine_program[i].engine_start_addr; + ledc_write(ledc, LP5562_ENGINE1_PC + i, &data, 1); + udelay(160); /* Must wait longer than 153usec */ + load_addr += LP5562_PROG_PAGE_SIZE; + } + + /* All engines on run. */ + ledc_write_opmode(ledc, LP5562_OPMODE_ALL_RUN); + + enable_reg &= ~LP5562_ENABLE_ALL_MASK; + enable_reg |= LP5562_ENABLE_ALL_RUN; + ledc_write_enable(ledc, enable_reg); +} + +/* + * Initialize a controller to a state were it is ready to accept programs, and + * try to confirm that we are in fact talking to a lp5562 + */ +static int ledc_init_validate(TiLp5562 *ledc) +{ + uint8_t data; + int i; + + if (ledc_reset(ledc)) + return -1; + + /* Enable the chip, keep engines in hold state. */ + ledc_write_enable(ledc, LP5562_ENABLE_REG_DEFAULT | LP5562_ENABLE_ALL_HOLD); + + data = LP5562_CONFIG_REG_DEFAULT; + ledc_write(ledc, LP5562_CONFIG_REG, &data, 1); + + data = LP5562_LED_MAP_REG_DEFAULT; + ledc_write(ledc, LP5562_LED_MAP_REG, &data, 1); + + /* + * All four current control registers are supposed to return the same + * value at reset. + */ + for (i = 0; i < 4; i++) { + uint8_t reg = (i < 3) ? LP5562_CURRENT_B + i : LP5562_CURRENT_W; + ledc_read(ledc, reg, &data); + if (data != LP5562_CRT_CTRL_DEFAULT) { + printk(BIOS_WARNING, + "%s: read %#2.2x from register %#x\n", __func__, + data, reg); + return -1; + } + } + + return 0; +} + +/* + * Find a program matching screen type, and run it on both controllers, if + * found. + */ +int led_lp5562_display_pattern(unsigned i2c_bus, enum display_pattern pattern) +{ + static int initted; + const Led5562StateProg *led_prog; + + if (!initted) { + led_lp5562_init(i2c_bus); + initted = 1; + } + + /* Last entry does not have any actual programs defined. */ + for (led_prog = led_lp5562_state_programs; led_prog->programs[0]; led_prog++) + if (led_prog->led_pattern == pattern) { + int j; + + /* + * First stop all running programs to avoid + * inerference between the controllers. + */ + for (j = 0; j < LED_LP5562_NUM_LED_CONTROLLERS; j++) { + if (!lp5562s[j].dev_addr) + continue; + ledc_write_opmode + (lp5562s + j, + LP5562_OPMODE_ALL_DISABLE); + } + + for (j = 0; j < LED_LP5562_NUM_LED_CONTROLLERS; j++) { + if (!lp5562s[j].dev_addr) + continue; + ledc_run_program(lp5562s + j, + led_prog->programs[j]); + } + return 0; + } + + printk(BIOS_WARNING, "%s: did not find program for pattern %d\n", + __func__, pattern); + + return -1; +} + +#define LP5562_I2C_BASE_ADDR 0x30 + +static void led_lp5562_init(unsigned i2c_bus) +{ + TiLp5562 *ledc; + int i, count = 0; + + for (i = 0, ledc = lp5562s; + i < LED_LP5562_NUM_LED_CONTROLLERS; + i++, ledc++) { + + ledc->i2c_bus = i2c_bus; + ledc->dev_addr = LP5562_I2C_BASE_ADDR + i; + + if (!ledc_init_validate(ledc)) + count++; + else + ledc->dev_addr = 0; /* Mark disabled. */ + } + + printk(BIOS_INFO, "LED_LP5562: initialized %d out of %d\n", count, i); + if (count != i) { + if (count) + printk(BIOS_WARNING, + "LED_LP5562: will keep going anyway\n"); + else + printk(BIOS_WARNING, + "LED_LP5562: LED ring not present\n"); + } +} diff --git a/src/drivers/i2c/lp5562/led_lp5562.h b/src/drivers/i2c/lp5562/led_lp5562.h new file mode 100644 index 0000000..3c202eb --- /dev/null +++ b/src/drivers/i2c/lp5562/led_lp5562.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2019 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __SRC_DRIVERS_VIDEO_LED_LP5562__H__ +#define __SRC_DRIVERS_VIDEO_LED_LP5562__H__ + +/* + * Different types of display patterns to be shown by the LED while + * contrlled by coreboot. + */ +enum display_pattern { + LED_ALL_OFF, /* Turn the LEDs off. */ + LED_RECOVERY_PUSHED, /* Recovery button push detected on start up. */ + LED_WIPEOUT_REQUEST, /* Held long enough for wipout request. */ + LED_RECOVERY_REQUEST, /* Held long enough for recovery request. */ + LED_NORMAL_BOOT /* No buttons pressed, normal boot sequence. */ +}; +/* + * led_lp5562_display_pattern + * + * Display pattern on the ring LEDs. + */ +int led_lp5562_display_pattern(unsigned i2c_bus, enum display_pattern pattern); + +#endif diff --git a/src/drivers/i2c/lp5562/led_lp5562_programs.c b/src/drivers/i2c/lp5562/led_lp5562_programs.c new file mode 100644 index 0000000..f322f6a --- /dev/null +++ b/src/drivers/i2c/lp5562/led_lp5562_programs.c @@ -0,0 +1,273 @@ +/* + * Copyright (C) 2019 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This is a driver for the TI LP5562 (http://www.ti.com/product/lp5562), + * driving a tri-color LED. + * + * The only connection between the LED and the main board is an i2c bus. + * + * This driver imitates a depthcharge display device. On initialization the + * driver sets up the controllers to prepare them to accept programs to run. + * + * When a certain vboot state needs to be indicated, the program for that + * state is loaded into the controllers, resulting in the state appropriate + * LED behavior. + */ + +#include "drivers/i2c/lp5562/led_lp5562_programs.h" + +/**************************************************************** + * LED ring program definitions for different patterns. + * + * Comments below are real lp5562 source code, they are compiled using + * lasm.exe, the TI tool available from their Web site (search for lp5562) + * and running only on Windows :P. + * + * Different hex dumps are results of tweaking the source code parameters to + * achieve desirable LED ring behavior. It is possible to use just one code + * dump and replace certain values in the body to achieve different behaviour + * with the same basic dump, but keeping track of location to tweak with every + * code change would be quite tedious. + */ + +/* + * Solid LED display, the arguments of the set_pwm commands set intensity and + * color of the display: + + 1 00 .ENGINE1(R) + 2 00 4080 set_pwm 128 + 3 01 C000 end + 4 + 5 10 .ENGINE2(G) + 6 10 4080 set_pwm 128 + 7 11 C000 end + 8 + 9 20 .ENGINE3(B) + 10 20 4080 set_pwm 128 + 11 21 C000 end +*/ + +/* RGB set to 000000, resulting in all LEDs off. */ +static const uint8_t solid_00_text[] = { + 0x40, 0x00, 0xc0, 0x00 +}; + +/* Rgb set to 128, resulting in a brightish white color. */ +static const uint8_t solid_80_text[] = { + 0x40, 0x80, 0xc0, 0x00 +}; + +static const TiLp5562Program solid_000000_program = { + { + { /* Engine1:Blue */ + solid_00_text, + sizeof(solid_00_text), + 0, + }, + { /* Engine2:Green */ + solid_00_text, + sizeof(solid_00_text), + 0, + }, + { /* Engine3:Red */ + solid_00_text, + sizeof(solid_00_text), + 0, + }, + } +}; + +static const TiLp5562Program solid_808080_program = { + { + { /* Engine1:Blue */ + solid_80_text, + sizeof(solid_80_text), + 0, + }, + { /* Engine2:Green */ + solid_80_text, + sizeof(solid_80_text), + 0, + }, + { /* Engine3:Red */ + solid_80_text, + sizeof(solid_80_text), + 0, + }, + } +}; + +/* + 1 00 .ENGINE1(B) + 2 00 E200 trigger w3 + 3 01 409B set_pwm 155 + 4 02 E200 trigger w3 + 5 03 4000 set_pwm 0 + 6 04 0000 gotostart + 7 + 8 10 .ENGINE2(G) + 9 10 E200 trigger w3 + 10 11 4032 set_pwm 50 + 11 12 E200 trigger w3 + 12 13 4000 set_pwm 0 + 13 14 0000 gotostart + 14 + 15 20 .ENGINE3(R) + 16 20 E006 trigger s21 + 17 21 4001 set_pwm 1 + 18 22 5300 wait 300 + 19 23 E006 trigger s21 + 20 24 4000 set_pwm 0 + 21 25 5300 wait 300 + 22 26 0000 gotostart +*/ + +static const uint8_t blink_wipeout1_b_text[] = { + 0xe2, 0x00, 0x40, 155, 0xe2, 0x00, 0x40, 0, + 0x00, 0x00, +}; + +static const uint8_t blink_wipeout1_g_text[] = { + 0xe2, 0x00, 0x40, 50, 0xe2, 0x00, 0x40, 0, + 0x00, 0x00, +}; + +static const uint8_t blink_wipeout1_r_text[] = { + 0xe0, 0x06, 0x40, 1, 0x53, 0x00, 0xe0, 0x06, + 0x40, 0, 0x53, 0x00, 0x00, 0x00 +}; + +static const TiLp5562Program blink_wipeout1_program = { + { + { + blink_wipeout1_b_text, + sizeof(blink_wipeout1_b_text), + 0, + }, + { + blink_wipeout1_g_text, + sizeof(blink_wipeout1_g_text), + 0, + }, + { + blink_wipeout1_r_text, + sizeof(blink_wipeout1_r_text), + 0, + }, + } +}; + +static const uint8_t blink_recovery1_b_text[] = { + 0xe2, 0x00, 0x40, 10, 0xe2, 0x00, 0x40, 0, + 0x00, 0x00, +}; + +static const uint8_t blink_recovery1_g_text[] = { + 0xe2, 0x00, 0x40, 100, 0xe2, 0x00, 0x40, 0, + 0x00, 0x00, +}; + +static const uint8_t blink_recovery1_r_text[] = { + 0xe0, 0x06, 0x40, 255, 0x53, 0x00, 0xe0, 0x06, + 0x40, 0, 0x53, 0x00, 0x00, 0x00 +}; + +static const TiLp5562Program blink_recovery1_program = { + { + { + blink_recovery1_b_text, + sizeof(blink_wipeout1_b_text), + 0, + }, + { + blink_recovery1_g_text, + sizeof(blink_wipeout1_g_text), + 0, + }, + { + blink_recovery1_r_text, + sizeof(blink_wipeout1_r_text), + 0, + }, + } +}; + +/* + * fade_in1.src + * + 1 00 .ENGINE1(B) + 2 00 4000 set_pwm 0 + 3 01 E200 trigger w3 + 4 02 1B4C ramp 1000, 77 # ramp up to 155 for 2 seconds + 5 03 1A4D ramp 1000, 78 + 6 04 C000 end + 7 + 8 10 .ENGINE2(G) + 9 10 4000 set_pwm 0 + 10 11 E200 trigger w3 + 11 12 4318 ramp 1000, 25 # ramp up to 50 for 2 seconds + 12 13 4318 ramp 1000, 25 + 13 14 C000 end + 14 + 15 20 .ENGINE3(R) + 16 20 E006 trigger s21 + 17 21 4001 set_pwm 1 + 18 22 E006 trigger s21 + 19 23 C000 end +*/ + +static const uint8_t fade_in1_b_text[] = { + 0x40, 0, 0xe2, 0x00, 0x1b, 0x4c, 0x1a, 0x4d, + 0xc0, 0x00 +}; +static const uint8_t fade_in1_g_text[] = { + 0x40, 0, 0xe2, 0x00, 0x43, 0x18, 0x43, 0x18, + 0xc0, 0x00 +}; +static const uint8_t fade_in1_r_text[] = { + 0xe0, 0x06, 0x40, 1, 0xe0, 0x06, 0x00 +}; + +static const TiLp5562Program fade_in1_program = { + { + { + fade_in1_b_text, + sizeof(fade_in1_b_text), + 0, + }, + { + fade_in1_g_text, + sizeof(fade_in1_g_text), + 0, + }, + { + fade_in1_r_text, + sizeof(fade_in1_r_text), + 0, + }, + } +}; + +const Led5562StateProg led_lp5562_state_programs[] = { + /* + * for test purposes the blank screen program is set to blinking, will + * be changed soon. + */ + {LED_ALL_OFF, {&solid_000000_program} }, + {LED_RECOVERY_PUSHED, {&solid_808080_program} }, + {LED_WIPEOUT_REQUEST, {&blink_wipeout1_program} }, + {LED_RECOVERY_REQUEST, {&blink_recovery1_program} }, + {LED_NORMAL_BOOT, {&fade_in1_program} }, + {}, /* Empty record to mark the end of the table. */ +}; diff --git a/src/drivers/i2c/lp5562/led_lp5562_programs.h b/src/drivers/i2c/lp5562/led_lp5562_programs.h new file mode 100644 index 0000000..e5373c0 --- /dev/null +++ b/src/drivers/i2c/lp5562/led_lp5562_programs.h @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2019 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This is a driver for the TI LP5562 (http://www.ti.com/product/lp5562), + * driving a tri-color LED. + * + * The only connection between the LED and the main board is an i2c bus. + * + * This driver imitates a depthcharge display device. On initialization the + * driver sets up the controllers to prepare them to accept programs to run. + * + * When a certain vboot state needs to be indicated, the program for that + * state is loaded into the controllers, resulting in the state appropriate + * LED behavior. + */ + +#ifndef __THIRD_PARTY_COREBOOT_SRC_DRIVERS_I2C_LED_LP5562_LED_LP5562_PROGRAMS_H__ +#define __THIRD_PARTY_COREBOOT_SRC_DRIVERS_I2C_LED_LP5562_LED_LP5562_PROGRAMS_H__ + +#include <stdint.h> +#include "drivers/i2c/lp5562/led_lp5562.h" + +/* There are threee independent engines/cores in the controller. */ +#define LED_LP5562_NUM_OF_ENGINES 3 + +/* Number of LP5562 controllers on this implementation */ +#define LED_LP5562_NUM_LED_CONTROLLERS 1 + +/* + * Structure to describe an lp5562 program: pointer to the text of the + * program, its size for each engines, and start address relative to + * each engine program memory. Program memory address for each engine is + * fixed on LP5562. + */ +typedef struct { + struct { + const uint8_t *program_text; + uint8_t program_size; + uint8_t engine_start_addr; + } engine_program[LED_LP5562_NUM_OF_ENGINES]; +} TiLp5562Program; + +/* A structure to bind controller programs to a vboot state. */ +typedef struct { + enum display_pattern led_pattern; + const TiLp5562Program *programs[LED_LP5562_NUM_LED_CONTROLLERS]; +} Led5562StateProg; + +extern const Led5562StateProg led_lp5562_state_programs[]; + +#endif -- To view, visit https://review.coreboot.org/c/coreboot/+/32692 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0206dc6bfd367a258af88ab61e0928e32e9aa60f Gerrit-Change-Number: 32692 Gerrit-PatchSet: 1 Gerrit-Owner: SANTHOSH JANARDHANA HASSAN <sahassan(a)google.com> Gerrit-Reviewer: Yuji Sasaki <sasakiy(a)chromium.org> Gerrit-MessageType: newchange

6 14

Change in ...coreboot[master]: qcs405: Add support for specifying mbn_version
by Nitheesh Sekar (Code Review) 11 Mar '20

11 Mar '20

Nitheesh Sekar has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33425 Change subject: qcs405: Add support for specifying mbn_version ...................................................................... qcs405: Add support for specifying mbn_version Change-Id: Ic6e269e0f290692871875000586410217c25fc08 Signed-off-by: Nitheesh Sekar <nsekar(a)codeaurora.org> --- M src/soc/qualcomm/qcs405/Makefile.inc M util/qualcomm/createxbl.py M util/qualcomm/mbn_tools.py 3 files changed, 62 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/33425/1 diff --git a/src/soc/qualcomm/qcs405/Makefile.inc b/src/soc/qualcomm/qcs405/Makefile.inc index cf8268b..4faaffc 100644 --- a/src/soc/qualcomm/qcs405/Makefile.inc +++ b/src/soc/qualcomm/qcs405/Makefile.inc @@ -126,18 +126,12 @@ qc_sec_file := $(shell ls $(QC_SEC_FILE)) ifneq (,$(findstring $(QC_SEC_FILE),$(qc_sec_file))) $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.elf - python util/qualcomm/createxbl.py -f $(objcbfs)/bootblock.elf \ + python util/qualcomm/createxbl.py --mbn_version 6 -f $(objcbfs)/bootblock.elf \ -x $(QC_SEC_FILE) -o $(objcbfs)/merged_bb_qcsec.mbn \ -a 64 -d 32 -c 32 -ifeq ($(CONFIG_QC_FLASH_SIMULATE_SDCARD),y) - @printf "\nqgpt.py 512 sector size\n" - python util/qualcomm/qgpt.py -s 512 $(objcbfs)/merged_bb_qcsec.mbn \ - $(objcbfs)/bootblock.bin -else @printf "\nqgpt.py 4K sector size\n" python util/qualcomm/qgpt.py $(objcbfs)/merged_bb_qcsec.mbn \ $(objcbfs)/bootblock.bin -endif else $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin diff --git a/util/qualcomm/createxbl.py b/util/qualcomm/createxbl.py index 4a21854..ad5934d 100755 --- a/util/qualcomm/createxbl.py +++ b/util/qualcomm/createxbl.py @@ -44,6 +44,7 @@ # # when who what, where, why # -------- --- ------------------------------------------------------ +# 05/21/19 rissha Added --mbn_version to add MBN header accordingly # 03/26/18 tv Added -e to enable extended MBNV5 support # 09/04/15 et Added -x and -d to embed xbl_sec ELF # 02/11/15 ck Fixed missing elf type check in ZI OOB feature @@ -119,6 +120,10 @@ help="Removes ZI segments that have addresses greater" + \ " than 32 bits when converting from a 64 to 32 bit ELF") + parser.add_option("--mbn_version", + action="store", type="int", dest="mbn_version", + help="Add mbn header in elf image. '5' or '6'") + (options, args) = parser.parse_args() if not options.elf_inp_file1: @@ -206,11 +211,16 @@ else: zi_oob_enabled = True - if options.elf_inp_xbl_sec: + header_version = None + + if options.elf_inp_xbl_sec or options.mbn_version == 5: is_ext_mbn_v5 = True + header_version = 5 else: is_ext_mbn_v5 = False + if options.mbn_version: + header_version = options.mbn_version mbn_type = 'elf' header_format = 'reg' @@ -259,7 +269,7 @@ source_elf, target_hash, elf_out_file_name = target_phdr_elf, - secure_type = image_header_secflag) + secure_type = image_header_secflag, header_version = header_version ) if rv: raise RuntimeError, "Failed to run pboot_gen_elf" @@ -270,7 +280,8 @@ target_hash_hd, image_header_secflag, is_ext_mbn_v5, - elf_file_name = source_elf) + elf_file_name = source_elf, + header_version = header_version) if rv: raise RuntimeError, "Failed to create image header for hash segment" diff --git a/util/qualcomm/mbn_tools.py b/util/qualcomm/mbn_tools.py index 12dc210..c702f96 100755 --- a/util/qualcomm/mbn_tools.py +++ b/util/qualcomm/mbn_tools.py @@ -41,6 +41,7 @@ # # when who what, where, why # -------- --- --------------------------------------------------------- +# 05/21/18 rissha Added support for extended MBNV6 and Add support for hashing elf segments with SHA384 # 03/22/18 thiru Added support for extended MBNV5. # 06/06/13 yliong CR 497042: Signed and encrypted image is corrupted. MRC features. # 03/18/13 dhaval Add support for hashing elf segments with SHA256 and @@ -69,6 +70,7 @@ SHA256_SIGNATURE_SIZE = 256 # Support SHA256 MAX_NUM_ROOT_CERTS = 4 # Maximum number of OEM root certificates MI_BOOT_IMG_HDR_SIZE = 40 # sizeof(mi_boot_image_header_type) +MI_BOOT_IMG_HDR_SIZE_v6 = 48 # sizeof(mi_boot_image_header_type) for v6 header MI_BOOT_SBL_HDR_SIZE = 80 # sizeof(sbl_header) BOOT_HEADER_LENGTH = 20 # Boot Header Number of Elements SBL_HEADER_LENGTH = 20 # SBL Header Number of Elements @@ -551,7 +553,7 @@ def getLength(self): return BOOT_HEADER_LENGTH - def writePackedData(self, target, write_full_hdr): + def writePackedData(self, target, write_full_hdr, header_version = None): values = [self.image_id, self.flash_parti_ver, self.image_src, @@ -573,6 +575,10 @@ self.reserved_2, self.reserved_3 ] + if header_version == 6: + values.insert(10, self.metadata_size_qti) + values.insert(11, self.metadata_size) + if self.image_dest_ptr >= 0x100000000: values[3] = 0xFFFFFFFF @@ -584,8 +590,12 @@ # Write 10 entries(40B) or 20 entries(80B) of boot header if write_full_hdr is False: - s = struct.Struct('I'* 10) - values = values[:10] + if header_version == 6: + s = struct.Struct('I'* 12) + values = values[:12] + else: + s = struct.Struct('I'* 10) + values = values[:10] else: s = struct.Struct('I' * self.getLength()) @@ -912,7 +922,8 @@ write_full_hdr = False, in_code_size = None, cert_chain_size_in = CERT_CHAIN_ONEROOT_MAXSIZE, - num_of_pages = None): + num_of_pages = None, + header_version = None): # Preliminary checks if (requires_preamble is True) and (preamble_file_name is None): @@ -947,7 +958,7 @@ # For ELF or hashed images, image destination will be determined from an ELF input file if gen_dict['IMAGE_KEY_MBN_TYPE'] == 'elf': - image_dest = get_hash_address(elf_file_name) + MI_BOOT_IMG_HDR_SIZE + image_dest = get_hash_address(elf_file_name) + (MI_BOOT_IMG_HDR_SIZE_v6 if header_version == 6 else MI_BOOT_IMG_HDR_SIZE) elif gen_dict['IMAGE_KEY_MBN_TYPE'] == 'bin': image_dest = gen_dict['IMAGE_KEY_IMAGE_DEST'] image_source = gen_dict['IMAGE_KEY_IMAGE_SOURCE'] @@ -993,17 +1004,24 @@ boot_header.cert_chain_size = cert_chain_size if is_ext_mbn_v5 == True: - # If platform image integrity check is enabled - boot_header.flash_parti_ver = 5 # version - boot_header.image_src = 0 # sig_size_qc - boot_header.image_dest_ptr = 0 # cert_chain_size_qc + # If platform image integrity check is enabled + boot_header.flash_parti_ver = 5 # version + boot_header.image_src = 0 # sig_size_qc + boot_header.image_dest_ptr = 0 # cert_chain_size_qc + + if header_version == 6: + boot_header.flash_parti_ver = 6 # version + boot_header.image_src = 0 # sig_size_qc + boot_header.image_dest_ptr =0 # cert_chain_size_qc + boot_header.metadata_size_qti = 0 # qti_metadata size + boot_header.metadata_size = 0 # oem_metadata size # If preamble is required, output the preamble file and update the boot_header if requires_preamble is True: boot_header = image_preamble(gen_dict, preamble_file_name, boot_header, num_of_pages) # Package up the header and write to output file - boot_header.writePackedData(target = output_file_name, write_full_hdr = write_full_hdr) + boot_header.writePackedData(target = output_file_name, write_full_hdr = write_full_hdr, header_version = header_version) else: raise RuntimeError, "Header format not supported: " + str(header_format) @@ -1021,13 +1039,23 @@ last_phys_addr = None, append_xml_hdr = False, is_sha256_algo = True, - cert_chain_size_in = CERT_CHAIN_ONEROOT_MAXSIZE): + cert_chain_size_in = CERT_CHAIN_ONEROOT_MAXSIZE, + header_version = None): + is_sha384_algo = False + if header_version == 6: + is_sha384_algo = True global MI_PROG_BOOT_DIGEST_SIZE + image_header_size = MI_BOOT_IMG_HDR_SIZE + if (is_sha256_algo is True): MI_PROG_BOOT_DIGEST_SIZE = 32 else: MI_PROG_BOOT_DIGEST_SIZE = 20 + if is_sha384_algo: + MI_PROG_BOOT_DIGEST_SIZE = 48 + image_header_size = MI_BOOT_IMG_HDR_SIZE_v6 + # Open Files elf_in_fp = OPEN(elf_in_file_name, "rb") hash_out_fp = OPEN(hash_out_file_name, "wb+") @@ -1110,7 +1138,7 @@ fbuf = elf_in_fp.read(hash_size) if MI_PBT_CHECK_FLAG_TYPE(curr_phdr.p_flags) is True: - hash = generate_hash(fbuf, is_sha256_algo) + hash = generate_hash(fbuf, is_sha256_algo, is_sha384_algo) else: hash = '\0' * MI_PROG_BOOT_DIGEST_SIZE @@ -1129,7 +1157,7 @@ file_buff = elf_in_fp.read(data_len) if (MI_PBT_CHECK_FLAG_TYPE(curr_phdr.p_flags) is True) and (data_len > 0): - hash = generate_hash(file_buff, is_sha256_algo) + hash = generate_hash(file_buff, is_sha256_algo, is_sha384_algo) else: hash = '\0' * MI_PROG_BOOT_DIGEST_SIZE @@ -1151,7 +1179,7 @@ # Initialize the hash table program header [hash_Phdr, pad_hash_segment, hash_tbl_end_addr, hash_tbl_offset] = \ - initialize_hash_phdr(elf_in_file_name, hashtable_size, MI_BOOT_IMG_HDR_SIZE, ELF_BLOCK_ALIGN, is_elf64) + initialize_hash_phdr(elf_in_file_name, hashtable_size, image_header_size, ELF_BLOCK_ALIGN, is_elf64) # Check if hash segment max size parameter was passed if (hash_seg_max_size is not None): @@ -1252,7 +1280,7 @@ # Read the program header and compute hash proghdr_buff = elf_out_fp.read(elf_header.e_phnum * phdr_size) - hash = generate_hash(elfhdr_buff + proghdr_buff, is_sha256_algo) + hash = generate_hash(elfhdr_buff + proghdr_buff, is_sha256_algo, is_sha384_algo) # Write hash to file as first hash table entry hash_out_fp.seek(0) @@ -2101,9 +2129,11 @@ #---------------------------------------------------------------------------- # sha1/sha256 hash routine wrapper #---------------------------------------------------------------------------- -def generate_hash(in_buf, is_sha256_algo): +def generate_hash(in_buf, is_sha256_algo, is_sha384_algo = False): # Initialize a SHA1 object from the Python hash library - if (is_sha256_algo is True): + if is_sha384_algo: + m = hashlib.sha384() + elif (is_sha256_algo is True): m = hashlib.sha256() else: m = hashlib.sha1() -- To view, visit https://review.coreboot.org/c/coreboot/+/33425 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic6e269e0f290692871875000586410217c25fc08 Gerrit-Change-Number: 33425 Gerrit-PatchSet: 1 Gerrit-Owner: Nitheesh Sekar <nsekar(a)codeaurora.org> Gerrit-MessageType: newchange

4 19

Change in coreboot[master]: TEMP: NOT FOR REVIEW: google/mistral: LED Pattern change
by Yuji Sasaki (Code Review) 11 Mar '20

11 Mar '20

Yuji Sasaki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34711 ) Change subject: TEMP: NOT FOR REVIEW: google/mistral: LED Pattern change ...................................................................... TEMP: NOT FOR REVIEW: google/mistral: LED Pattern change LED Pattern and timing change, requested from UI design team. WWR_RECOVERY_PUSHED: Bright White -> Fast Blink Yellow WWR_WIPEOUT_REQUEST: Solid Yellow -> Fast Blink Yellow after 3 second brank 8seconds -> 22 seconds WWR_RECOVERY_REQUEST: Blink Yellow -> Blink Red BUG=b:138850607 TEST=Run on DUT, verify LED pattern Signed-off-by: Yuji Sasaki <sasakiy(a)chromium.org> Change-Id: Ibd426162f18aefae79cb390cc0c4e44de6cb6f6e --- M src/drivers/i2c/lp5562/led_lp5562_programs.c M src/mainboard/google/mistral/chromeos.c 2 files changed, 247 insertions(+), 59 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/34711/1 diff --git a/src/drivers/i2c/lp5562/led_lp5562_programs.c b/src/drivers/i2c/lp5562/led_lp5562_programs.c index 9c698ca..8bd2366 100644 --- a/src/drivers/i2c/lp5562/led_lp5562_programs.c +++ b/src/drivers/i2c/lp5562/led_lp5562_programs.c @@ -88,67 +88,59 @@ } }; -static uint8_t solid_FF_b_text[] = { - 0x40, 255, 0xc0, 0x00, -}; - -static uint8_t solid_FF_g_text[] = { - 0x40, 255, 0xc0, 0x00 -}; - -static uint8_t solid_FF_r_text[] = { - 0x40, 255, 0xc0, 0x00 -}; - -static TiLp5562Program solid_FFFFFF_program = { - { - { /* Engine1:Blue */ - solid_FF_b_text, - sizeof(solid_FF_b_text), - 0, - LED_LP5562_DEFAULT_CURRENT - }, - { /* Engine2:Green */ - solid_FF_g_text, - sizeof(solid_FF_g_text), - 0, - LED_LP5562_DEFAULT_CURRENT - }, - { /* Engine3:Red */ - solid_FF_r_text, - sizeof(solid_FF_r_text), - 0, - LED_LP5562_DEFAULT_CURRENT - }, - } -}; - /* * fdr_press1.src * 1 00 .ENGINE1(B) 2 00 4000 set_pwm 0 - 3 01 C000 end - 4 - 5 10 .ENGINE2(G) - 6 10 40CC set_pwm 204 - 7 11 C000 end - 8 - 9 20 .ENGINE3(R) - 10 20 40FF set_pwm 255 - 11 21 C000 end + 3 loop1_1: + 4 01 E208 trigger w3,s3 + 5 02 4000 set_pwm 0 + 6 03 4000 set_pwm 0 + 7 04 E208 trigger w3,s3 + 8 05 4000 set_pwm 0 + 9 06 4000 set_pwm 0 + 10 07 A001 branch 0, loop1_1 + 11 + 12 10 .ENGINE2(G) + 13 10 4000 set_pwm 0 + 14 loop2_1: + 15 11 E208 trigger w3,s3 + 16 12 0565 ramp 250, 102 + 17 13 0565 ramp 250, 102 + 18 14 E208 trigger w3,s3 + 19 15 05E5 ramp 250, -102 + 20 16 05E5 ramp 250, -102 + 21 17 A011 branch 0,loop2_1 + 22 + 23 20 .ENGINE3(R) + 24 20 4000 set_pwm 0 + 25 loop3_1: + 26 21 E186 trigger s21,w21 + 27 22 047E ramp 250, 127 + 28 23 047F ramp 250, 128 + 29 24 E186 trigger s21,w21 + 30 25 04FE ramp 250, -127 + 31 26 04FF ramp 250, -128 + 32 27 A021 branch 0,loop3_1 */ +/* WWR_RECOVERY_PUSHED */ +/* Fast Blinking Yellow */ +/* Ramp up to (255,204,0) in 0.5sec, ramp down to (0,0,0) in 0.5sec */ static uint8_t fdr_press1_b_text[] = { - 0x40, 0, 0xc0, 0x00, + 0x40, 0x00, 0xE2, 0x08, 0x40, 0x00, 0x40, 0x00, + 0xE2, 0x08, 0x40, 0x00, 0x40, 0x00, 0xA0, 0x01, }; static uint8_t fdr_press1_g_text[] = { - 0x40, 204, 0xc0, 0x00 + 0x40, 0x00, 0xE2, 0x08, 0x05, 0x65, 0x05, 0x65, + 0xE2, 0x08, 0x05, 0xE5, 0x05, 0xE5, 0xA0, 0x11, }; static uint8_t fdr_press1_r_text[] = { - 0x40, 255, 0xc0, 0x00 + 0x40, 0x00, 0xE1, 0x86, 0x04, 0x7E, 0x04, 0x7F, + 0xE1, 0x86, 0x04, 0xFE, 0x04, 0xFF, 0xA0, 0x21, }; static TiLp5562Program fdr_press1_program = { @@ -175,6 +167,88 @@ }; /* + * wipeout_request1.src + * + 1 00 .ENGINE1(B) + 2 00 4000 set_pwm 0 + 3 loop1_1: + 4 01 E208 trigger w3,s3 + 5 02 4000 set_pwm 0 + 6 03 4000 set_pwm 0 + 7 04 E208 trigger w3,s3 + 8 05 4000 set_pwm 0 + 9 06 4000 set_pwm 0 + 10 07 A001 branch 0, loop1_1 + 11 + 12 10 .ENGINE2(G) + 13 10 4000 set_pwm 0 + 14 loop2_1: + 15 11 E208 trigger w3,s3 + 16 12 0565 ramp 250, 102 + 17 13 0565 ramp 250, 102 + 18 14 E208 trigger w3,s3 + 19 15 05E5 ramp 250, -102 + 20 16 05E5 ramp 250, -102 + 21 17 A011 branch 0,loop2_1 + 22 + 23 20 .ENGINE3(R) + 24 20 4000 set_pwm 0 + 25 loop3_2: + 26 21 6000 wait 500 + 27 22 A321 branch 6,loop3_2 + 28 loop3_1: + 29 23 E186 trigger s21,w21 + 30 24 047E ramp 250, 127 + 31 25 047F ramp 250, 128 + 32 26 E186 trigger s21,w21 + 33 27 04FE ramp 250, -127 + 34 28 04FF ramp 250, -128 +*/ + +/* WWR_WIPEOUT_REQUEST */ +/* Fast Blinking Yellow with 3sec delay */ +/* Blank for 3sec */ +/* Ramp up to (255,204,0) in 0.5sec, ramp down to (0,0,0) in 0.5sec */ +static uint8_t wipeout_request1_b_text[] = { + 0x40, 0x00, 0xE2, 0x08, 0x40, 0x00, 0x40, 0x00, + 0xE2, 0x08, 0x40, 0x00, 0x40, 0x00, 0xA0, 0x01, +}; + +static uint8_t wipeout_request1_g_text[] = { + 0x40, 0x00, 0xE2, 0x08, 0x05, 0x65, 0x05, 0x65, + 0xE2, 0x08, 0x05, 0xE5, 0x05, 0xE5, 0xA0, 0x11, +}; + +static uint8_t wipeout_request1_r_text[] = { + 0x40, 0x00, 0x60, 0x00, 0xA3, 0x21, 0xE1, 0x86, + 0x04, 0x7E, 0x04, 0x7F, 0xE1, 0x86, 0x04, 0xFE, + 0x04, 0xFF, 0xA0, 0x23, +}; + +static TiLp5562Program wipeout_request1_program = { + { + { + wipeout_request1_b_text, + sizeof(wipeout_request1_b_text), + 0, + LED_LP5562_DEFAULT_CURRENT + }, + { + wipeout_request1_g_text, + sizeof(wipeout_request1_g_text), + 0, + LED_LP5562_DEFAULT_CURRENT + }, + { + wipeout_request1_r_text, + sizeof(wipeout_request1_r_text), + 0, + LED_LP5562_DEFAULT_CURRENT + }, + } +}; + +/* * blink_recovery1.src * 1 00 .ENGINE1(B) @@ -186,7 +260,7 @@ 7 8 10 .ENGINE2(G) 9 10 E200 trigger w3 - 10 11 40CC set_pwm 204 + 10 11 40CC set_pwm 0 11 12 E200 trigger w3 12 13 4000 set_pwm 0 13 14 0000 gotostart @@ -201,13 +275,15 @@ 22 26 0000 gotostart */ +/* WWR_RECOVERY_REQUEST */ +/* Blinking Red, (255,0,0) for 0.3sec, (0,0,0) for 0.3sec */ static uint8_t blink_recovery1_b_text[] = { 0xe2, 0x00, 0x40, 0, 0xe2, 0x00, 0x40, 0, 0x00, 0x00, }; static uint8_t blink_recovery1_g_text[] = { - 0xe2, 0x00, 0x40, 204, 0xe2, 0x00, 0x40, 0, + 0xe2, 0x00, 0x40, 0, 0xe2, 0x00, 0x40, 0, 0x00, 0x00, }; @@ -261,6 +337,8 @@ 17 23 C000 end */ +/* WWR_NORMAL_BOOT */ +/* Ramp up to (77,77,77) in 0.5sec */ static uint8_t preboot1_b_text[] = { 0x40, 0x00, 0xe2, 0x00, 0x0d, 0x4c, 0xc0, 0x00 }; @@ -296,8 +374,8 @@ const Led5562StateProg led_lp5562_state_programs[] = { {LED_ALL_OFF, {&solid_000000_program} }, - {LED_RECOVERY_PUSHED, {&solid_FFFFFF_program} }, - {LED_WIPEOUT_REQUEST, {&fdr_press1_program} }, + {LED_RECOVERY_PUSHED, {&fdr_press1_program} }, + {LED_WIPEOUT_REQUEST, {&wipeout_request1_program} }, {LED_RECOVERY_REQUEST, {&blink_recovery1_program} }, {LED_NORMAL_BOOT, {&preboot1_program} }, {}, /* Empty record to mark the end of the table. */ @@ -408,12 +486,122 @@ } }; +// Calibration code map for "fast blink" pattern. +// Start from OFF, +// ramp up in 0.5sec, ramp down in 0.5sec, repeat forever. +const struct lp5562_calibration_code_map mistral_code_map_fast_blink[] = { + { + blue, + ramp, + 0x02, + 2, + { {250, 128}, {250, 128} } + }, + { + blue, + ramp, + 0x05, + 2, + { {250, -128}, {250, -128} } + }, + { + green, + ramp, + 0x12, + 2, + { {250, 128}, {250, 128} } + }, + { + green, + ramp, + 0x15, + 2, + { {250, -128}, {250, -128} } + }, + { + red, + ramp, + 0x22, + 2, + { {250, 128}, {250, 128} } + }, + { + red, + ramp, + 0x25, + 2, + { {250, -128}, {250, -128} } + }, + { + 0, + invalid, + 0x00, + 0, + { } + } +}; + +// Calibration code map for "wipeout request" pattern. +// Start from OFF, wait for 3 seconds +// ramp up in 0.5sec, ramp down in 0.5sec, repeat forever. +const struct lp5562_calibration_code_map mistral_code_map_wipeout_request1[] = { + { + blue, + ramp, + 0x02, + 2, + { {250, 128}, {250, 128} } + }, + { + blue, + ramp, + 0x05, + 2, + { {250, -128}, {250, -128} } + }, + { + green, + ramp, + 0x12, + 2, + { {250, 128}, {250, 128} } + }, + { + green, + ramp, + 0x15, + 2, + { {250, -128}, {250, -128} } + }, + { + red, + ramp, + 0x24, + 2, + { {250, 128}, {250, 128} } + }, + { + red, + ramp, + 0x27, + 2, + { {250, -128}, {250, -128} } + }, + { + 0, + invalid, + 0x00, + 0, + { } + } +}; + const struct lp5562_calibration_data mistral_calibration_database[] = { { - &solid_FFFFFF_program, - 0, /* White */ - 100, /* 30% brigheness */ - mistral_code_map_solid, + &fdr_press1_program, + 1, /* Yellow */ + 100, /* 100% brigheness */ + mistral_code_map_fast_blink, }, { &preboot1_program, @@ -423,15 +611,15 @@ }, { &blink_recovery1_program, - 1, /* Yellow */ + 2, /* Red */ 100, /* 100% brightness */ mistral_code_map_blink, }, { - &fdr_press1_program, + &wipeout_request1_program, 1, /* Yellow */ 100, /* 100% brightness */ - mistral_code_map_solid, + mistral_code_map_wipeout_request1, }, { NULL, diff --git a/src/mainboard/google/mistral/chromeos.c b/src/mainboard/google/mistral/chromeos.c index 8873edd..a61c722 100644 --- a/src/mainboard/google/mistral/chromeos.c +++ b/src/mainboard/google/mistral/chromeos.c @@ -46,7 +46,7 @@ } #define WIPEOUT_MODE_DELAY_MS (8 * 1000) -#define RECOVERY_MODE_EXTRA_DELAY_MS (8 * 1000) +#define RECOVERY_MODE_EXTRA_DELAY_MS (22 * 1000) /* * The recovery switch: it needs to be pressed for a -- To view, visit https://review.coreboot.org/c/coreboot/+/34711 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ibd426162f18aefae79cb390cc0c4e44de6cb6f6e Gerrit-Change-Number: 34711 Gerrit-PatchSet: 1 Gerrit-Owner: Yuji Sasaki <sasakiy(a)chromium.org> Gerrit-MessageType: newchange

5 16

Change in ...coreboot[master]: google/mistrtal: Add board ID API.
by SANTHOSH JANARDHANA HASSAN (Code Review) 11 Mar '20

11 Mar '20

SANTHOSH JANARDHANA HASSAN has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31426 Change subject: google/mistrtal: Add board ID API. ...................................................................... google/mistrtal: Add board ID API. BUG=None TEST=Verified GPIO assignment and board ID values. BRANCH=None Change-Id: Ic81b41f799c7bfc47a0daee705db1c01cd0af1a3 Signed-off-by: Santhosh Hassan <sahassan(a)google.com> --- M src/mainboard/google/mistral/Makefile.inc A src/mainboard/google/mistral/boardid.c 2 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/31426/1 diff --git a/src/mainboard/google/mistral/Makefile.inc b/src/mainboard/google/mistral/Makefile.inc index e9013af..ae418f2 100644 --- a/src/mainboard/google/mistral/Makefile.inc +++ b/src/mainboard/google/mistral/Makefile.inc @@ -3,6 +3,7 @@ bootblock-y += chromeos.c bootblock-y += bootblock.c +verstage-y += boardid.c verstage-y += memlayout.ld verstage-y += chromeos.c verstage-y += verstage.c @@ -10,7 +11,9 @@ romstage-y += memlayout.ld romstage-y += chromeos.c romstage-y += romstage.c +romstage-y += boardid.c +ramstage-y += boardid.c ramstage-y += memlayout.ld ramstage-y += chromeos.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/mistral/boardid.c b/src/mainboard/google/mistral/boardid.c new file mode 100644 index 0000000..f20960c --- /dev/null +++ b/src/mainboard/google/mistral/boardid.c @@ -0,0 +1,46 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <boardid.h> +#include <gpio.h> +#include <console/console.h> +#include <stdlib.h> + +/* + * Mistral boards dedicate to the board ID three GPIOs in ternary mode: 105, 106 + * and 107. + */ + +static uint32_t board_id_val = UNDEFINED_STRAPPING_ID; + +static uint32_t get_board_id(void) +{ + uint32_t bid; + const gpio_t pins[] = {[2] = GPIO(107), [1] = GPIO(106), [0] = GPIO(105)}; + + bid = gpio_binary_first_base3_value(pins, ARRAY_SIZE(pins)); + printk(BIOS_INFO, "Board ID %d\n", bid); + + return bid; +} + +uint32_t board_id(void) +{ + if (board_id_val == UNDEFINED_STRAPPING_ID) + board_id_val = get_board_id(); + + return board_id_val; +} + -- To view, visit https://review.coreboot.org/c/coreboot/+/31426 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic81b41f799c7bfc47a0daee705db1c01cd0af1a3 Gerrit-Change-Number: 31426 Gerrit-PatchSet: 1 Gerrit-Owner: SANTHOSH JANARDHANA HASSAN <sahassan(a)google.com> Gerrit-MessageType: newchange

5 12

Change in ...coreboot[master]: google/mistrtal: Setup required Chromeos GPIOs.
by SANTHOSH JANARDHANA HASSAN (Code Review) 11 Mar '20

11 Mar '20

SANTHOSH JANARDHANA HASSAN has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31459 Change subject: google/mistrtal: Setup required Chromeos GPIOs. ...................................................................... google/mistrtal: Setup required Chromeos GPIOs. Setup Flash write protect, recovery and h1 interrupt gpios to requires state at boot. BUG=None TEST=Verified GPIO state and its functionalities. BRANCH=None Change-Id: I5d98737a3b4e6376fd1c7115c42e795bba3b56ef Signed-off-by: Santhosh Hassan <sahassan(a)google.com> --- M src/mainboard/google/mistral/bootblock.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/31459/1 diff --git a/src/mainboard/google/mistral/bootblock.c b/src/mainboard/google/mistral/bootblock.c index 6718d52..c72856d 100644 --- a/src/mainboard/google/mistral/bootblock.c +++ b/src/mainboard/google/mistral/bootblock.c @@ -15,8 +15,9 @@ #include <bootblock_common.h> #include <timestamp.h> +#include "board.h" void bootblock_mainboard_init(void) { - + setup_chromeos_gpios(); } -- To view, visit https://review.coreboot.org/c/coreboot/+/31459 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5d98737a3b4e6376fd1c7115c42e795bba3b56ef Gerrit-Change-Number: 31459 Gerrit-PatchSet: 1 Gerrit-Owner: SANTHOSH JANARDHANA HASSAN <sahassan(a)google.com> Gerrit-MessageType: newchange

4 9

Change in ...coreboot[master]: TEMP: NOT FOR REVIEW: google/mistral: Support dev physical button
by SANTHOSH JANARDHANA HASSAN (Code Review) 11 Mar '20

11 Mar '20

SANTHOSH JANARDHANA HASSAN has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31826 Change subject: TEMP: NOT FOR REVIEW: google/mistral: Support dev physical button ...................................................................... TEMP: NOT FOR REVIEW: google/mistral: Support dev physical button Change-Id: Id0093dec38720bb54c7b0f35db42bd851ab875ba Signed-off-by: Santhosh Hassan <sahassan(a)google.com> --- M src/mainboard/google/mistral/board.h M src/mainboard/google/mistral/chromeos.c 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/31826/1 diff --git a/src/mainboard/google/mistral/board.h b/src/mainboard/google/mistral/board.h index 2e23ce3..51e4bf2 100644 --- a/src/mainboard/google/mistral/board.h +++ b/src/mainboard/google/mistral/board.h @@ -19,7 +19,7 @@ #include <gpio.h> #include <soc/gpio.h> - +#define GPIO_DEV_STATE GPIO(45) #define GPIO_H1_AP_INT GPIO(53) #define GPIO_WP_STATE GPIO(54) #define GPIO_REC_STATE GPIO(77) diff --git a/src/mainboard/google/mistral/chromeos.c b/src/mainboard/google/mistral/chromeos.c index 838691b..9b69a4f 100644 --- a/src/mainboard/google/mistral/chromeos.c +++ b/src/mainboard/google/mistral/chromeos.c @@ -24,11 +24,14 @@ { gpio_input(GPIO_WP_STATE); gpio_input(GPIO_REC_STATE); + gpio_input(GPIO_DEV_STATE); } void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio chromeos_gpios[] = { + {GPIO_DEV_STATE.addr, ACTIVE_HIGH, + gpio_get(GPIO_DEV_STATE), "developer"}, {GPIO_REC_STATE.addr, ACTIVE_LOW, gpio_get(GPIO_REC_STATE), "recovery"}, {GPIO_WP_STATE.addr, ACTIVE_LOW, -- To view, visit https://review.coreboot.org/c/coreboot/+/31826 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id0093dec38720bb54c7b0f35db42bd851ab875ba Gerrit-Change-Number: 31826 Gerrit-PatchSet: 1 Gerrit-Owner: SANTHOSH JANARDHANA HASSAN <sahassan(a)google.com> Gerrit-MessageType: newchange

2 3

Change in ...coreboot[master]: mb/google/mistral: Ignore REC switch if TPM isn't ready
by Patrick Georgi (Code Review) 11 Mar '20

11 Mar '20

Hello SANTHOSH JANARDHANA HASSAN, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/32272 to review the following change. Change subject: mb/google/mistral: Ignore REC switch if TPM isn't ready ...................................................................... mb/google/mistral: Ignore REC switch if TPM isn't ready The recovery button's state is cached in the TPM, but on first boot Cr50 isn't ready yet for this task, which leads to a reboot further down the road (to get TPM up). To not confuse matters further, only act on the recovery button if the TPM is in fact able to cache the state. BUG=b:129878075 BRANCH=none TEST=recovery button is only read on second boot Change-Id: I1ad2c148be4cbdbb2afa05c46c483d89855e1959 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M src/mainboard/google/mistral/chromeos.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/32272/1 diff --git a/src/mainboard/google/mistral/chromeos.c b/src/mainboard/google/mistral/chromeos.c index 9b69a4f..e0306b16 100644 --- a/src/mainboard/google/mistral/chromeos.c +++ b/src/mainboard/google/mistral/chromeos.c @@ -72,6 +72,9 @@ gpio_t rec_sw; static enum switch_state saved_state = not_probed; + if (is_tpm_detected() == 0) + return saved_state; + if (saved_state != not_probed) return saved_state; -- To view, visit https://review.coreboot.org/c/coreboot/+/32272 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1ad2c148be4cbdbb2afa05c46c483d89855e1959 Gerrit-Change-Number: 32272 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: SANTHOSH JANARDHANA HASSAN <sahassan(a)google.com> Gerrit-MessageType: newchange

1 2

Change in ...coreboot[master]: TEMP: NOT FOR REVIEW: google/mistral: Add LP5562 driver
by SANTHOSH JANARDHANA HASSAN (Code Review) 11 Mar '20

11 Mar '20

Hello Yuji Sasaki, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/32693 to review the following change. Change subject: TEMP: NOT FOR REVIEW: google/mistral: Add LP5562 driver ...................................................................... TEMP: NOT FOR REVIEW: google/mistral: Add LP5562 driver Add LP5562 driver to mistral board file. BUG=b:116352348 TEST=build coreboot and chromeos-bootimage, run on mistral. Signed-off-by: Yuji Sasaki <sasakiy(a)chromium.org> Change-Id: I0c26ac952671cb94a2e5681da6e2f2eafddedb48 --- M src/drivers/i2c/lp5562/led_lp5562_programs.c M src/mainboard/google/mistral/Kconfig M src/mainboard/google/mistral/board.h M src/mainboard/google/mistral/bootblock.c M src/mainboard/google/mistral/chromeos.c 5 files changed, 119 insertions(+), 94 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/32693/1 diff --git a/src/drivers/i2c/lp5562/led_lp5562_programs.c b/src/drivers/i2c/lp5562/led_lp5562_programs.c index f322f6a..e837dfd 100644 --- a/src/drivers/i2c/lp5562/led_lp5562_programs.c +++ b/src/drivers/i2c/lp5562/led_lp5562_programs.c @@ -60,12 +60,12 @@ /* RGB set to 000000, resulting in all LEDs off. */ static const uint8_t solid_00_text[] = { - 0x40, 0x00, 0xc0, 0x00 + 0x40, 0, 0xc0, 0x00 }; /* Rgb set to 128, resulting in a brightish white color. */ -static const uint8_t solid_80_text[] = { - 0x40, 0x80, 0xc0, 0x00 +static const uint8_t solid_FF_text[] = { + 0x40, 255, 0xc0, 0x00 }; static const TiLp5562Program solid_000000_program = { @@ -88,44 +88,94 @@ } }; -static const TiLp5562Program solid_808080_program = { +static const TiLp5562Program solid_FFFFFF_program = { { { /* Engine1:Blue */ - solid_80_text, - sizeof(solid_80_text), + solid_FF_text, + sizeof(solid_FF_text), 0, }, { /* Engine2:Green */ - solid_80_text, - sizeof(solid_80_text), + solid_FF_text, + sizeof(solid_FF_text), 0, }, { /* Engine3:Red */ - solid_80_text, - sizeof(solid_80_text), + solid_FF_text, + sizeof(solid_FF_text), 0, }, } }; /* + * fdr_press1.src + * + 1 00 .ENGINE1(B) + 2 00 4000 set_pwm 0 + 3 01 C000 end + 4 + 5 10 .ENGINE2(G) + 6 10 40CC set_pwm 204 + 7 11 C000 end + 8 + 9 20 .ENGINE3(R) + 10 20 40FF set_pwm 255 + 11 21 C000 end +*/ + +static const uint8_t fdr_press1_b_text[] = { + 0x40, 0, 0xc0, 0x00, +}; + +static const uint8_t fdr_press1_g_text[] = { + 0x40, 204, 0xc0, 0x00 +}; + +static const uint8_t fdr_press1_r_text[] = { + 0x40, 255, 0xc0, 0x00 +}; + +static const TiLp5562Program fdr_press1_program = { + { + { + fdr_press1_b_text, + sizeof(fdr_press1_b_text), + 0, + }, + { + fdr_press1_g_text, + sizeof(fdr_press1_g_text), + 0, + }, + { + fdr_press1_r_text, + sizeof(fdr_press1_r_text), + 0, + }, + } +}; + +/* + * blink_recovery1.src + * 1 00 .ENGINE1(B) 2 00 E200 trigger w3 - 3 01 409B set_pwm 155 + 3 01 4000 set_pwm 0 4 02 E200 trigger w3 5 03 4000 set_pwm 0 6 04 0000 gotostart 7 8 10 .ENGINE2(G) 9 10 E200 trigger w3 - 10 11 4032 set_pwm 50 + 10 11 40CC set_pwm 204 11 12 E200 trigger w3 12 13 4000 set_pwm 0 13 14 0000 gotostart 14 15 20 .ENGINE3(R) 16 20 E006 trigger s21 - 17 21 4001 set_pwm 1 + 17 21 40FF set_pwm 255 18 22 5300 wait 300 19 23 E006 trigger s21 20 24 4000 set_pwm 0 @@ -133,48 +183,13 @@ 22 26 0000 gotostart */ -static const uint8_t blink_wipeout1_b_text[] = { - 0xe2, 0x00, 0x40, 155, 0xe2, 0x00, 0x40, 0, - 0x00, 0x00, -}; - -static const uint8_t blink_wipeout1_g_text[] = { - 0xe2, 0x00, 0x40, 50, 0xe2, 0x00, 0x40, 0, - 0x00, 0x00, -}; - -static const uint8_t blink_wipeout1_r_text[] = { - 0xe0, 0x06, 0x40, 1, 0x53, 0x00, 0xe0, 0x06, - 0x40, 0, 0x53, 0x00, 0x00, 0x00 -}; - -static const TiLp5562Program blink_wipeout1_program = { - { - { - blink_wipeout1_b_text, - sizeof(blink_wipeout1_b_text), - 0, - }, - { - blink_wipeout1_g_text, - sizeof(blink_wipeout1_g_text), - 0, - }, - { - blink_wipeout1_r_text, - sizeof(blink_wipeout1_r_text), - 0, - }, - } -}; - static const uint8_t blink_recovery1_b_text[] = { - 0xe2, 0x00, 0x40, 10, 0xe2, 0x00, 0x40, 0, + 0xe2, 0x00, 0x40, 0, 0xe2, 0x00, 0x40, 0, 0x00, 0x00, }; static const uint8_t blink_recovery1_g_text[] = { - 0xe2, 0x00, 0x40, 100, 0xe2, 0x00, 0x40, 0, + 0xe2, 0x00, 0x40, 204, 0xe2, 0x00, 0x40, 0, 0x00, 0x00, }; @@ -187,73 +202,69 @@ { { blink_recovery1_b_text, - sizeof(blink_wipeout1_b_text), + sizeof(blink_recovery1_b_text), 0, }, { blink_recovery1_g_text, - sizeof(blink_wipeout1_g_text), + sizeof(blink_recovery1_g_text), 0, }, { blink_recovery1_r_text, - sizeof(blink_wipeout1_r_text), + sizeof(blink_recovery1_r_text), 0, }, } }; /* - * fade_in1.src + * preboot1.src * 1 00 .ENGINE1(B) 2 00 4000 set_pwm 0 3 01 E200 trigger w3 - 4 02 1B4C ramp 1000, 77 # ramp up to 155 for 2 seconds - 5 03 1A4D ramp 1000, 78 - 6 04 C000 end - 7 - 8 10 .ENGINE2(G) - 9 10 4000 set_pwm 0 - 10 11 E200 trigger w3 - 11 12 4318 ramp 1000, 25 # ramp up to 50 for 2 seconds - 12 13 4318 ramp 1000, 25 - 13 14 C000 end - 14 - 15 20 .ENGINE3(R) - 16 20 E006 trigger s21 - 17 21 4001 set_pwm 1 - 18 22 E006 trigger s21 - 19 23 C000 end + 4 02 0D4C ramp 500, 77 + 5 03 C000 end + 6 + 7 10 .ENGINE2(G) + 8 10 4000 set_pwm 0 + 9 11 E200 trigger w3 + 10 12 0D4C ramp 500, 77 + 11 13 C000 end + 12 + 13 20 .ENGINE3(R) + 14 20 4000 set_pwm 0 + 15 21 E006 trigger s21 + 16 22 0D4C ramp 500, 77 + 17 23 C000 end */ -static const uint8_t fade_in1_b_text[] = { - 0x40, 0, 0xe2, 0x00, 0x1b, 0x4c, 0x1a, 0x4d, - 0xc0, 0x00 +static const uint8_t preboot1_b_text[] = { + 0x40, 0x00, 0xe2, 0x00, 0x0d, 0x4c, 0xc0, 0x00 }; -static const uint8_t fade_in1_g_text[] = { - 0x40, 0, 0xe2, 0x00, 0x43, 0x18, 0x43, 0x18, - 0xc0, 0x00 +static const uint8_t preboot1_g_text[] = { + 0x40, 0x00, 0xe2, 0x00, 0x0d, 0x4c, 0xc0, 0x00 }; -static const uint8_t fade_in1_r_text[] = { - 0xe0, 0x06, 0x40, 1, 0xe0, 0x06, 0x00 +static const uint8_t preboot1_r_text[] = { + 0x40, 0x00, 0xe0, 0x06, 0x0d, 0x4c, 0xc0, 0x00 }; -static const TiLp5562Program fade_in1_program = { +static const TiLp5562Program preboot1_program = { { { - fade_in1_b_text, - sizeof(fade_in1_b_text), + preboot1_b_text, + sizeof(preboot1_b_text), 0, }, { - fade_in1_g_text, - sizeof(fade_in1_g_text), + preboot1_g_text, + sizeof(preboot1_g_text), 0, }, { - fade_in1_r_text, - sizeof(fade_in1_r_text), + preboot1_r_text, + sizeof(preboot1_r_text), 0, }, } @@ -265,9 +276,9 @@ * be changed soon. */ {LED_ALL_OFF, {&solid_000000_program} }, - {LED_RECOVERY_PUSHED, {&solid_808080_program} }, - {LED_WIPEOUT_REQUEST, {&blink_wipeout1_program} }, + {LED_RECOVERY_PUSHED, {&solid_FFFFFF_program} }, + {LED_WIPEOUT_REQUEST, {&fdr_press1_program} }, {LED_RECOVERY_REQUEST, {&blink_recovery1_program} }, - {LED_NORMAL_BOOT, {&fade_in1_program} }, + {LED_NORMAL_BOOT, {&preboot1_program} }, {}, /* Empty record to mark the end of the table. */ }; diff --git a/src/mainboard/google/mistral/Kconfig b/src/mainboard/google/mistral/Kconfig index 87d2df8..4529abd 100644 --- a/src/mainboard/google/mistral/Kconfig +++ b/src/mainboard/google/mistral/Kconfig @@ -15,6 +15,7 @@ select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_SPI_TPM_CR50 + select DRIVERS_I2C_LED_LP5562 config VBOOT select VBOOT_VBNV_FLASH diff --git a/src/mainboard/google/mistral/board.h b/src/mainboard/google/mistral/board.h index 51e4bf2..88db42c 100644 --- a/src/mainboard/google/mistral/board.h +++ b/src/mainboard/google/mistral/board.h @@ -23,6 +23,7 @@ #define GPIO_H1_AP_INT GPIO(53) #define GPIO_WP_STATE GPIO(54) #define GPIO_REC_STATE GPIO(77) +#define GPIO_LED_ENABLE GPIO(119) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/mistral/bootblock.c b/src/mainboard/google/mistral/bootblock.c index be7a71e..da9dda8 100644 --- a/src/mainboard/google/mistral/bootblock.c +++ b/src/mainboard/google/mistral/bootblock.c @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2018, The Linux Foundation. All rights reserved. + * Copyright (C) 2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -15,9 +15,14 @@ #include <bootblock_common.h> #include <timestamp.h> +#include <delay.h> #include "board.h" void bootblock_mainboard_init(void) { + gpio_output(GPIO_LED_ENABLE, 0); + udelay(2); + gpio_set(GPIO_LED_ENABLE, 1); + mdelay(2); gpio_input_pullup(GPIO_H1_AP_INT); } diff --git a/src/mainboard/google/mistral/chromeos.c b/src/mainboard/google/mistral/chromeos.c index e0306b16..f220151 100644 --- a/src/mainboard/google/mistral/chromeos.c +++ b/src/mainboard/google/mistral/chromeos.c @@ -18,6 +18,8 @@ #include <console/console.h> #include <security/tpm/tis.h> #include <timer.h> +#include <drivers/i2c/lp5562/led_lp5562.h> +#include <soc/blsp.h> #include "board.h" void setup_chromeos_gpios(void) @@ -65,6 +67,11 @@ wipeout_req }; +static void display_pattern(int pattern) +{ + led_lp5562_display_pattern(BLSP_QUP_ID_1, pattern); +} + static enum switch_state get_rec_sw_state(void) { struct stopwatch sw; @@ -83,11 +90,11 @@ if (!sampled_value) { saved_state = no_req; - //display_pattern(WWR_NORMAL_BOOT); + display_pattern(LED_NORMAL_BOOT); return saved_state; } - //display_pattern(WWR_RECOVERY_PUSHED); + display_pattern(LED_RECOVERY_PUSHED); printk(BIOS_INFO, "recovery button pressed\n"); stopwatch_init_msecs_expire(&sw, WIPEOUT_MODE_DELAY_MS); @@ -99,7 +106,7 @@ } while (!stopwatch_expired(&sw)); if (sampled_value) { - //display_pattern(WWR_WIPEOUT_REQUEST); + display_pattern(LED_WIPEOUT_REQUEST); printk(BIOS_INFO, "wipeout requested, checking recovery\n"); stopwatch_init_msecs_expire(&sw, RECOVERY_MODE_EXTRA_DELAY_MS); do { @@ -110,14 +117,14 @@ if (sampled_value) { saved_state = recovery_req; - //display_pattern(WWR_RECOVERY_REQUEST); + display_pattern(LED_RECOVERY_REQUEST); printk(BIOS_INFO, "recovery requested\n"); } else { saved_state = wipeout_req; } } else { saved_state = no_req; - //display_pattern(WWR_NORMAL_BOOT); + display_pattern(LED_NORMAL_BOOT); } return saved_state; -- To view, visit https://review.coreboot.org/c/coreboot/+/32693 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0c26ac952671cb94a2e5681da6e2f2eafddedb48 Gerrit-Change-Number: 32693 Gerrit-PatchSet: 1 Gerrit-Owner: SANTHOSH JANARDHANA HASSAN <sahassan(a)google.com> Gerrit-Reviewer: Yuji Sasaki <sasakiy(a)chromium.org> Gerrit-MessageType: newchange

5 13

Change in ...coreboot[master]: TEMP: NOT FOR REVIEW: google/mistral: Limit FDR detection for verstage
by Yuji Sasaki (Code Review) 11 Mar '20

11 Mar '20

Yuji Sasaki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32904 Change subject: TEMP: NOT FOR REVIEW: google/mistral: Limit FDR detection for verstage ...................................................................... TEMP: NOT FOR REVIEW: google/mistral: Limit FDR detection for verstage FDR switch detection and LED state change must only be functional when called in verstage. get_recovery_mode_switch() is called from ramstage as part of elog function but this is informational purpose, should not affecting LED state and boot mode. This CL is adding #if directives to limit FDR detection for verstage. When get_recovery_mode_switch() is called from other stages, it just return current FDR switch state but do not change LED state or boot mode. BUG=b:131622855 TEST=Build and run on DUT, keep pushing FDR switch and power on, verify it do not fall into secondary FDR detection loop in ramstage after "recovery requested" in verstage. Signed-off-by: Yuji Sasaki <sasakiy(a)chromium.org> Change-Id: Ib034acca2bcf39728e58b468e69e74620b086a10 --- M src/mainboard/google/mistral/chromeos.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/32904/1 diff --git a/src/mainboard/google/mistral/chromeos.c b/src/mainboard/google/mistral/chromeos.c index f220151..8873edd 100644 --- a/src/mainboard/google/mistral/chromeos.c +++ b/src/mainboard/google/mistral/chromeos.c @@ -67,6 +67,11 @@ wipeout_req }; +/* + * FDR switch detection and LED state change is only functional + * when called in verstage. + */ +#if defined(__VERSTAGE__) static void display_pattern(int pattern) { led_lp5562_display_pattern(BLSP_QUP_ID_1, pattern); @@ -130,6 +135,20 @@ return saved_state; } +/* + * get_recovery_mode_switch is called from ramstage as part of + * elog function, but this is informational purpose to show current + * FDR switch state, should not affecting LED and boot mode. + */ +#else // defined(__VERSTAGE) +static enum switch_state get_rec_sw_state(void) +{ + gpio_t rec_sw = GPIO_REC_STATE; + int sampled_value = !gpio_get(rec_sw); + return sampled_value ? recovery_req : no_req; +} +#endif // defined(__VERSTAGE) + int get_recovery_mode_switch(void) { return get_rec_sw_state() == recovery_req; -- To view, visit https://review.coreboot.org/c/coreboot/+/32904 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib034acca2bcf39728e58b468e69e74620b086a10 Gerrit-Change-Number: 32904 Gerrit-PatchSet: 1 Gerrit-Owner: Yuji Sasaki <sasakiy(a)chromium.org> Gerrit-MessageType: newchange

2 3

Change in ...coreboot[master]: TEMP: NOT FOR REVIEW: google/mistral: Add LED calibration
by Yuji Sasaki (Code Review) 11 Mar '20

11 Mar '20

Yuji Sasaki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33431 Change subject: TEMP: NOT FOR REVIEW: google/mistral: Add LED calibration ...................................................................... TEMP: NOT FOR REVIEW: google/mistral: Add LED calibration Add LED calibration for LP5562. BUG=b:130764817 TEST=Run on DUT, verify LED color and brightness changed with led_calibration entry in the VPD. Change-Id: Iff3ab55cdd12a8e8fe7549bce99a88ed0ef01534 --- M src/drivers/i2c/lp5562/Makefile.inc M src/drivers/i2c/lp5562/led_lp5562.c A src/drivers/i2c/lp5562/led_lp5562_calibration.c A src/drivers/i2c/lp5562/led_lp5562_calibration.h M src/drivers/i2c/lp5562/led_lp5562_programs.c M src/drivers/i2c/lp5562/led_lp5562_programs.h M src/mainboard/google/mistral/Makefile.inc A src/mainboard/google/mistral/led_calibration.c A src/mainboard/google/mistral/led_calibration.h M src/mainboard/google/mistral/verstage.c 10 files changed, 748 insertions(+), 32 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/33431/1 diff --git a/src/drivers/i2c/lp5562/Makefile.inc b/src/drivers/i2c/lp5562/Makefile.inc index bfdb408..308898e 100644 --- a/src/drivers/i2c/lp5562/Makefile.inc +++ b/src/drivers/i2c/lp5562/Makefile.inc @@ -1,5 +1,6 @@ verstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562.c verstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562_programs.c +verstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562_calibration.c ramstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562.c ramstage-$(CONFIG_DRIVERS_I2C_LED_LP5562) += led_lp5562_programs.c diff --git a/src/drivers/i2c/lp5562/led_lp5562.c b/src/drivers/i2c/lp5562/led_lp5562.c index 6eafee3..268eac0 100644 --- a/src/drivers/i2c/lp5562/led_lp5562.c +++ b/src/drivers/i2c/lp5562/led_lp5562.c @@ -290,6 +290,14 @@ enable_reg |= LP5562_ENABLE_ALL_HOLD; ledc_write_enable(ledc, enable_reg); + /* Configure LED current */ + ledc_write(ledc, LP5562_CURRENT_B, + &program_desc->engine_program[0].led_current, 1); + ledc_write(ledc, LP5562_CURRENT_G, + &program_desc->engine_program[1].led_current, 1); + ledc_write(ledc, LP5562_CURRENT_R, + &program_desc->engine_program[2].led_current, 1); + /* All engines in LOAD mode. */ ledc_write_opmode(ledc, LP5562_OPMODE_ALL_LOAD); diff --git a/src/drivers/i2c/lp5562/led_lp5562_calibration.c b/src/drivers/i2c/lp5562/led_lp5562_calibration.c new file mode 100644 index 0000000..ec11719 --- /dev/null +++ b/src/drivers/i2c/lp5562/led_lp5562_calibration.c @@ -0,0 +1,174 @@ +// Copyright 2019 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include <console/console.h> +#include <string.h> +#include "led_lp5562_programs.h" +#include "led_lp5562_calibration.h" + +static int calculate_step_time(int duration, int increment) +{ +/* + * On LP5562 ramp instruction, duration (D, msec) is + * D = T * step_time * increment * 1000 + * where T = 0.49msec(1/2048Hz) or 15.6msec(1/64Hz) + * Thus, + * step_time = D/(increment*T)/1000 + * = (D*F)/increment/1000 + * Use F=2048 for short duration, F=64 for long duration. + */ + int step_time = ((duration * 2048) / increment) / 1000; + if (step_time > 63) { + step_time = ((duration * 64) / increment) / 1000; + if (step_time > 63) { + return -1; /* Overflow */ + } + step_time |= 0x40; + } + return step_time; +} + +static void calibrate_set_pwm_instruction( + const struct lp5562_calibration_code_map* code_map, + uint8_t *code, + int offset, + int intensity) +{ + /* + * Calibrate set_pwm instruction: + * Just to replace PWM value in the code. + */ + code[offset+0] = 0x40; + code[offset+1] = intensity; +} + +static void calibrate_ramp_instruction( + const struct lp5562_calibration_code_map* code_map, + uint8_t *code, + int offset, + int intensity) +{ + int intensity_reminder = intensity; + + /* + * Calibrate ramp instruction: + * We have to re-calculate PWM increment and step time in the code. + * Because LP5562 only can handle PWM increment in 7-bit range + * (+2 to +128) per instruction, we usually use 2 consecutive + * ramp instructions to implement full 8-bit PWM swing. + * In that case we have to replace multiple PWM values / + * and step times. + */ + for (int i = 0; i < code_map->ramp_num; i++) { + int ramp_sign = 0; + int increment = + code_map->ramp_instructions[i].ramp_division; + int duration = + code_map->ramp_instructions[i].ramp_duration; + + /* + * Calculate PWM increment for this instruction. + */ + if (increment < 0) { + increment = -increment; + ramp_sign = 0x80; + } + + /* + * To handle division remainder, we track remaining + * intensity and plase the leftover at the last of + * consecutive ramp instructions. + * (if there is only one ramp instruction, we always + * use the intensity as PWM increment). + */ + if ((i == (code_map->ramp_num - 1))) { + increment = intensity_reminder; + } else { + increment = ((intensity * increment) / 256); + intensity_reminder -= increment; + } + + /* + * If there is no need to ramp PWM value, + * substitute the code with "set_pwm 0" instruction + * (0x4000) as placeholder. + */ + if (increment == 0) { + code[offset+0] = 0x40; + code[offset+1] = 0x00; + } else { + int step_time = + calculate_step_time(duration, increment); + + /* + * LP5562 ramp/wait duration is correlated with + * increment. Smaller the increment, shorter the + * duration. + * If single ramp/wait instruction could not handle + * specified duration, try to incrase increment. + */ + while (step_time < 0) { + increment++; + step_time = calculate_step_time( + duration, increment); + } + + increment = ramp_sign | (increment - 1); + code[offset+0] = step_time; + code[offset+1] = increment; + } + offset += 2; + } +} + +int led_lp5562_calibrate(const struct lp5562_calibration_data* cal_data, + struct lp5562_calibrated_color* calibrated_colors) +{ + const struct lp5562_calibration_code_map* + code_map = cal_data->code_map; + + while (code_map->code_type != invalid) { + int bgr_index = code_map->component; + int rgb_index = (2 - bgr_index); + int offset = (code_map->code_offset % NPROGSIZE) * 2; + uint8_t *code = cal_data->pattern-> + engine_program[bgr_index].program_text; + + cal_data->pattern->engine_program[bgr_index].led_current = + calibrated_colors[cal_data->color_index]. + current_values[rgb_index]; + + /* + * Calculate calibrated LED intensity (0-255) + * +50 is to round off the fraction. + */ + int intensity = + calibrated_colors[cal_data->color_index]. + pwm_values[rgb_index]; + if (cal_data->relative_brightness != 100) { + intensity = (intensity * + cal_data->relative_brightness + 50) / 100; + } + + switch (code_map->code_type) { + + case set_pwm: + calibrate_set_pwm_instruction( + code_map, code, offset, intensity); + break; + + case ramp: + calibrate_ramp_instruction( + code_map, code, offset, intensity); + break; + + default: + break; + } + + code_map++; + } + return 0; +} + diff --git a/src/drivers/i2c/lp5562/led_lp5562_calibration.h b/src/drivers/i2c/lp5562/led_lp5562_calibration.h new file mode 100644 index 0000000..5d8bee9 --- /dev/null +++ b/src/drivers/i2c/lp5562/led_lp5562_calibration.h @@ -0,0 +1,74 @@ +// Copyright 2019 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef LED_LP5562_CALIBRATION_H_ +#define LED_LP5562_CALIBRATION_H_ + +/* Size of LP5562 program memry, as in 16-bit word steps */ +#define NPROGSIZE 16 + +/* Number of consecutive ramp instructions */ +#define NMAXRAMPS 2 + +/* LP5562 color component number, associated with engine number */ +enum lp5562_components { + blue = 0, + green, + red +}; + +/* LP5562 code type for calibration (PWM value replacement) */ +enum lp5562_code_types { + invalid = 0, + set_pwm, + ramp +}; + +/* + * Structure to indicate where / how to replace PWM value + * in a LP5562 program code. + */ +struct lp5562_calibration_code_map { + enum lp5562_components component; + enum lp5562_code_types code_type; + /* Code offset, as in 16bit/word binary */ + uint8_t code_offset; + /* Number of consecutive ramp instructions */ + uint8_t ramp_num; + struct { + /* RAMP duration, in msec */ + uint16_t ramp_duration; + /* PWM division, -128 to +128 */ + int16_t ramp_division; + } ramp_instructions[NMAXRAMPS]; +}; + +/* + * Structure to store calibration data for a pattern. + */ +struct lp5562_calibration_data { + TiLp5562Program *pattern; + /* Index to calibrated color table */ + int color_index; + /* 0-100 % */ + int relative_brightness; + const struct lp5562_calibration_code_map* code_map; +}; + +/* + * Structure to store calibration data. + */ +struct lp5562_calibrated_color { + uint8_t pwm_values[3]; + uint8_t current_values[3]; +}; + +int led_lp5562_calibrate(const struct lp5562_calibration_data* cal_data, + struct lp5562_calibrated_color* calibrated_colors); + + +extern const struct lp5562_calibration_data mistral_calibration_database[]; + +#endif // LED_LP5562_CALIBRATION_H_ + diff --git a/src/drivers/i2c/lp5562/led_lp5562_programs.c b/src/drivers/i2c/lp5562/led_lp5562_programs.c index e837dfd..adb40bc 100644 --- a/src/drivers/i2c/lp5562/led_lp5562_programs.c +++ b/src/drivers/i2c/lp5562/led_lp5562_programs.c @@ -25,7 +25,9 @@ * LED behavior. */ +#include <stddef.h> #include "drivers/i2c/lp5562/led_lp5562_programs.h" +#include "drivers/i2c/lp5562/led_lp5562_calibration.h" /**************************************************************** * LED ring program definitions for different patterns. @@ -59,51 +61,64 @@ */ /* RGB set to 000000, resulting in all LEDs off. */ -static const uint8_t solid_00_text[] = { +static uint8_t solid_00_text[] = { 0x40, 0, 0xc0, 0x00 }; -/* Rgb set to 128, resulting in a brightish white color. */ -static const uint8_t solid_FF_text[] = { - 0x40, 255, 0xc0, 0x00 -}; - -static const TiLp5562Program solid_000000_program = { +static TiLp5562Program solid_000000_program = { { { /* Engine1:Blue */ solid_00_text, sizeof(solid_00_text), 0, - }, + LED_LP5562_DEFAULT_CURRENT + }, { /* Engine2:Green */ solid_00_text, sizeof(solid_00_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { /* Engine3:Red */ solid_00_text, sizeof(solid_00_text), 0, + LED_LP5562_DEFAULT_CURRENT }, } }; -static const TiLp5562Program solid_FFFFFF_program = { +static uint8_t solid_FF_b_text[] = { + 0x40, 255, 0xc0, 0x00, +}; + +static uint8_t solid_FF_g_text[] = { + 0x40, 255, 0xc0, 0x00 +}; + +static uint8_t solid_FF_r_text[] = { + 0x40, 255, 0xc0, 0x00 +}; + +static TiLp5562Program solid_FFFFFF_program = { { { /* Engine1:Blue */ - solid_FF_text, - sizeof(solid_FF_text), + solid_FF_b_text, + sizeof(solid_FF_b_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { /* Engine2:Green */ - solid_FF_text, - sizeof(solid_FF_text), + solid_FF_g_text, + sizeof(solid_FF_g_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { /* Engine3:Red */ - solid_FF_text, - sizeof(solid_FF_text), + solid_FF_r_text, + sizeof(solid_FF_r_text), 0, + LED_LP5562_DEFAULT_CURRENT }, } }; @@ -124,34 +139,37 @@ 11 21 C000 end */ -static const uint8_t fdr_press1_b_text[] = { +static uint8_t fdr_press1_b_text[] = { 0x40, 0, 0xc0, 0x00, }; -static const uint8_t fdr_press1_g_text[] = { +static uint8_t fdr_press1_g_text[] = { 0x40, 204, 0xc0, 0x00 }; -static const uint8_t fdr_press1_r_text[] = { +static uint8_t fdr_press1_r_text[] = { 0x40, 255, 0xc0, 0x00 }; -static const TiLp5562Program fdr_press1_program = { +static TiLp5562Program fdr_press1_program = { { { fdr_press1_b_text, sizeof(fdr_press1_b_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { fdr_press1_g_text, sizeof(fdr_press1_g_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { fdr_press1_r_text, sizeof(fdr_press1_r_text), 0, + LED_LP5562_DEFAULT_CURRENT }, } }; @@ -183,37 +201,40 @@ 22 26 0000 gotostart */ -static const uint8_t blink_recovery1_b_text[] = { +static uint8_t blink_recovery1_b_text[] = { 0xe2, 0x00, 0x40, 0, 0xe2, 0x00, 0x40, 0, 0x00, 0x00, }; -static const uint8_t blink_recovery1_g_text[] = { +static uint8_t blink_recovery1_g_text[] = { 0xe2, 0x00, 0x40, 204, 0xe2, 0x00, 0x40, 0, 0x00, 0x00, }; -static const uint8_t blink_recovery1_r_text[] = { +static uint8_t blink_recovery1_r_text[] = { 0xe0, 0x06, 0x40, 255, 0x53, 0x00, 0xe0, 0x06, 0x40, 0, 0x53, 0x00, 0x00, 0x00 }; -static const TiLp5562Program blink_recovery1_program = { +static TiLp5562Program blink_recovery1_program = { { { blink_recovery1_b_text, sizeof(blink_recovery1_b_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { blink_recovery1_g_text, sizeof(blink_recovery1_g_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { blink_recovery1_r_text, sizeof(blink_recovery1_r_text), 0, + LED_LP5562_DEFAULT_CURRENT }, } }; @@ -240,41 +261,40 @@ 17 23 C000 end */ -static const uint8_t preboot1_b_text[] = { +static uint8_t preboot1_b_text[] = { 0x40, 0x00, 0xe2, 0x00, 0x0d, 0x4c, 0xc0, 0x00 }; -static const uint8_t preboot1_g_text[] = { +static uint8_t preboot1_g_text[] = { 0x40, 0x00, 0xe2, 0x00, 0x0d, 0x4c, 0xc0, 0x00 }; -static const uint8_t preboot1_r_text[] = { +static uint8_t preboot1_r_text[] = { 0x40, 0x00, 0xe0, 0x06, 0x0d, 0x4c, 0xc0, 0x00 }; -static const TiLp5562Program preboot1_program = { +static TiLp5562Program preboot1_program = { { { preboot1_b_text, sizeof(preboot1_b_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { preboot1_g_text, sizeof(preboot1_g_text), 0, + LED_LP5562_DEFAULT_CURRENT }, { preboot1_r_text, sizeof(preboot1_r_text), 0, + LED_LP5562_DEFAULT_CURRENT }, } }; const Led5562StateProg led_lp5562_state_programs[] = { - /* - * for test purposes the blank screen program is set to blinking, will - * be changed soon. - */ {LED_ALL_OFF, {&solid_000000_program} }, {LED_RECOVERY_PUSHED, {&solid_FFFFFF_program} }, {LED_WIPEOUT_REQUEST, {&fdr_press1_program} }, @@ -282,3 +302,147 @@ {LED_NORMAL_BOOT, {&preboot1_program} }, {}, /* Empty record to mark the end of the table. */ }; + +/* + * Calibration code map for "solid" pattern. + * Set PWM values then stop. + */ +const struct lp5562_calibration_code_map mistral_code_map_solid[] = { + { + blue, + set_pwm, + 0x00, + 0, + { } + }, + { + green, + set_pwm, + 0x10, + 0, + { } + }, + { + red, + set_pwm, + 0x20, + 0, + { } + }, + { + 0, + invalid, + 0x00, + 0, + { } + } +}; + +/* + * Calibration code map for "blink" pattern. + * Set PWM values, wait, set PWMs to 0, wait, loop. + */ +const struct lp5562_calibration_code_map mistral_code_map_blink[] = { + { + blue, + set_pwm, + 0x01, + 0, + { } + }, + { + green, + set_pwm, + 0x11, + 0, + { } + }, + { + red, + set_pwm, + 0x21, + 0, + { } + }, + { + 0, + invalid, + 0x00, + 0, + { } + } +}; + +/* + * Calibration code map for "slow blink" pattern. + * Start from OFF, + * ramp up in 1sec, ramp down in 2sec, repeat forever. + */ + +/* + * Calibration code map for "ramp up" pattern. + * Start from OFF, ramp up in 0.5sec + */ +const struct lp5562_calibration_code_map mistral_code_map_ramp_up[] = { + { + blue, + ramp, + 0x02, + 1, + { {500, 256}, } + }, + { + green, + ramp, + 0x12, + 1, + { {500, 256}, } + }, + { + red, + ramp, + 0x22, + 1, + { {500, 256}, } + }, + { + 0, + invalid, + 0x00, + 0, + { } + } +}; + +const struct lp5562_calibration_data mistral_calibration_database[] = { + { + &solid_FFFFFF_program, + 0, /* White */ + 100, /* 30% brigheness */ + mistral_code_map_solid, + }, + { + &preboot1_program, + 0, /* White */ + 30, /* 30% brigheness */ + mistral_code_map_ramp_up, + }, + { + &blink_recovery1_program, + 1, /* Yellow */ + 100, /* 100% brightness */ + mistral_code_map_blink, + }, + { + &fdr_press1_program, + 1, /* Yellow */ + 100, /* 100% brightness */ + mistral_code_map_solid, + }, + { + NULL, + 0, + 0, + NULL + } +}; diff --git a/src/drivers/i2c/lp5562/led_lp5562_programs.h b/src/drivers/i2c/lp5562/led_lp5562_programs.h index e5373c0..54dd0b2 100644 --- a/src/drivers/i2c/lp5562/led_lp5562_programs.h +++ b/src/drivers/i2c/lp5562/led_lp5562_programs.h @@ -37,6 +37,9 @@ /* Number of LP5562 controllers on this implementation */ #define LED_LP5562_NUM_LED_CONTROLLERS 1 +/* Default LED current (x0.1 mA) */ +#define LED_LP5562_DEFAULT_CURRENT 120 + /* * Structure to describe an lp5562 program: pointer to the text of the * program, its size for each engines, and start address relative to @@ -45,9 +48,10 @@ */ typedef struct { struct { - const uint8_t *program_text; + uint8_t *program_text; uint8_t program_size; uint8_t engine_start_addr; + uint8_t led_current; } engine_program[LED_LP5562_NUM_OF_ENGINES]; } TiLp5562Program; diff --git a/src/mainboard/google/mistral/Makefile.inc b/src/mainboard/google/mistral/Makefile.inc index ab81a73..f6dcb09 100644 --- a/src/mainboard/google/mistral/Makefile.inc +++ b/src/mainboard/google/mistral/Makefile.inc @@ -8,6 +8,7 @@ verstage-y += chromeos.c verstage-y += reset.c verstage-y += verstage.c +verstage-y += led_calibration.c romstage-y += memlayout.ld romstage-y += chromeos.c diff --git a/src/mainboard/google/mistral/led_calibration.c b/src/mainboard/google/mistral/led_calibration.c new file mode 100644 index 0000000..661332a --- /dev/null +++ b/src/mainboard/google/mistral/led_calibration.c @@ -0,0 +1,266 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <console/console.h> +#include <string.h> +#include <fmap.h> +#include "drivers/i2c/lp5562/led_lp5562_programs.h" +#include "drivers/i2c/lp5562/led_lp5562_calibration.h" +#include "led_calibration.h" + +/* Number of predefined colors */ +#define NDEFCOLORS 3 + +const char *color_names[NDEFCOLORS] = { + "white", + "yellow", + "red" +}; + +struct lp5562_calibrated_color calibrated_colors[NDEFCOLORS] = { + { {255, 255, 255}, {120, 120, 120} }, + { {255, 204, 0}, {120, 120, 120} }, + { {255, 0, 0}, {120, 120, 120} }, +}; + +static const char key_name[] = "led_calibration"; + +/* Some constants of VPD2.0 format */ +enum { + GOOGLE_VPD_2_0_OFFSET = 0x600, + VPD_TYPE_STRING = 0x01, + VPD_TYPE_INFO = 0xfe, +}; + +static int _strspn(const char *str, const char *spn); +static int _strcspn(const char *str, const char *spn); +static int _atoi(const char *str); +static int decode_vpd_length(uint8_t *vpd_ptr, int *offset_p, int max_len); +static int load_caldata_from_vpd(char *caldata_buff, int caldata_size); + +static int _strspn(const char *str, const char *spn) +{ + int ret = 0; + + while (*str != 0) { + const char *p = spn; + while (*p != 0) { + if (*str == *p) { + break; + } + p++; + } + if (*p == 0) { + break; + } + ret++; + str++; + } + return ret; +} + +static int _strcspn(const char *str, const char *spn) +{ + int ret = 0; + + while (*str != 0) { + const char *p = spn; + while (*p != 0) { + if (*str == *p++) { + return ret; + } + } + ret++; + str++; + } + return ret; +} + +static int _atoi(const char *str) +{ + int ret = 0; + + while (isdigit(*str)) { + ret *= 10; + ret += *str++ - '0'; + } + return ret; +} + + +/* Decode VPD length from given buffer */ +static int decode_vpd_length(uint8_t *vpd_ptr, int *offset_p, int max_len) +{ + int offset = *offset_p; + int len = 0; + uint8_t d; + + do { + d = vpd_ptr[offset++]; + len *= 128; + len += (d & 0x7f); + } while ((d & 0x80) && (offset < max_len)); + + if (d & 0x80) { + len = -1; + } + *offset_p = offset; + return len; +} + +/* Find and read LED calibration data from VPD */ +static int load_caldata_from_vpd(char *caldata_buff, int caldata_size) +{ + struct region_device rdev; + size_t offset; + size_t size; + ssize_t read_len; + int buff_offset; + int len; + uint8_t buff[256]; + int led_caldata_found = 0; + + if (fmap_locate_area_as_rdev("RO_VPD", &rdev)) { + return 0; + } + + /* Search from VPD2.0 fixed offset */ + offset = GOOGLE_VPD_2_0_OFFSET; + size = rdev.region.size; + while (!led_caldata_found && offset < size) { + uint8_t type; + + /* Read key length */ + read_len = rdev_readat(&rdev, buff, offset, 4); + if (read_len < 0) break; + type = buff[0]; + if ((type != VPD_TYPE_STRING) && (type != VPD_TYPE_INFO)) { + break; + } + buff_offset = 1; + len = decode_vpd_length(buff, &buff_offset, (size - offset)); + if (len < 0) break; + + offset += buff_offset; + if (len < sizeof(buff)) { + /* Read key */ + read_len = rdev_readat(&rdev, buff, offset, len); + if (read_len < 0) break; + buff[len] = 0; + if ((type == VPD_TYPE_STRING) && + (strcmp((char*)buff, key_name) == 0)) { + led_caldata_found = 1; + } + } + offset += len; + + /* Read value length */ + read_len = rdev_readat(&rdev, buff, offset, 4); + if (read_len < 0) break; + buff_offset = 0; + len = decode_vpd_length(buff, &buff_offset, (size - offset)); + if (len < 0) break; + + offset += buff_offset; + if (led_caldata_found) { + if (len >= caldata_size) { + printk(BIOS_ERR, + "LED_LP5562: Caldata too large(%d)\n", + len); + break; + } + + /* Read value */ + read_len = rdev_readat(&rdev, caldata_buff, offset, len); + if (read_len < 0) break; + led_caldata_found = 2; + } + offset += len; + } + return (led_caldata_found == 2); +} + +int calibrate_led(void) +{ + const char *separators = " ,;"; + char buff[256]; + char *p = buff; + int idx; + + if (!load_caldata_from_vpd(buff, sizeof(buff))) { + printk(BIOS_INFO, "LED_LP5562: Valid caldata not found\n"); + return 0; + } + + /* + * Parse calibration data + * Calibration data is list of entries separated by semicolon(;) + * An entry is list of values separated by commna(,) + * first value is ASCII string color name, + * second value is ASCII decimal string of current, + * 3rd, 4th, 5th values are brightness of Red, Green and Blue. + */ + while (*p != 0) { + int color; + int rgb; + int len; + + len = _strcspn(p, separators); + if (len < 1) { + break; + } + for (color = 0; color < NDEFCOLORS; color++) { + if (strncmp(color_names[color], p, len) == 0) { + break; + } + } + if (color >= NDEFCOLORS) { + len = _strcspn(p, ";"); + if (len < 0) { + break; + } + p += (len + 1); + continue; + } + + p += len; + p += _strspn(p, separators); + calibrated_colors[color].current_values[0] = + calibrated_colors[color].current_values[1] = + calibrated_colors[color].current_values[2] = _atoi(p); + + p += _strcspn(p, separators); + p += _strspn(p, separators); + for (rgb = 0; rgb < 3; rgb++) { + calibrated_colors[color].pwm_values[rgb] = _atoi(p); + p += _strcspn(p, separators); + p += _strspn(p, separators); + } + } + + /* + * Apply calibration data + */ + idx = 0; + while (mistral_calibration_database[idx].pattern != NULL) { + led_lp5562_calibrate( + &mistral_calibration_database[idx], + calibrated_colors); + idx++; + + } + return 0; +} + diff --git a/src/mainboard/google/mistral/led_calibration.h b/src/mainboard/google/mistral/led_calibration.h new file mode 100644 index 0000000..a9efe93 --- /dev/null +++ b/src/mainboard/google/mistral/led_calibration.h @@ -0,0 +1,22 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __COREBOOT_SRC_MAINBOARD_GOOGLE_MISTRAL_LED_CALIBRATION_H +#define __COREBOOT_SRC_MAINBOARD_GOOGLE_MISTRAL_LED_CALIBRATION_H + +extern int calibrate_led(void); + +#endif + diff --git a/src/mainboard/google/mistral/verstage.c b/src/mainboard/google/mistral/verstage.c index 08b5391..6a15de2 100644 --- a/src/mainboard/google/mistral/verstage.c +++ b/src/mainboard/google/mistral/verstage.c @@ -19,6 +19,7 @@ #include <soc/clock.h> #include <spi-generic.h> #include "board.h" +#include "led_calibration.h" void verstage_mainboard_init(void) { @@ -30,4 +31,5 @@ CONFIG_DRIVER_TPM_SPI_CHIP, &spi)) { printk(BIOS_ERR, "Failed to setup TPM SPI slave\n"); } + calibrate_led(); } -- To view, visit https://review.coreboot.org/c/coreboot/+/33431 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iff3ab55cdd12a8e8fe7549bce99a88ed0ef01534 Gerrit-Change-Number: 33431 Gerrit-PatchSet: 1 Gerrit-Owner: Yuji Sasaki <sasakiy(a)chromium.org> Gerrit-MessageType: newchange

4 16

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2019