spi_flash_erase() and spi_flash_write() already assume their respective callbacks are supplied in the spi_flash_ops object. Make the same assumption in spi_flash_read(). In order to do this the spi_flash_ops objects from the drivers need to reference the the previously used fallback read command, spi_flash_read_chunked(). This function is made global and renamed to spi_flash_cmd_read() for consistency. By doing this further dead code elimination can be achieved when the spi flash drivers aren't included in the build. A Hatch Chrome OS build achieves a further text segment reduction of 0.5KiB in verstage, romstage, and ramstage. Change-Id: I7fee55e6ffc1983657c3adde025a0e8c9d12ca23 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38366 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
243 lines
5.5 KiB
C
243 lines
5.5 KiB
C
/*
|
|
* This file is part of the coreboot project.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <console/console.h>
|
|
#include <commonlib/helpers.h>
|
|
#include <spi_flash.h>
|
|
#include <spi-generic.h>
|
|
#include <string.h>
|
|
|
|
#include "spi_flash_internal.h"
|
|
|
|
/* MX25xx-specific commands */
|
|
#define CMD_MX25XX_WREN 0x06 /* Write Enable */
|
|
#define CMD_MX25XX_WRDI 0x04 /* Write Disable */
|
|
#define CMD_MX25XX_RDSR 0x05 /* Read Status Register */
|
|
#define CMD_MX25XX_WRSR 0x01 /* Write Status Register */
|
|
#define CMD_MX25XX_READ 0x03 /* Read Data Bytes */
|
|
#define CMD_MX25XX_FAST_READ 0x0b /* Read Data Bytes at Higher Speed */
|
|
#define CMD_MX25XX_PP 0x02 /* Page Program */
|
|
#define CMD_MX25XX_SE 0x20 /* Sector Erase */
|
|
#define CMD_MX25XX_BE 0xD8 /* Block Erase */
|
|
#define CMD_MX25XX_CE 0xc7 /* Chip Erase */
|
|
#define CMD_MX25XX_DP 0xb9 /* Deep Power-down */
|
|
#define CMD_MX25XX_RES 0xab /* Release from DP, and Read Signature */
|
|
|
|
#define MACRONIX_SR_WIP (1 << 0) /* Write-in-Progress */
|
|
|
|
struct macronix_spi_flash_params {
|
|
u16 idcode;
|
|
u16 page_size;
|
|
u16 pages_per_sector;
|
|
u16 sectors_per_block;
|
|
u16 nr_blocks;
|
|
const char *name;
|
|
};
|
|
|
|
static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
|
|
{
|
|
.idcode = 0x2014,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 16,
|
|
.name = "MX25L8005",
|
|
},
|
|
{
|
|
.idcode = 0x2015,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 32,
|
|
.name = "MX25L1605D",
|
|
},
|
|
{
|
|
.idcode = 0x2016,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 64,
|
|
.name = "MX25L3205D",
|
|
},
|
|
{
|
|
.idcode = 0x2017,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 128,
|
|
.name = "MX25L6405D",
|
|
},
|
|
{
|
|
.idcode = 0x2018,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 256,
|
|
.name = "MX25L12805D",
|
|
},
|
|
{
|
|
.idcode = 0x2019,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 512,
|
|
.name = "MX25L25635F",
|
|
},
|
|
{
|
|
.idcode = 0x201a,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 1024,
|
|
.name = "MX66L51235F",
|
|
},
|
|
{
|
|
.idcode = 0x2415,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 32,
|
|
.name = "MX25L1635D",
|
|
},
|
|
{
|
|
.idcode = 0x2515,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 32,
|
|
.name = "MX25L1635E",
|
|
},
|
|
{
|
|
.idcode = 0x2534,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 16,
|
|
.name = "MX25U8032E",
|
|
},
|
|
{
|
|
.idcode = 0x2535,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 32,
|
|
.name = "MX25U1635E",
|
|
},
|
|
{
|
|
.idcode = 0x2536,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 64,
|
|
.name = "MX25U3235E",
|
|
},
|
|
{
|
|
.idcode = 0x2537,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 128,
|
|
.name = "MX25U6435F",
|
|
},
|
|
{
|
|
.idcode = 0x2538,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 256,
|
|
.name = "MX25U12835F",
|
|
},
|
|
{
|
|
.idcode = 0x2539,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 512,
|
|
.name = "MX25U25635F",
|
|
},
|
|
{
|
|
.idcode = 0x253a,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 1024,
|
|
.name = "MX25U51245G",
|
|
},
|
|
{
|
|
.idcode = 0x2618,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 256,
|
|
.name = "MX25L12855E",
|
|
},
|
|
{
|
|
.idcode = 0x5e16,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 64,
|
|
.name = "MX25L3235D", /* MX25L3225D/MX25L3236D/MX25L3237D */
|
|
},
|
|
{
|
|
.idcode = 0x9517,
|
|
.page_size = 256,
|
|
.pages_per_sector = 16,
|
|
.sectors_per_block = 16,
|
|
.nr_blocks = 128,
|
|
.name = "MX25L6495F",
|
|
},
|
|
};
|
|
|
|
static const struct spi_flash_ops spi_flash_ops = {
|
|
.read = spi_flash_cmd_read,
|
|
.write = spi_flash_cmd_write_page_program,
|
|
.erase = spi_flash_cmd_erase,
|
|
.status = spi_flash_cmd_status,
|
|
};
|
|
|
|
int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode,
|
|
struct spi_flash *flash)
|
|
{
|
|
const struct macronix_spi_flash_params *params;
|
|
unsigned int i;
|
|
u16 id = idcode[2] | idcode[1] << 8;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(macronix_spi_flash_table); i++) {
|
|
params = ¯onix_spi_flash_table[i];
|
|
if (params->idcode == id)
|
|
break;
|
|
}
|
|
|
|
if (i == ARRAY_SIZE(macronix_spi_flash_table)) {
|
|
printk(BIOS_WARNING, "SF: Unsupported Macronix ID %04x\n", id);
|
|
return -1;
|
|
}
|
|
|
|
memcpy(&flash->spi, spi, sizeof(*spi));
|
|
flash->name = params->name;
|
|
flash->page_size = params->page_size;
|
|
flash->sector_size = params->page_size * params->pages_per_sector;
|
|
flash->size = flash->sector_size * params->sectors_per_block *
|
|
params->nr_blocks;
|
|
flash->erase_cmd = CMD_MX25XX_SE;
|
|
flash->status_cmd = CMD_MX25XX_RDSR;
|
|
flash->pp_cmd = CMD_MX25XX_PP;
|
|
flash->wren_cmd = CMD_MX25XX_WREN;
|
|
|
|
flash->ops = &spi_flash_ops;
|
|
|
|
return 0;
|
|
}
|