From c75e78cd50a6e7ab2fba293199ebf97bcf66ed13 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Tue, 9 Jun 2015 11:28:46 -0700 Subject: [PATCH] mec1322: fix flash_physical_get_writable_flags() Add spi_enable() before SPI transaction. This fixes a problem where protect host cmd ended up messing up SPI controller state. Change-Id: Ief61f279cbd0a90e55ce87d0c350072dc8616c31 Signed-off-by: Andrey Petrov Reviewed-on: https://chromium-review.googlesource.com/276338 Reviewed-by: Shawn N Tested-by: Divya Jyothi Commit-Queue: Divya Jyothi --- chip/mec1322/flash.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chip/mec1322/flash.c b/chip/mec1322/flash.c index 343258e811..9681511f5a 100644 --- a/chip/mec1322/flash.c +++ b/chip/mec1322/flash.c @@ -172,7 +172,11 @@ uint32_t flash_physical_get_valid_flags(void) uint32_t flash_physical_get_writable_flags(uint32_t cur_flags) { uint32_t ret = 0; - enum spi_flash_wp wp_status = spi_flash_check_wp(); + enum spi_flash_wp wp_status = SPI_WP_NONE; + + spi_enable(1); + wp_status = spi_flash_check_wp(); + spi_enable(0); if (wp_status == SPI_WP_NONE || (wp_status == SPI_WP_HARDWARE && !(cur_flags & EC_FLASH_PROTECT_GPIO_ASSERTED)))