Skip to content

hx30: restore RW firmware access #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: fwk-hx20-hx30-4410
Choose a base branch
from
Draft

hx30: restore RW firmware access #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f78c55
lfw: restore RW firmware access by using the right pin mux
DHowett Jun 27, 2022
4ed2983
Remember whether we cut power to ourselves, and re-check during boot
DHowett Jul 30, 2022
c187ce1
Make sure we fire SHUTDOWN_COMPLETE hooks when the AP goes down
DHowett Jul 30, 2022
e6e1190
mchp/lfw: make sure we keep the EC on for long operations
DHowett Jan 23, 2023
1dd37b6
Merge remote-tracking branch 'dhowett/dh/feature/rorw' into topic/hx3…
Emantor Oct 10, 2023
bafb539
hx30: lfw: restore RW access via PINMUX
Emantor Oct 5, 2023
b782b32
hx30: power_sequence: fire SHUTDOWN_COMPLETE
Emantor Oct 5, 2023
01c1512
hx30: board: remember whether we cut power
Emantor Oct 5, 2023
5d8b6f1
mchp: lfw: stop wdt before firmware load
Emantor Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions board/hx20/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ static void board_power_off_deferred(void)
charger_psys_enable(0);
charge_gate_onoff(0);

MCHP_VBAT_RAM(MCHP_IMAGETYPE_IDX) |= 0x80;

