| Message ID | 20190627202719.17739-18-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block/pflash_cfi02: Implement missing AMD pflash functionality | expand |
On Thu, Jun 27, 2019 at 1:57 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > The 'page mode' feature entry was implicitly set as zero > (not supported). Document it exists, so we won't discard > it if we squeeze the CFI table. > > Signed-off-by: Stephen Checkoway <stephen.checkoway@oberlin.edu> > Message-Id: <20190426162624.55977-6-stephen.checkoway@oberlin.edu> > [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 | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c > index 23d05a6308..01d9c5d75a 100644 > --- a/hw/block/pflash_cfi02.c > +++ b/hw/block/pflash_cfi02.c > @@ -637,7 +637,9 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) > pfl->cfi_table[0x0a + pri_ofs] = 0x00; > /* Burst mode not supported. */ > pfl->cfi_table[0x0b + pri_ofs] = 0x00; > - assert(0x0b + pri_ofs < ARRAY_SIZE(pfl->cfi_table)); > + /* Page mode not supported. */ > + pfl->cfi_table[0x0c + pri_ofs] = 0x00; > + assert(0x0c + pri_ofs < ARRAY_SIZE(pfl->cfi_table)); > } > > static Property pflash_cfi02_properties[] = { > -- > 2.20.1 > >
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 23d05a6308..01d9c5d75a 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -637,7 +637,9 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) pfl->cfi_table[0x0a + pri_ofs] = 0x00; /* Burst mode not supported. */ pfl->cfi_table[0x0b + pri_ofs] = 0x00; - assert(0x0b + pri_ofs < ARRAY_SIZE(pfl->cfi_table)); + /* Page mode not supported. */ + pfl->cfi_table[0x0c + pri_ofs] = 0x00; + assert(0x0c + pri_ofs < ARRAY_SIZE(pfl->cfi_table)); } static Property pflash_cfi02_properties[] = {