flashrom: Support Pm49FL004/2 Block Locking Registers
The PMC chips understand both LPC and FWH flash commands. When in FWH mode (MSR_DIVIL_BALL_OPT(0x51400015) = 0x00000f7d on 5536 boards) the Block Locking Registers by default lock the flash chip for write and erase - in addition to any chipset write protection. This patch adds unlock operations before Pm49FL004/2 write and erase, and it includes an svn mv pm49fl004.c pm49fl00x.c Thanks go to Nikolay for this patch. Signed-off-by: Nikolay Petukhov <nikolay.petukhov@gmail.com> Signed-off-by: Peter Stuge <peter@stuge.se> Acked-by: Bari Ari <bari@onelabs.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3332 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
fb047a6a54
commit
ce1fb9d4e9
|
@ -22,7 +22,7 @@ endif
|
|||
|
||||
OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \
|
||||
sst28sf040.o am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o \
|
||||
w49f002u.o 82802ab.o msys_doc.o pm49fl004.o sst49lf040.o \
|
||||
w49f002u.o 82802ab.o msys_doc.o pm49fl00x.o sst49lf040.o \
|
||||
sst49lfxxxc.o sst_fwhub.o layout.o cbtable.o flashchips.o \
|
||||
flashrom.o w39v080fa.o sharplhf00l04.o w29ee011.o spi.o it87spi.o \
|
||||
ichspi.o
|
||||
|
|
|
@ -453,10 +453,10 @@ int probe_29f002(struct flashchip *flash);
|
|||
int erase_29f002(struct flashchip *flash);
|
||||
int write_29f002(struct flashchip *flash, uint8_t *buf);
|
||||
|
||||
/* pm49fl004.c */
|
||||
int probe_49fl004(struct flashchip *flash);
|
||||
int erase_49fl004(struct flashchip *flash);
|
||||
int write_49fl004(struct flashchip *flash, uint8_t *buf);
|
||||
/* pm49fl00x.c */
|
||||
int probe_49fl00x(struct flashchip *flash);
|
||||
int erase_49fl00x(struct flashchip *flash);
|
||||
int write_49fl00x(struct flashchip *flash, uint8_t *buf);
|
||||
|
||||
/* sharplhf00l04.c */
|
||||
int probe_lhf00l04(struct flashchip *flash);
|
||||
|
|
|
@ -64,8 +64,8 @@ struct flashchip flashchips[] = {
|
|||
{"PMC", "Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, TEST_UNTESTED, probe_spi_rdid, spi_chip_erase_c7, spi_chip_write, spi_chip_read},
|
||||
{"PMC", "Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, TEST_UNTESTED, probe_spi_rdid, spi_chip_erase_c7, spi_chip_write, spi_chip_read},
|
||||
{"PMC", "Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, TEST_UNTESTED, probe_spi_rdid, spi_chip_erase_c7, spi_chip_write, spi_chip_read},
|
||||
{"PMC", "Pm49FL002", PMC_ID_NOPREFIX,PMC_49FL002, 256, 16 * 1024, TEST_UNTESTED, probe_jedec, erase_chip_jedec, write_49fl004},
|
||||
{"PMC", "Pm49FL004", PMC_ID_NOPREFIX,PMC_49FL004, 512, 64 * 1024, TEST_UNTESTED, probe_jedec, erase_chip_jedec, write_49fl004},
|
||||
{"PMC", "Pm49FL002", PMC_ID_NOPREFIX,PMC_49FL002, 256, 16 * 1024, TEST_UNTESTED, probe_49fl00x, erase_49fl00x, write_49fl00x},
|
||||
{"PMC", "Pm49FL004", PMC_ID_NOPREFIX,PMC_49FL004, 512, 64 * 1024, TEST_OK_PREW, probe_49fl00x, erase_49fl00x, write_49fl00x},
|
||||
{"Sharp", "LHF00L04", SHARP_ID, SHARP_LHF00L04, 1024, 64 * 1024, TEST_UNTESTED, probe_lhf00l04, erase_lhf00l04, write_lhf00l04},
|
||||
{"Spansion", "S25FL016A", SPANSION_ID, SPANSION_S25FL016A, 2048, 256, TEST_UNTESTED, probe_spi_rdid, spi_chip_erase_c7, spi_chip_write, spi_chip_read},
|
||||
{"SST", "SST25VF016B", SST_ID, SST_25VF016B, 2048, 256, TEST_UNTESTED, probe_spi_rdid, spi_chip_erase_c7, spi_chip_write, spi_chip_read},
|
||||
|
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
* This file is part of the flashrom project.
|
||||
*
|
||||
* Copyright (C) 2004 Tyan Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "flash.h"
|
||||
|
||||
extern int exclude_start_page, exclude_end_page;
|
||||
|
||||
int write_49fl004(struct flashchip *flash, uint8_t *buf)
|
||||
{
|
||||
int i;
|
||||
int total_size = flash->total_size * 1024;
|
||||
int page_size = flash->page_size;
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
|
||||
printf("Programming page: ");
|
||||
for (i = 0; i < total_size / page_size; i++) {
|
||||
if ((i >= exclude_start_page) && (i < exclude_end_page))
|
||||
continue;
|
||||
|
||||
/* erase the page before programming */
|
||||
erase_block_jedec(bios, i * page_size);
|
||||
|
||||
/* write to the sector */
|
||||
printf("%04d at address: 0x%08x", i, i * page_size);
|
||||
write_sector_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");
|
||||
fflush(stdout);
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -0,0 +1,114 @@
|
|||
/*
|
||||
* This file is part of the flashrom project.
|
||||
*
|
||||
* Copyright (C) 2004 Tyan Corporation
|
||||
* Copyright (C) 2007 Nikolay Petukhov <nikolay.petukhov@gmail.com>
|
||||
* Copyright (C) 2007 Reinder E.N. de Haan <lb_reha@mveas.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "flash.h"
|
||||
|
||||
extern int exclude_start_page, exclude_end_page;
|
||||
|
||||
void write_lockbits_49fl00x(volatile uint8_t *bios, int size,
|
||||
unsigned char bits, int block_size)
|
||||
{
|
||||
int i, left = size;
|
||||
|
||||
for (i = 0; left >= block_size; i++, left -= block_size) {
|
||||
|
||||
/* pm49fl002 */
|
||||
if (block_size == 16384 && i%2)
|
||||
continue;
|
||||
|
||||
*(bios + (i * block_size) + 2) = bits;
|
||||
}
|
||||
}
|
||||
|
||||
int probe_49fl00x(struct flashchip *flash)
|
||||
{
|
||||
int ret = probe_jedec(flash);
|
||||
|
||||
if (ret == 1)
|
||||
map_flash_registers(flash);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int erase_49fl00x(struct flashchip *flash)
|
||||
{
|
||||
int i;
|
||||
int total_size = flash->total_size * 1024;
|
||||
int page_size = flash->page_size;
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
|
||||
/* unprotected */
|
||||
write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, page_size);
|
||||
|
||||
//erase_chip_jedec will not work ... datasheet says "Chip erase is available in A/A Mux Mode only"
|
||||
printf("Erasing page: ");
|
||||
for (i = 0; i < total_size / page_size; i++) {
|
||||
if ((i >= exclude_start_page) && (i < exclude_end_page))
|
||||
continue;
|
||||
|
||||
/* erase the page */
|
||||
erase_block_jedec(bios, i * page_size);
|
||||
printf("%04d at address: 0x%08x", i, i * 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");
|
||||
fflush(stdout);
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
/* protected */
|
||||
write_lockbits_49fl00x(flash->virtual_registers, total_size, 1, page_size);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int write_49fl00x(struct flashchip *flash, uint8_t *buf)
|
||||
{
|
||||
int i;
|
||||
int total_size = flash->total_size * 1024;
|
||||
int page_size = flash->page_size;
|
||||
volatile uint8_t *bios = flash->virtual_memory;
|
||||
|
||||
/* unprotected */
|
||||
write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, page_size);
|
||||
|
||||
printf("Programming page: ");
|
||||
for (i = 0; i < total_size / page_size; i++) {
|
||||
if ((i >= exclude_start_page) && (i < exclude_end_page))
|
||||
continue;
|
||||
|
||||
/* erase the page before programming */
|
||||
erase_block_jedec(bios, i * page_size);
|
||||
|
||||
/* write to the sector */
|
||||
printf("%04d at address: 0x%08x", i, i * page_size);
|
||||
write_sector_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");
|
||||
fflush(stdout);
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
/* protected */
|
||||
write_lockbits_49fl00x(flash->virtual_registers, total_size, 1, page_size);
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue