| Message ID | 20190627202719.17739-9-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block/pflash_cfi02: Implement missing AMD pflash functionality | expand |
On Thu, Jun 27, 2019 at 1:43 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] > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/block/pflash_cfi02.c | 38 ++++++++------------------------------ > 1 file changed, 8 insertions(+), 30 deletions(-) > > diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c > index 9e8c28af8f..ae38ed0bae 100644 > --- a/hw/block/pflash_cfi02.c > +++ b/hw/block/pflash_cfi02.c > @@ -365,38 +365,16 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset, > goto check_unlock0; > case 0xA0: > trace_pflash_data_write(offset, width << 1, value, 0); > - p = pfl->storage; > if (!pfl->ro) { > - switch (width) { > - case 1: > - p[offset] &= value; > - pflash_update(pfl, offset, 1); > - break; > - case 2: > - if (be) { > - p[offset] &= value >> 8; > - p[offset + 1] &= value; > - } else { > - p[offset] &= value; > - p[offset + 1] &= value >> 8; > - } > - pflash_update(pfl, offset, 2); > - break; > - case 4: > - if (be) { > - p[offset] &= value >> 24; > - p[offset + 1] &= value >> 16; > - p[offset + 2] &= value >> 8; > - p[offset + 3] &= value; > - } else { > - p[offset] &= value; > - p[offset + 1] &= value >> 8; > - p[offset + 2] &= value >> 16; > - p[offset + 3] &= value >> 24; > - } > - pflash_update(pfl, offset, 4); > - break; > + p = (uint8_t *)pfl->storage + offset; > + if (pfl->be) { > + uint64_t current = ldn_be_p(p, width); > + stn_be_p(p, width, current & value); > + } else { > + uint64_t current = ldn_le_p(p, width); > + stn_le_p(p, width, current & value); > } > + pflash_update(pfl, offset, width); > } > /* > * While programming, status bit DQ7 should hold the opposite > -- > 2.20.1 > >
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 9e8c28af8f..ae38ed0bae 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -365,38 +365,16 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset, goto check_unlock0; case 0xA0: trace_pflash_data_write(offset, width << 1, value, 0); - p = pfl->storage; if (!pfl->ro) { - switch (width) { - case 1: - p[offset] &= value; - pflash_update(pfl, offset, 1); - break; - case 2: - if (be) { - p[offset] &= value >> 8; - p[offset + 1] &= value; - } else { - p[offset] &= value; - p[offset + 1] &= value >> 8; - } - pflash_update(pfl, offset, 2); - break; - case 4: - if (be) { - p[offset] &= value >> 24; - p[offset + 1] &= value >> 16; - p[offset + 2] &= value >> 8; - p[offset + 3] &= value; - } else { - p[offset] &= value; - p[offset + 1] &= value >> 8; - p[offset + 2] &= value >> 16; - p[offset + 3] &= value >> 24; - } - pflash_update(pfl, offset, 4); - break; + p = (uint8_t *)pfl->storage + offset; + if (pfl->be) { + uint64_t current = ldn_be_p(p, width); + stn_be_p(p, width, current & value); + } else { + uint64_t current = ldn_le_p(p, width); + stn_le_p(p, width, current & value); } + pflash_update(pfl, offset, width); } /* * While programming, status bit DQ7 should hold the opposite