> Subject: [PATCH] hw/arm/aspeed: ast2600-evb: Use w25q512jv flash model > > The ast2600-evb machine model is using the "mx66u51235f" flash model, > which has issues with recent Linux kernels (6.15+) when reading SFDP data. > > Change the flash model to "w25q512jv", which is the model present on some > ast2600a3 EVB board and is known to work correctly with recent kernels. > Adjust the corresponding qtest to reflect the new JEDEC ID of the w25q512jv > flash. > > Signed-off-by: Cédric Le Goater <[email protected]> > --- > hw/arm/aspeed.c | 4 ++-- > tests/qtest/aspeed_smc-test.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index > 2e43898d6403..c29bbd54059d 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -1610,8 +1610,8 @@ static void > aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, > amc->soc_name = "ast2600-a3"; > amc->hw_strap1 = AST2600_EVB_HW_STRAP1; > amc->hw_strap2 = AST2600_EVB_HW_STRAP2; > - amc->fmc_model = "mx66u51235f"; > - amc->spi_model = "mx66u51235f"; > + amc->fmc_model = "w25q512jv"; > + amc->spi_model = "w25q512jv"; > amc->num_cs = 1; > amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | > ASPEED_MAC2_ON | > ASPEED_MAC3_ON; > diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.c > index 52a00e6f0a7e..50a87e625001 100644 > --- a/tests/qtest/aspeed_smc-test.c > +++ b/tests/qtest/aspeed_smc-test.c > @@ -134,10 +134,10 @@ static void test_ast2600_evb(AspeedSMCTestData > *data) > "-drive file=%s,format=raw,if=mtd", > data->tmp_path); > > - /* fmc cs0 with mx66u51235f flash */ > + /* fmc cs0 with w25q512jv flash */ > data->flash_base = 0x20000000; > data->spi_base = 0x1E620000; > - data->jedec_id = 0xc2253a; > + data->jedec_id = 0xef4020; > data->cs = 0; > data->node = "/machine/soc/fmc/ssi.0/child[0]"; > /* beyond 16MB */ > -- > 2.51.0
Reviewed-by: Jamin Lin <[email protected]> Thanks, Jamin
