| Message ID | 1304980416-14304-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted |
| Commit | 4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804 |
| Delegated to: | Stefan Roese |
| Headers | show |
On Monday, May 09, 2011 18:33:36 Mike Frysinger wrote: > For newer STM parts where CFI >= 1.1, there is a byte in the extended > structure that declares the flash layout type (just like the AMD parts), > so key off of that to find out when we need to reverse the geometry. ping ... -mike
Hi Mike, On Tuesday 28 June 2011 21:30:28 Mike Frysinger wrote: > On Monday, May 09, 2011 18:33:36 Mike Frysinger wrote: > > For newer STM parts where CFI >= 1.1, there is a byte in the extended > > structure that declares the flash layout type (just like the AMD parts), > > so key off of that to find out when we need to reverse the geometry. > > ping ... I'll take care of it later today. 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
On Tuesday 10 May 2011 00:33:36 Mike Frysinger wrote: > For newer STM parts where CFI >= 1.1, there is a byte in the extended > structure that declares the flash layout type (just like the AMD parts), > so key off of that to find out when we need to reverse the geometry. > > This can be seen with M29W640 parts where U-Boot does: > Bank # 1: CFI conformant FLASH (16 x 16) Size: 8 MB in 135 Sectors > AMD Standard command set, Manufacturer ID: 0x20, Device ID: 0x22ED > Erase timeout: 8192 ms, write timeout: 1 ms > Buffer write timeout: 1 ms, buffer size: 16 bytes > > Sector Start Addresses: > 20000000 RO 20002000 RO 20004000 RO 20006000 RO 20008000 > RO 2000A000 RO 2000C000 RO 2000E000 RO 20010000 RO > 20020000 RO ... > > But Linux does: > physmap platform flash device: 00800000 at 20000000 > physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank. > Manufacturer ID 0x000020 Chip ID 0x0022ed > physmap-flash.0: Swapping erase regions for top-boot CFI table. Applied to u-boot-cfi-flash/master. 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
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 69f12d3..13774c4 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1858,6 +1858,10 @@ static void flash_fixup_stm(flash_info_t *info, struct cfi_qry *qry) info->device_id == 0x22D7) { /* M29W800DT */ cfi_reverse_geometry(qry); } + } else if (flash_read_uchar(info, info->ext_addr + 0xf) == 3) { + /* CFI >= 1.1, deduct from top/bottom flag */ + /* note: ext_addr is valid since cfi_version > 0 */ + cfi_reverse_geometry(qry); } } }
For newer STM parts where CFI >= 1.1, there is a byte in the extended structure that declares the flash layout type (just like the AMD parts), so key off of that to find out when we need to reverse the geometry. This can be seen with M29W640 parts where U-Boot does: Bank # 1: CFI conformant FLASH (16 x 16) Size: 8 MB in 135 Sectors AMD Standard command set, Manufacturer ID: 0x20, Device ID: 0x22ED Erase timeout: 8192 ms, write timeout: 1 ms Buffer write timeout: 1 ms, buffer size: 16 bytes Sector Start Addresses: 20000000 RO 20002000 RO 20004000 RO 20006000 RO 20008000 RO 2000A000 RO 2000C000 RO 2000E000 RO 20010000 RO 20020000 RO ... But Linux does: physmap platform flash device: 00800000 at 20000000 physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank. Manufacturer ID 0x000020 Chip ID 0x0022ed physmap-flash.0: Swapping erase regions for top-boot CFI table. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- drivers/mtd/cfi_flash.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)