mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 22:52:34 +02:00
5afd4aeece
Move (un)map_flash_region function pointers from programmer_entry to par_master, spi_master, and opaque_master. This enables programmers to specify a different mapper per bus, which is needed for the internal programmer. Mapping is closely tied to the way the memory is accessed using the other functions in the bus master structs. Validate that FWH/LPC programmers provide specialized mapping in register_par_master(); this is needed for chips with FEATURE_REGISTERMAP, which only exist on FWH or LPC buses. programmer.c: Update comment in fallback_map(), NULL return is the desired behavior. Test: Read firmware on SB600 Promontory mainboard (requires physmap) Test: Read firmware externally with ft2232_spi Test: Read firmware on ICH hwseq, verify physmap still occurs Change-Id: I9c3df6ae260bcdb246dfb0cd8e043919609b014b Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm> Co-Authored-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67695 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
105 lines
3.1 KiB
C
105 lines
3.1 KiB
C
/*
|
|
* This file is part of the flashrom project.
|
|
*
|
|
* Copyright (C) 2000 Silicon Integrated System Corporation
|
|
* Copyright (C) 2004 Tyan Corp <yhlu@tyan.com>
|
|
* Copyright (C) 2005-2008 coresystems GmbH
|
|
* Copyright (C) 2008,2009 Carl-Daniel Hailfinger
|
|
* Copyright (C) 2016 secunet Security Networks AG
|
|
* (Written by Nico Huber <nico.huber@secunet.com> for secunet)
|
|
* Copyright (C) 2009,2010,2011 Carl-Daniel Hailfinger
|
|
*
|
|
* 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; version 2 of the License.
|
|
*
|
|
* 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 "flash.h"
|
|
#include "programmer.h"
|
|
|
|
void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr)
|
|
{
|
|
flash->mst->par.chip_writeb(flash, val, addr);
|
|
}
|
|
|
|
void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr)
|
|
{
|
|
flash->mst->par.chip_writew(flash, val, addr);
|
|
}
|
|
|
|
void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr)
|
|
{
|
|
flash->mst->par.chip_writel(flash, val, addr);
|
|
}
|
|
|
|
void chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len)
|
|
{
|
|
flash->mst->par.chip_writen(flash, buf, addr, len);
|
|
}
|
|
|
|
uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr)
|
|
{
|
|
return flash->mst->par.chip_readb(flash, addr);
|
|
}
|
|
|
|
uint16_t chip_readw(const struct flashctx *flash, const chipaddr addr)
|
|
{
|
|
return flash->mst->par.chip_readw(flash, addr);
|
|
}
|
|
|
|
uint32_t chip_readl(const struct flashctx *flash, const chipaddr addr)
|
|
{
|
|
return flash->mst->par.chip_readl(flash, addr);
|
|
}
|
|
|
|
void chip_readn(const struct flashctx *flash, uint8_t *buf, chipaddr addr,
|
|
size_t len)
|
|
{
|
|
flash->mst->par.chip_readn(flash, buf, addr, len);
|
|
}
|
|
|
|
int register_par_master(const struct par_master *mst,
|
|
const enum chipbustype buses,
|
|
void *data)
|
|
{
|
|
struct registered_master rmst = {0};
|
|
|
|
if (mst->shutdown) {
|
|
if (register_shutdown(mst->shutdown, data)) {
|
|
mst->shutdown(data); /* cleanup */
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
/* Bus masters supporting FWH/LPC cannot use fallback_map(), distinct
|
|
* mappings are needed to support chips with FEATURE_REGISTERMAP
|
|
*/
|
|
if ((buses & (BUS_FWH | BUS_LPC)) && !mst->map_flash_region) {
|
|
msg_perr("%s called with incomplete master definition. "
|
|
"FWH/LPC masters must provide memory mappings. "
|
|
"Please report a bug at flashrom@flashrom.org\n",
|
|
__func__);
|
|
return ERROR_FLASHROM_BUG;
|
|
}
|
|
|
|
if (!mst->chip_writeb || !mst->chip_writew || !mst->chip_writel ||
|
|
!mst->chip_writen || !mst->chip_readb || !mst->chip_readw ||
|
|
!mst->chip_readl || !mst->chip_readn) {
|
|
msg_perr("%s called with incomplete master definition. "
|
|
"Please report a bug at flashrom@flashrom.org\n",
|
|
__func__);
|
|
return ERROR_FLASHROM_BUG;
|
|
}
|
|
|
|
rmst.buses_supported = buses;
|
|
rmst.par = *mst;
|
|
if (data)
|
|
rmst.par.data = data;
|
|
return register_master(&rmst);
|
|
}
|