Patchwork [U-Boot] cfi_flash: Fix problems with status/id read mode

login
register
mail settings
Submitter Stefan Roese
Date Oct. 25, 2010, 4:31 p.m.
Message ID <1288024289-6356-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/71922/
State Accepted
Commit df4e813b72bf07d9026b00455f5e7dffd694ae48
Delegated to: Stefan Roese
Headers show

Comments

Stefan Roese - Oct. 25, 2010, 4:31 p.m.
This patch adds some calls to set the flash chip in the read-status-
register- or read-id-mode before the corresponding register is
read back. This problem was detected while porting the common CFI
driver to support the Xilinx DS617 flash chips.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 drivers/mtd/cfi_flash.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
Stefan Roese - Dec. 17, 2010, 8:59 a.m.
On Monday 25 October 2010 18:31:29 Stefan Roese wrote:
> This patch adds some calls to set the flash chip in the read-status-
> register- or read-id-mode before the corresponding register is
> read back. This problem was detected while porting the common CFI
> driver to support the Xilinx DS617 flash chips.

Applied to u-boot-cfi-flash/next. Thanks.
 
Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de

Patch

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c92c7a7..e2317bd 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1426,6 +1426,11 @@  int flash_real_protect (flash_info_t * info, long sector, int prot)
 #endif
 	};
 
+	/*
+	 * Flash needs to be in status register read mode for
+	 * flash_full_status_check() to work correctly
+	 */
+	flash_write_cmd(info, sector, 0, FLASH_CMD_READ_STATUS);
 	if ((retcode =
 	     flash_full_status_check (info, sector, info->erase_blk_tout,
 				      prot ? "protect" : "unprotect")) == 0) {
@@ -1973,6 +1978,13 @@  ulong flash_get_size (phys_addr_t base, int banknum, unsigned long max_size)
 				case CFI_CMDSET_INTEL_PROG_REGIONS:
 				case CFI_CMDSET_INTEL_EXTENDED:
 				case CFI_CMDSET_INTEL_STANDARD:
+					/*
+					 * Set flash to read-id mode. Otherwise
+					 * reading protected status is not
+					 * guaranteed.
+					 */
+					flash_write_cmd(info, sect_cnt, 0,
+							FLASH_CMD_READ_ID);
 					info->protect[sect_cnt] =
 						flash_isset (info, sect_cnt,
 							     FLASH_OFFSET_PROTECT,