mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 22:52:34 +02:00

Original progress reporting implemented in CB:49643 and it has some issues, for example: size_t start_address = start; size_t end_address = len - start; End address is anything but length minus start address. update_progress(flash, FLASHROM_PROGRESS_READ, /*current*/ start - start_address + to_read, /*total*/ end_address); Total should just be length if that's how current value is computed. --- libflashrom needs to know total size ahead of time. That's init_progress() and changed update_progress(). It also needs to store the last current value to be able to update it. That's stage_progress in flashrom_flashctx. Measuring accurately amount of data which will be read/erased/written isn't easy because things can be skipped as optimizations. The next patch in the chain aims to address this, there are TODO/FIXME comments there. --- CLI shares terminal with the rest of the code and has to maintain more state to handle that reasonably well. Similar to CB:64668, an effort is made to keep the progress on a single line. Non-progress output is kept track of to know when moving to a new line cannot be avoided. --- A script to test the CLI: \#!/bin/bash t=${1:-rewW} shift if [[ $t =~ r ]]; then echo ">>> READ" ./flashrom -p dummy:emulate=W25Q128FV,freq=64mhz -r dump.rom --progress "$@" echo fi if [[ $t =~ e ]]; then echo ">>> ERASE" ./flashrom -p dummy:emulate=W25Q128FV,freq=64mhz -E --progress "$@" echo fi if [[ $t =~ w ]]; then echo ">>> WRITE (without erase)" dd if=/dev/zero of=zero.rom bs=1M count=16 2> /dev/null ./flashrom -p dummy:emulate=W25Q128FV,freq=64mhz -w zero.rom --progress "$@" echo fi if [[ $t =~ W ]]; then echo ">>> WRITE (with erase)" dd if=/dev/zero of=zero.rom bs=1M count=16 2> /dev/null dd if=/dev/random of=random.rom bs=1M count=16 2> /dev/null ./flashrom -p dummy:emulate=W25Q128FV,freq=64mhz,image=random.rom -w zero.rom --progress "$@" echo fi Co-developed-by: Anastasia Klimchuk <aklm@flashrom.org> Co-developed-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com> Change-Id: If1e40fc97f443c4f0c0501cef11cff1f3f84c051 Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com> Signed-off-by: Anastasia Klimchuk <aklm@flashrom.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/84102 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
286 lines
8.3 KiB
C
286 lines
8.3 KiB
C
/*
|
|
* This file is part of the flashrom project.
|
|
*
|
|
* Copyright 2020 Google LLC
|
|
*
|
|
* 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 <include/test.h>
|
|
|
|
#include "wraps.h"
|
|
#include "tests.h"
|
|
#include "programmer.h"
|
|
#include "flashchips.h"
|
|
#include "chipdrivers.h"
|
|
#include "spi.h"
|
|
|
|
struct flashchip mock_chip = {
|
|
.vendor = "Generic",
|
|
.name = "unknown SPI chip (RDID)",
|
|
.bustype = BUS_SPI,
|
|
.manufacture_id = GENERIC_MANUF_ID,
|
|
.model_id = GENERIC_DEVICE_ID,
|
|
.total_size = 0,
|
|
.page_size = 256,
|
|
.tested = TEST_BAD_PREW,
|
|
.probe = PROBE_SPI_RDID,
|
|
.write = NO_WRITE_FUNC,
|
|
};
|
|
|
|
/*
|
|
* This declaration is needed for visibility, so that wrap below could
|
|
* redirect to real function.
|
|
*/
|
|
int __real_spi_send_command(const struct flashctx *flash,
|
|
unsigned int writecnt, unsigned int readcnt,
|
|
const unsigned char *writearr, unsigned char *readarr);
|
|
|
|
int __wrap_spi_send_command(const struct flashctx *flash,
|
|
unsigned int writecnt, unsigned int readcnt,
|
|
const unsigned char *writearr, unsigned char *readarr)
|
|
{
|
|
if (flash->chip != &mock_chip)
|
|
/*
|
|
* Caller is some other test, redirecting to real function.
|
|
* This test is the only one which uses wrap of spi_send_command,
|
|
* all other tests use real function.
|
|
*/
|
|
return __real_spi_send_command(flash, writecnt, readcnt, writearr, readarr);
|
|
|
|
if (!flash->progress_callback)
|
|
check_expected_ptr(flash);
|
|
|
|
assert_int_equal(writecnt, mock_type(int));
|
|
assert_int_equal(writearr[0], mock_type(int));
|
|
|
|
int rcnt = mock_type(int);
|
|
assert_int_equal(readcnt, rcnt);
|
|
for (int i = 0; i < rcnt; i++)
|
|
readarr[i] = i;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void spi_read_progress_cb(struct flashrom_flashctx *flashctx)
|
|
{
|
|
struct flashrom_progress *progress_state = flashctx->progress_state;
|
|
uint32_t *cnt = (uint32_t *) progress_state->user_data;
|
|
assert_int_equal(0x400, progress_state->total);
|
|
switch (*cnt) {
|
|
case 0:
|
|
assert_int_equal(0x0, progress_state->current);
|
|
break;
|
|
case 1:
|
|
assert_int_equal(0x100, progress_state->current);
|
|
break;
|
|
case 2:
|
|
assert_int_equal(0x200, progress_state->current);
|
|
break;
|
|
case 3:
|
|
assert_int_equal(0x300, progress_state->current);
|
|
break;
|
|
case 4:
|
|
assert_int_equal(0x400, progress_state->current);
|
|
break;
|
|
default:
|
|
fail();
|
|
}
|
|
(*cnt)++;
|
|
}
|
|
|
|
void default_spi_read_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
uint8_t buf[0x400] = { 0x0 };
|
|
uint32_t cnt = 0;
|
|
const unsigned int max_data_read = 0x100;
|
|
const unsigned int offset = 0x100;
|
|
struct registered_master mst = {
|
|
.spi.read = default_spi_read,
|
|
.spi.max_data_read = max_data_read
|
|
};
|
|
|
|
/* setup initial test state */
|
|
struct flashctx flashctx = {
|
|
.chip = &mock_chip,
|
|
.mst = &mst
|
|
};
|
|
struct flashrom_progress progress_state = {
|
|
.user_data = (void *) &cnt,
|
|
};
|
|
flashrom_set_progress_callback(&flashctx, spi_read_progress_cb, &progress_state);
|
|
init_progress(&flashctx, FLASHROM_PROGRESS_READ, 0x400);
|
|
for (int i = 0; i < 4; i++) {
|
|
will_return(__wrap_spi_send_command, JEDEC_WRDI);
|
|
will_return(__wrap_spi_send_command, JEDEC_READ);
|
|
will_return(__wrap_spi_send_command, max_data_read);
|
|
}
|
|
assert_int_equal(0, default_spi_read(&flashctx, buf, offset, sizeof(buf)));
|
|
assert_int_equal(5, cnt);
|
|
|
|
flashrom_set_progress_callback(&flashctx, NULL, NULL);
|
|
}
|
|
|
|
void spi_write_enable_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_WREN_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_WREN);
|
|
will_return(__wrap_spi_send_command, JEDEC_WREN_INSIZE);
|
|
assert_int_equal(0, spi_write_enable(&flashctx));
|
|
}
|
|
|
|
void spi_write_disable_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_WRDI_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_WRDI);
|
|
will_return(__wrap_spi_send_command, JEDEC_WRDI_INSIZE);
|
|
assert_int_equal(0, spi_write_disable(&flashctx));
|
|
}
|
|
|
|
void probe_spi_rdid_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_RDID_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_RDID);
|
|
will_return(__wrap_spi_send_command, JEDEC_RDID_INSIZE);
|
|
assert_int_equal(0, probe_spi_rdid(&flashctx));
|
|
}
|
|
|
|
void probe_spi_rdid4_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_RDID_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_RDID);
|
|
will_return(__wrap_spi_send_command, JEDEC_RDID_INSIZE + 1);
|
|
assert_int_equal(0, probe_spi_rdid4(&flashctx));
|
|
}
|
|
|
|
void probe_spi_rems_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_REMS_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_REMS);
|
|
will_return(__wrap_spi_send_command, JEDEC_REMS_INSIZE);
|
|
assert_int_equal(0, probe_spi_rems(&flashctx));
|
|
}
|
|
|
|
void probe_spi_res1_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_RES_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_RES);
|
|
will_return(__wrap_spi_send_command, JEDEC_RES_INSIZE + 1);
|
|
assert_int_equal(0, probe_spi_res2(&flashctx));
|
|
}
|
|
|
|
void probe_spi_res2_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
clear_spi_id_cache();
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_RES_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_RES);
|
|
will_return(__wrap_spi_send_command, JEDEC_RES_INSIZE + 1);
|
|
assert_int_equal(0, probe_spi_res2(&flashctx));
|
|
}
|
|
|
|
void probe_spi_res3_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, JEDEC_RES_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, JEDEC_RES);
|
|
will_return(__wrap_spi_send_command, JEDEC_RES_INSIZE + 2);
|
|
assert_int_equal(0, probe_spi_res3(&flashctx));
|
|
}
|
|
|
|
void probe_spi_at25f_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
will_return(__wrap_spi_send_command, AT25F_RDID_OUTSIZE);
|
|
will_return(__wrap_spi_send_command, AT25F_RDID);
|
|
will_return(__wrap_spi_send_command, AT25F_RDID_INSIZE);
|
|
assert_int_equal(0, probe_spi_at25f(&flashctx));
|
|
}
|
|
|
|
/* spi95.c */
|
|
void probe_spi_st95_test_success(void **state)
|
|
{
|
|
(void) state; /* unused */
|
|
|
|
/* setup initial test state. */
|
|
struct flashctx flashctx = { .chip = &mock_chip };
|
|
expect_memory(__wrap_spi_send_command, flash,
|
|
&flashctx, sizeof(flashctx));
|
|
|
|
/* chip total size < 64K. */
|
|
uint32_t rdid_outsize = ST_M95_RDID_2BA_OUTSIZE; // 16 bit address
|
|
|
|
will_return(__wrap_spi_send_command, rdid_outsize);
|
|
will_return(__wrap_spi_send_command, ST_M95_RDID);
|
|
will_return(__wrap_spi_send_command, ST_M95_RDID_INSIZE);
|
|
assert_int_equal(0, probe_spi_st95(&flashctx));
|
|
}
|