openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/block/pflash_cfi02: Extract the pflash_data_read() function 

Extract the code block in a new function, remove a goto statement.

Signed-off-by: Stephen Checkoway <stephen.checkoway@oberlin.edu>
Message-Id: <20190426162624.55977-3-stephen.checkoway@oberlin.edu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: Extracted from bigger patch, remove the XXX tracing comment]
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-05-05 23:24:51 +02:00
parent 3e4bcf89b7
commit 06e8b8e3e1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/block/pflash_cfi02.c
View File

@ -165,12 +165,23 @@ static void pflash_timer (void *opaque)
pfl->cmd = 0; pfl->cmd = 0;
} }
/*
* Read data from flash.
*/
static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr offset,
unsigned int width)
{
uint8_t *p = (uint8_t *)pfl->storage + offset;
uint64_t ret = pfl->be ? ldn_be_p(p, width) : ldn_le_p(p, width);
trace_pflash_data_read(offset, width << 1, ret);
return ret;
}
static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset,
int width, int be) int width, int be)
{ {
hwaddr boff; hwaddr boff;
uint32_t ret; uint32_t ret;
uint8_t *p;
ret = -1; ret = -1;
/* Lazy reset to ROMD mode after a certain amount of read accesses */ /* Lazy reset to ROMD mode after a certain amount of read accesses */
@ -194,15 +205,8 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset,
case 0x80: case 0x80:
/* We accept reads during second unlock sequence... */ /* We accept reads during second unlock sequence... */
case 0x00: case 0x00:
flash_read:
/* Flash area read */ /* Flash area read */
p = (uint8_t *)pfl->storage + offset; ret = pflash_data_read(pfl, offset, width);
if (pfl->be) {
ret = ldn_be_p(p, width);
} else {
ret = ldn_le_p(p, width);
}
trace_pflash_data_read(offset, width << 1, ret);
break; break;
case 0x90: case 0x90:
/* flash ID read */ /* flash ID read */
@ -222,7 +226,7 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset,
} }
/* Fall through to data read. */ /* Fall through to data read. */
default: default:
goto flash_read; ret = pflash_data_read(pfl, offset, width);
} }
DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx32 "\n", __func__, boff, ret); DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx32 "\n", __func__, boff, ret);
break; break;