/* Disable interrupts */
interrupt_disable();
for (i = 0; i < MCHP_IRQ_MAX; ++i) {
Expand Down
14 changes: 9 additions & 5 deletions board/hx20/lfw/gpio.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
GPIO(QMSPI_CS0, PIN(055), GPIO_ODR_HIGH)

/* We need to take control of this away from VCI */
GPIO(EC_ON, PIN(0250), GPIO_OUT_HIGH) /* keep +3VL_EC to power on */

/* Alternate functions GPIO definition */

Expand All @@ -31,13 +33,15 @@ ALTERNATE(PIN_MASK(2, 0x30), 1, MODULE_UART, 0)
* MEC1701H SHD SPI is connected to QMSPI controller.
* QMSPI drives chip select. SHD_CS0#(GPIO_0055) must be set
* to alternate function 2 and GPIO_ODR_HIGH.
* GPIO_0055 Function 2, Bank 1 bit[13]
*/
/* GPIO_0055 Function 2, Bank 1 bit[13] */
ALTERNATE(PIN_MASK(1, 0x2000), 2, MODULE_SPI_FLASH, GPIO_ODR_HIGH)
/* SHD_CLK - GPIO_0056 Function 2, Bank 1 bit[14] */
ALTERNATE(PIN_MASK(1, 0x4000), 2, MODULE_SPI_FLASH, 0)
/* MOSI(SHD_IO0) - GPIO_0223 Function 2, Bank 4 bit[19] */
/* MOSI(SHD_IO0) - GPIO_0223 Function 1, Bank 4 bit[19] */
/* MISO(SHD_IO1) - GPIO_0224 Function 2, Bank 4 bit[20] */
ALTERNATE(PIN_MASK(4, 0x180000), 2, MODULE_SPI_FLASH, 0)


/* nWP(SHD_IO2) - GPIO_0227 Function 1, Bank 4 bit[23] */
ALTERNATE(PIN_MASK(4, 0x880000), 1, MODULE_SPI_FLASH, 0)
ALTERNATE(PIN_MASK(4, 0x100000), 2, MODULE_SPI_FLASH, 0)
/* nHOLD(SHD_IO3) - GPIO_0016 Function 2, Bank 0 bit[14] */
ALTERNATE(PIN_MASK(0, 0x4000), 2, MODULE_SPI_FLASH, 0)
4 changes: 4 additions & 0 deletions board/hx20/power_sequence.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,10 @@ enum power_state power_handle_state(enum power_state state)
gpio_set_level(GPIO_SYSON, 0);
hook_notify(HOOK_CHIPSET_SHUTDOWN);
cypd_set_power_active(POWER_S5);

/* Call hooks after we remove power rails */
hook_notify(HOOK_CHIPSET_SHUTDOWN_COMPLETE);

power_s5_up = 0;
return POWER_S5;
break;
Expand Down
1 change: 1 addition & 0 deletions board/hx30/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ static void board_power_off_deferred(void)
charger_psys_enable(0);
charge_gate_onoff(0);

MCHP_VBAT_RAM(MCHP_IMAGETYPE_IDX) |= 0x80;

/* Disable interrupts */
interrupt_disable();
Expand Down
12 changes: 8 additions & 4 deletions board/hx30/lfw/gpio.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
GPIO(QMSPI_CS0, PIN(055), GPIO_ODR_HIGH)

/* We need to take control of this away from VCI */
GPIO(EC_ON, PIN(0250), GPIO_OUT_HIGH) /* keep +3VL_EC to power on */

/* Alternate functions GPIO definition */

Expand All @@ -36,8 +38,10 @@ ALTERNATE(PIN_MASK(2, 0x30), 1, MODULE_UART, 0)
ALTERNATE(PIN_MASK(1, 0x2000), 2, MODULE_SPI_FLASH, GPIO_ODR_HIGH)
/* SHD_CLK - GPIO_0056 Function 2, Bank 1 bit[14] */
ALTERNATE(PIN_MASK(1, 0x4000), 2, MODULE_SPI_FLASH, 0)
/* MOSI(SHD_IO0) - GPIO_0223 Function 2, Bank 4 bit[19] */
/* MOSI(SHD_IO0) - GPIO_0223 Function 1, Bank 4 bit[19] */
/* MISO(SHD_IO1) - GPIO_0224 Function 2, Bank 4 bit[20] */
ALTERNATE(PIN_MASK(4, 0x180000), 2, MODULE_SPI_FLASH, 0)


/* nWP(SHD_IO2) - GPIO_0227 Function 1, Bank 4 bit[23] */
ALTERNATE(PIN_MASK(4, 0x880000), 1, MODULE_SPI_FLASH, 0)
ALTERNATE(PIN_MASK(4, 0x100000), 2, MODULE_SPI_FLASH, 0)
/* nHOLD(SHD_IO3) - GPIO_0016 Function 2, Bank 0 bit[14] */
ALTERNATE(PIN_MASK(0, 0x4000), 2, MODULE_SPI_FLASH, 0)
1 change: 1 addition & 0 deletions board/hx30/power_sequence.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ enum power_state power_handle_state(enum power_state state)
hook_notify(HOOK_CHIPSET_SHUTDOWN);
cypd_set_power_active(POWER_S5);
set_non_acpi_mode(0);
hook_notify(HOOK_CHIPSET_SHUTDOWN_COMPLETE);
power_s5_up = 0;
return POWER_S5;
break;
Expand Down
27 changes: 25 additions & 2 deletions chip/mchp/lfw/ec_lfw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,26 @@ void system_init(void)
uint32_t wdt_sts = MCHP_VBAT_STS & MCHP_VBAT_STS_ANY_RST;
uint32_t rst_sts = MCHP_PCR_PWR_RST_STS &
MCHP_PWR_RST_STS_VTR;
/*
* **HX20**: We can't hibernate the EC without also keeping
* 5v3v ALW on, so we cut power entirely. Unfortunately,
* that means that one of rst_sts or wdt_sts will always be
* on... and that precludes the use of the RW firmware.
* However, if we store a bit in IMAGETYPE to indicate that
* we cut power to ourselves, we can use it at the next boot
* to determine whether this poweroff was EC-origin or not.
*/
bool wacked = (MCHP_VBAT_RAM(MCHP_IMAGETYPE_IDX) & 0x80) != 0;

trace12(0, LFW, 0,
"VBAT_STS = 0x%08x PCR_PWR_RST_STS = 0x%08x",
wdt_sts, rst_sts);

if (rst_sts || wdt_sts)
if ((rst_sts || wdt_sts) && !wacked)
MCHP_VBAT_RAM(MCHP_IMAGETYPE_IDX)
= EC_IMAGE_UNKNOWN;

MCHP_VBAT_RAM(MCHP_IMAGETYPE_IDX) &= 0x7F;
}

enum ec_image system_get_image_copy(void)
Expand Down Expand Up @@ -442,6 +454,18 @@ void lfw_main(void)
uart_init();
system_init();

lfw_wdt_stop();

/*
* We need to switch control of VCI_OUT (aliased as EC_ON) away from
* VCI_INx to keep the machine powered even after the user releases the
* power button. This ensures that we can stay on long enough to read
* from SPI flash.
*/
gpio_reset(GPIO_EC_ON);
MCHP_VCI_REGISTER |= MCHP_VCI_REGISTER_FW_CNTRL;
MCHP_VCI_REGISTER |= MCHP_VCI_REGISTER_FW_EXT;

spi_enable(CONFIG_SPI_FLASH_PORT, 1);

uart_puts("littlefw ");
Expand Down Expand Up @@ -523,7 +547,6 @@ void lfw_main(void)

init_addr = CONFIG_RO_MEM_OFF + CONFIG_PROGRAM_MEMORY_BASE;
}
lfw_wdt_stop();
trace11(0, LFW, 0, "Get EC reset handler from 0x%08x", (init_addr + 4));
trace11(0, LFW, 0, "Jump to EC @ 0x%08x",
*((uint32_t *)(init_addr + 4)));
Expand Down