From 761bf1bdb7268f8818dd22b15e944365afdf1459 Mon Sep 17 00:00:00 2001 From: Ollie Lho Date: Sat, 20 Mar 2004 16:46:10 +0000 Subject: Consolidate more jedec standard code Corresponding to flashrom svn r15 and coreboot v2 svn r1457. --- jedec.c | 200 +++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 130 insertions(+), 70 deletions(-) (limited to 'jedec.c') diff --git a/jedec.c b/jedec.c index 2f153db6..d7f2bef1 100644 --- a/jedec.c +++ b/jedec.c @@ -28,116 +28,176 @@ #include "flash.h" #include "jedec.h" -int probe_jedec (struct flashchip * flash) +int probe_jedec(struct flashchip *flash) { - volatile char * bios = flash->virt_addr; - unsigned char id1, id2; - - *(volatile char *) (bios + 0x5555) = 0xAA; - myusec_delay(10); - *(volatile char *) (bios + 0x2AAA) = 0x55; - myusec_delay(10); - *(volatile char *) (bios + 0x5555) = 0x90; - myusec_delay(10); - - id1 = *(volatile unsigned char *) bios; - id2 = *(volatile unsigned char *) (bios + 0x01); - - *(volatile char *) (bios + 0x5555) = 0xAA; - myusec_delay(10); - *(volatile char *) (bios + 0x2AAA) = 0x55; - myusec_delay(10); - *(volatile char *) (bios + 0x5555) = 0xF0; - myusec_delay(10); + volatile char *bios = flash->virt_addr; + unsigned char id1, id2; + + /* Issue JEDEC Product ID Entry command */ + *(volatile char *) (bios + 0x5555) = 0xAA; + myusec_delay(10); + *(volatile char *) (bios + 0x2AAA) = 0x55; + myusec_delay(10); + *(volatile char *) (bios + 0x5555) = 0x90; + myusec_delay(10); + + /* Read product ID */ + id1 = *(volatile unsigned char *) bios; + id2 = *(volatile unsigned char *) (bios + 0x01); + + /* Issue JEDEC Product ID Exit command */ + *(volatile char *) (bios + 0x5555) = 0xAA; + myusec_delay(10); + *(volatile char *) (bios + 0x2AAA) = 0x55; + myusec_delay(10); + *(volatile char *) (bios + 0x5555) = 0xF0; + myusec_delay(10); printf("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); - if (id1 == flash->manufacture_id && id2 == flash->model_id) - return 1; + if (id1 == flash->manufacture_id && id2 == flash->model_id) + return 1; - return 0; + return 0; } -int erase_sector_jedec (volatile char * bios, unsigned int page) +int erase_sector_jedec(volatile char *bios, unsigned int page) { - /* Chip erase function does not exist for LPC mode on 49lf040. - * Erase sector-by-sector instead. */ volatile unsigned char *Temp; - /* Issue the Sector Erase command to 40LF040 */ - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0xAA; /* write data 0xAA to the address */ + /* Issue the Sector Erase command */ + Temp = bios + 0x5555; /* set up address to be BASE:5555h */ + *Temp = 0xAA; /* write data 0xAA to the address */ + myusec_delay(10); + Temp = bios + 0x2AAA; /* set up address to be BASE:2AAAh */ + *Temp = 0x55; /* write data 0x55 to the address */ myusec_delay(10); - Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */ - *Temp = 0x55; /* write data 0x55 to the address */ + Temp = bios + 0x5555; /* set up address to be BASE:5555h */ + *Temp = 0x80; /* write data 0x80 to the address */ myusec_delay(10); - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0x80; /* write data 0x80 to the address */ + Temp = bios + 0x5555; /* set up address to be BASE:5555h */ + *Temp = 0xAA; /* write data 0xAA to the address */ myusec_delay(10); - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0xAA; /* write data 0xAA to the address */ + Temp = bios + 0x2AAA; /* set up address to be BASE:2AAAh */ + *Temp = 0x55; /* write data 0x55 to the address */ myusec_delay(10); - Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */ - *Temp = 0x55; /* write data 0x55 to the address */ + Temp = bios + page; /* set up address to be the current sector */ + *Temp = 0x30; /* write data 0x30 to the address */ myusec_delay(10); - Temp = bios + page; /* set up address to be the current sector */ - *Temp = 0x30; /* write data 0x30 to the address */ - + /* wait for Toggle bit ready */ toggle_ready_jedec(bios); - return(0); + return (0); } -int erase_jedec (struct flashchip * flash) +int erase_chip_jedec(struct flashchip *flash) { - volatile unsigned char * bios = flash->virt_addr; + volatile unsigned char *bios = flash->virt_addr; volatile unsigned char *Temp; - /* Issue the Sector Erase command to 39SF020 */ - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0xAA; /* write data 0xAA to the address */ + /* Issue the JEDEC Chip Erase command */ + Temp = bios + 0x5555; /* set up address to be BASE:5555h */ + *Temp = 0xAA; /* write data 0xAA to the address */ myusec_delay(10); - Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */ - *Temp = 0x55; /* write data 0x55 to the address */ + Temp = bios + 0x2AAA; /* set up address to be BASE:2AAAh */ + *Temp = 0x55; /* write data 0x55 to the address */ myusec_delay(10); - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0x80; /* write data 0x80 to the address */ + Temp = bios + 0x5555; /* set up address to be BASE:5555h */ + *Temp = 0x80; /* write data 0x80 to the address */ myusec_delay(10); - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0xAA; /* write data 0xAA to the address */ + Temp = bios + 0x5555; /* set up address to be BASE:5555h */ + *Temp = 0xAA; /* write data 0xAA to the address */ myusec_delay(10); - Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */ - *Temp = 0x55; /* write data 0x55 to the address */ + Temp = bios + 0x2AAA; /* set up address to be BASE:2AAAh */ + *Temp = 0x55; /* write data 0x55 to the address */ myusec_delay(10); - Temp = bios + 0x5555; /* set up address to be C000:5555h */ - *Temp = 0x10; /* write data 0x55 to the address */ + Temp = bios + 0x5555; /* set up address to be BASEy:5555h */ + *Temp = 0x10; /* write data 0x10 to the address */ myusec_delay(10); toggle_ready_jedec(bios); - return(0); + return (0); +} + +void write_page_jedec(volatile char *bios, char *src, volatile char *dst, + int page_size) +{ + int i; + + /* Issue JEDEC Data Unprotect comand */ + *(volatile char *) (bios + 0x5555) = 0xAA; + *(volatile char *) (bios + 0x2AAA) = 0x55; + *(volatile char *) (bios + 0x5555) = 0xA0; + + for (i = 0; i < page_size; i++) { + /* transfer data from source to destination */ + *dst++ = *src++; + } + + usleep(100); + toggle_ready_jedec(dst - 1); +} + +int write_sector_jedec(volatile char *bios, + unsigned char *src, + volatile unsigned char *dst, unsigned int page_size) +{ + int i; + volatile char *Temp; + + for (i = 0; i < page_size; i++) { + if (*dst != 0xff) { + printf("FATAL: dst %p not erased (val 0x%x\n", dst, + *dst); + return (-1); + } + /* transfer data from source to destination */ + if (*src == 0xFF) { + dst++, src++; + /* If the data is 0xFF, don't program it */ + continue; + } + /* Issue JEDEC Byte Program command */ + Temp = bios + 0x5555; + *Temp = 0xAA; + Temp = bios + 0x2AAA; + *Temp = 0x55; + Temp = bios + 0x5555; + *Temp = 0xA0; + *dst = *src; + toggle_ready_jedec(bios); + if (*dst != *src) + printf("BAD! dst 0x%lx val 0x%x src 0x%x\n", + (unsigned long) dst, *dst, *src); + dst++, src++; + } + + return (0); } -int write_jedec (struct flashchip * flash, unsigned char * buf) +int write_jedec(struct flashchip *flash, unsigned char *buf) { int i; - int total_size = flash->total_size *1024, page_size = flash->page_size; - volatile unsigned char * bios = flash->virt_addr; + int total_size = flash->total_size * 1024, page_size = + flash->page_size; + volatile unsigned char *bios = flash->virt_addr; - erase_jedec (flash); - if (*bios != (unsigned char ) 0xff) { + erase_chip_jedec(flash); + if (*bios != (unsigned char) 0xff) { printf("ERASE FAILED\n"); return -1; } - printf ("Programming Page: "); - for (i = 0; i < total_size/page_size; i++) { - printf ("%04d at address: 0x%08x", i, i * page_size); - write_page_jedec(bios, buf + i * page_size, bios + i * page_size, - page_size); - printf ("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); + printf("Programming Page: "); + for (i = 0; i < total_size / page_size; i++) { + printf("%04d at address: 0x%08x", i, i * page_size); + write_page_jedec(bios, buf + i * page_size, + bios + i * page_size, page_size); + printf + ("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } printf("\n"); - protect_jedec (bios); + protect_jedec(bios); - return(0); + return (0); } -- cgit v1.2.3