| Message ID | 20200902093107.608000-10-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/9] m25p80: Add basic support for the SFDP command | expand |
Hi Cedric, On [2020 Sep 02] Wed 11:31:07, Cédric Le Goater wrote: > Modify the snooping routine to handle RDSFDP, 1 dummy and 3 bytes > address space. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > include/hw/ssi/aspeed_smc.h | 1 + > hw/ssi/aspeed_smc.c | 21 ++++++++++++++------- > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h > index 6fbbb238f158..5f477eb9cf97 100644 > --- a/include/hw/ssi/aspeed_smc.h > +++ b/include/hw/ssi/aspeed_smc.h > @@ -115,6 +115,7 @@ typedef struct AspeedSMCState { > > AspeedSMCFlash *flashes; > > + uint8_t snoop_addr_width; > uint8_t snoop_index; > uint8_t snoop_dummies; > } AspeedSMCState; > diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c > index 795784e5f364..594f34668e7a 100644 > --- a/hw/ssi/aspeed_smc.c > +++ b/hw/ssi/aspeed_smc.c > @@ -778,10 +778,15 @@ typedef enum { > PP = 0x2, PP_4 = 0x12, > DPP = 0xa2, > QPP = 0x32, QPP_4 = 0x34, > + RDSFDP = 0x5a, > } FlashCMD; > > -static int aspeed_smc_num_dummies(uint8_t command) > +static int aspeed_smc_num_dummies(AspeedSMCFlash *fl, uint8_t command) Should the function be renamed to reflect that it also calculates the address width now? (An alternative could be to create a new function for the address width calculation) The patch looks good to me else! Best regards, Francisco Iglesias > { > + AspeedSMCState *s = fl->controller; > + > + s->snoop_addr_width = aspeed_smc_flash_is_4byte(fl) ? 4 : 3; > + > switch (command) { /* check for dummies */ > case READ: /* no dummy bytes/cycles */ > case PP: > @@ -798,6 +803,9 @@ static int aspeed_smc_num_dummies(uint8_t command) > case DOR_4: > case QOR_4: > return 1; > + case RDSFDP: > + s->snoop_addr_width = 3; > + return 1; > case DIOR: > case DIOR_4: > return 2; > @@ -813,8 +821,6 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, uint64_t data, > unsigned size) > { > AspeedSMCState *s = fl->controller; > - uint8_t addr_width = aspeed_smc_flash_is_4byte(fl) ? 4 : 3; > - > trace_aspeed_smc_do_snoop(fl->id, s->snoop_index, s->snoop_dummies, > (uint8_t) data & 0xff); > > @@ -823,7 +829,7 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, uint64_t data, > > } else if (s->snoop_index == SNOOP_START) { > uint8_t cmd = data & 0xff; > - int ndummies = aspeed_smc_num_dummies(cmd); > + int ndummies = aspeed_smc_num_dummies(fl, cmd); > > /* > * No dummy cycles are expected with the current command. Turn > @@ -836,7 +842,7 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, uint64_t data, > > s->snoop_dummies = ndummies * 8; > > - } else if (s->snoop_index >= addr_width + 1) { > + } else if (s->snoop_index >= s->snoop_addr_width + 1) { > > /* The SPI transfer has reached the dummy cycles sequence */ > for (; s->snoop_dummies; s->snoop_dummies--) { > @@ -1407,10 +1413,11 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp) > > static const VMStateDescription vmstate_aspeed_smc = { > .name = "aspeed.smc", > - .version_id = 2, > - .minimum_version_id = 2, > + .version_id = 3, > + .minimum_version_id = 3, > .fields = (VMStateField[]) { > VMSTATE_UINT32_ARRAY(regs, AspeedSMCState, ASPEED_SMC_R_MAX), > + VMSTATE_UINT8(snoop_addr_width, AspeedSMCState), > VMSTATE_UINT8(snoop_index, AspeedSMCState), > VMSTATE_UINT8(snoop_dummies, AspeedSMCState), > VMSTATE_END_OF_LIST() > -- > 2.25.4 >
diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 6fbbb238f158..5f477eb9cf97 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -115,6 +115,7 @@ typedef struct AspeedSMCState { AspeedSMCFlash *flashes; + uint8_t snoop_addr_width; uint8_t snoop_index; uint8_t snoop_dummies; } AspeedSMCState; diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 795784e5f364..594f34668e7a 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -778,10 +778,15 @@ typedef enum { PP = 0x2, PP_4 = 0x12, DPP = 0xa2, QPP = 0x32, QPP_4 = 0x34, + RDSFDP = 0x5a, } FlashCMD; -static int aspeed_smc_num_dummies(uint8_t command) +static int aspeed_smc_num_dummies(AspeedSMCFlash *fl, uint8_t command) { + AspeedSMCState *s = fl->controller; + + s->snoop_addr_width = aspeed_smc_flash_is_4byte(fl) ? 4 : 3; + switch (command) { /* check for dummies */ case READ: /* no dummy bytes/cycles */ case PP: @@ -798,6 +803,9 @@ static int aspeed_smc_num_dummies(uint8_t command) case DOR_4: case QOR_4: return 1; + case RDSFDP: + s->snoop_addr_width = 3; + return 1; case DIOR: case DIOR_4: return 2; @@ -813,8 +821,6 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, uint64_t data, unsigned size) { AspeedSMCState *s = fl->controller; - uint8_t addr_width = aspeed_smc_flash_is_4byte(fl) ? 4 : 3; - trace_aspeed_smc_do_snoop(fl->id, s->snoop_index, s->snoop_dummies, (uint8_t) data & 0xff); @@ -823,7 +829,7 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, uint64_t data, } else if (s->snoop_index == SNOOP_START) { uint8_t cmd = data & 0xff; - int ndummies = aspeed_smc_num_dummies(cmd); + int ndummies = aspeed_smc_num_dummies(fl, cmd); /* * No dummy cycles are expected with the current command. Turn @@ -836,7 +842,7 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, uint64_t data, s->snoop_dummies = ndummies * 8; - } else if (s->snoop_index >= addr_width + 1) { + } else if (s->snoop_index >= s->snoop_addr_width + 1) { /* The SPI transfer has reached the dummy cycles sequence */ for (; s->snoop_dummies; s->snoop_dummies--) { @@ -1407,10 +1413,11 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp) static const VMStateDescription vmstate_aspeed_smc = { .name = "aspeed.smc", - .version_id = 2, - .minimum_version_id = 2, + .version_id = 3, + .minimum_version_id = 3, .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, AspeedSMCState, ASPEED_SMC_R_MAX), + VMSTATE_UINT8(snoop_addr_width, AspeedSMCState), VMSTATE_UINT8(snoop_index, AspeedSMCState), VMSTATE_UINT8(snoop_dummies, AspeedSMCState), VMSTATE_END_OF_LIST()
Modify the snooping routine to handle RDSFDP, 1 dummy and 3 bytes address space. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ssi/aspeed_smc.h | 1 + hw/ssi/aspeed_smc.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-)