| Message ID | 20190627202719.17739-10-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block/pflash_cfi02: Implement missing AMD pflash functionality | expand |
On Thu, Jun 27, 2019 at 1:54 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > The load/store API eases code review. > > 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, simplified tracing] > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/block/pflash_cfi02.c | 32 +++++--------------------------- > 1 file changed, 5 insertions(+), 27 deletions(-) > > diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c > index ae38ed0bae..49afecb921 100644 > --- a/hw/block/pflash_cfi02.c > +++ b/hw/block/pflash_cfi02.c > @@ -196,33 +196,11 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, > case 0x00: > flash_read: > /* Flash area read */ > - p = pfl->storage; > - switch (width) { > - case 1: > - ret = p[offset]; > - break; > - case 2: > - if (be) { > - ret = p[offset] << 8; > - ret |= p[offset + 1]; > - } else { > - ret = p[offset]; > - ret |= p[offset + 1] << 8; > - } > - break; > - case 4: > - if (be) { > - ret = p[offset] << 24; > - ret |= p[offset + 1] << 16; > - ret |= p[offset + 2] << 8; > - ret |= p[offset + 3]; > - } else { > - ret = p[offset]; > - ret |= p[offset + 1] << 8; > - ret |= p[offset + 2] << 16; > - ret |= p[offset + 3] << 24; > - } > - break; > + p = (uint8_t *)pfl->storage + offset; > + 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; > -- > 2.20.1 > >
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index ae38ed0bae..49afecb921 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -196,33 +196,11 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, case 0x00: flash_read: /* Flash area read */ - p = pfl->storage; - switch (width) { - case 1: - ret = p[offset]; - break; - case 2: - if (be) { - ret = p[offset] << 8; - ret |= p[offset + 1]; - } else { - ret = p[offset]; - ret |= p[offset + 1] << 8; - } - break; - case 4: - if (be) { - ret = p[offset] << 24; - ret |= p[offset + 1] << 16; - ret |= p[offset + 2] << 8; - ret |= p[offset + 3]; - } else { - ret = p[offset]; - ret |= p[offset + 1] << 8; - ret |= p[offset + 2] << 16; - ret |= p[offset + 3] << 24; - } - break; + p = (uint8_t *)pfl->storage + offset; + 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;