| Message ID | 20220722063602.128144-9-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | m25p80: Add SFDP support | expand |
On Fri, 22 Jul 2022, at 16:06, Cédric Le Goater wrote: > A mx25l25635f chip model is generally found on these machines. It's > newer and uses 4B opcodes which is better to exercise the support in > the Linux kernel. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > hw/arm/aspeed.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 1c611284819d..7e95abc55b09 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -1157,7 +1157,7 @@ static void > aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) > amc->soc_name = "ast2400-a1"; > amc->hw_strap1 = PALMETTO_BMC_HW_STRAP1; > amc->fmc_model = "n25q256a"; > - amc->spi_model = "mx25l25635e"; > + amc->spi_model = "mx25l25635f"; Hmm, dmesg reported mx25l25635e on the palmetto I checked > amc->num_cs = 1; > amc->i2c_init = palmetto_bmc_i2c_init; > mc->default_ram_size = 256 * MiB; > @@ -1208,7 +1208,7 @@ static void > aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) > amc->soc_name = "ast2500-a1"; > amc->hw_strap1 = AST2500_EVB_HW_STRAP1; > amc->fmc_model = "mx25l25635e"; > - amc->spi_model = "mx25l25635e"; > + amc->spi_model = "mx25l25635f"; > amc->num_cs = 1; > amc->i2c_init = ast2500_evb_i2c_init; > mc->default_ram_size = 512 * MiB; > @@ -1258,7 +1258,7 @@ static void > aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) > mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)"; > amc->soc_name = "ast2500-a1"; > amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1; > - amc->fmc_model = "mx25l25635e"; > + amc->fmc_model = "mx25l25635f"; The witherspoon I checked also reported mx25l25635e in dmesg for the FMC. You do say "generally" in the commit message though. Andrew
On 7/25/22 04:08, Andrew Jeffery wrote: > > > On Fri, 22 Jul 2022, at 16:06, Cédric Le Goater wrote: >> A mx25l25635f chip model is generally found on these machines. It's >> newer and uses 4B opcodes which is better to exercise the support in >> the Linux kernel. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> hw/arm/aspeed.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c >> index 1c611284819d..7e95abc55b09 100644 >> --- a/hw/arm/aspeed.c >> +++ b/hw/arm/aspeed.c >> @@ -1157,7 +1157,7 @@ static void >> aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) >> amc->soc_name = "ast2400-a1"; >> amc->hw_strap1 = PALMETTO_BMC_HW_STRAP1; >> amc->fmc_model = "n25q256a"; >> - amc->spi_model = "mx25l25635e"; >> + amc->spi_model = "mx25l25635f"; > > Hmm, dmesg reported mx25l25635e on the palmetto I checked > >> amc->num_cs = 1; >> amc->i2c_init = palmetto_bmc_i2c_init; >> mc->default_ram_size = 256 * MiB; >> @@ -1208,7 +1208,7 @@ static void >> aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) >> amc->soc_name = "ast2500-a1"; >> amc->hw_strap1 = AST2500_EVB_HW_STRAP1; >> amc->fmc_model = "mx25l25635e"; >> - amc->spi_model = "mx25l25635e"; >> + amc->spi_model = "mx25l25635f"; >> amc->num_cs = 1; >> amc->i2c_init = ast2500_evb_i2c_init; >> mc->default_ram_size = 512 * MiB; >> @@ -1258,7 +1258,7 @@ static void >> aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) >> mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)"; >> amc->soc_name = "ast2500-a1"; >> amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1; >> - amc->fmc_model = "mx25l25635e"; >> + amc->fmc_model = "mx25l25635f"; > > The witherspoon I checked also reported mx25l25635e in dmesg for the > FMC. > > You do say "generally" in the commit message though. You can not tell from dmesg. The MX25L25635F and MX25L25635E models share the same JEDEC ID and the spi-nor flash device table only contains a mx25l25635e entry. The MX25L25635F is detected in mx25l25635_post_bfpt_fixups using SFDP. That's why I added this warning : https://github.com/legoater/linux/commit/934f0708ac597022cbf6c8d6f2ce91d55025e943 C. > > Andrew
On Mon, 25 Jul 2022, at 16:02, Cédric Le Goater wrote: > On 7/25/22 04:08, Andrew Jeffery wrote: >> >> >> On Fri, 22 Jul 2022, at 16:06, Cédric Le Goater wrote: >>> aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) >>> mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)"; >>> amc->soc_name = "ast2500-a1"; >>> amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1; >>> - amc->fmc_model = "mx25l25635e"; >>> + amc->fmc_model = "mx25l25635f"; >> >> The witherspoon I checked also reported mx25l25635e in dmesg for the >> FMC. >> >> You do say "generally" in the commit message though. > > You can not tell from dmesg. > > The MX25L25635F and MX25L25635E models share the same JEDEC ID and > the spi-nor flash device table only contains a mx25l25635e entry. > The MX25L25635F is detected in mx25l25635_post_bfpt_fixups using SFDP. > > That's why I added this warning : > > > https://github.com/legoater/linux/commit/934f0708ac597022cbf6c8d6f2ce91d55025e943 > Oh righto, sorry for the noise.
On [2022 Jul 22] Fri 08:36:02, Cédric Le Goater wrote: > A mx25l25635f chip model is generally found on these machines. It's > newer and uses 4B opcodes which is better to exercise the support in > the Linux kernel. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com> > --- > hw/arm/aspeed.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 1c611284819d..7e95abc55b09 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -1157,7 +1157,7 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) > amc->soc_name = "ast2400-a1"; > amc->hw_strap1 = PALMETTO_BMC_HW_STRAP1; > amc->fmc_model = "n25q256a"; > - amc->spi_model = "mx25l25635e"; > + amc->spi_model = "mx25l25635f"; > amc->num_cs = 1; > amc->i2c_init = palmetto_bmc_i2c_init; > mc->default_ram_size = 256 * MiB; > @@ -1208,7 +1208,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) > amc->soc_name = "ast2500-a1"; > amc->hw_strap1 = AST2500_EVB_HW_STRAP1; > amc->fmc_model = "mx25l25635e"; > - amc->spi_model = "mx25l25635e"; > + amc->spi_model = "mx25l25635f"; > amc->num_cs = 1; > amc->i2c_init = ast2500_evb_i2c_init; > mc->default_ram_size = 512 * MiB; > @@ -1258,7 +1258,7 @@ static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) > mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)"; > amc->soc_name = "ast2500-a1"; > amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1; > - amc->fmc_model = "mx25l25635e"; > + amc->fmc_model = "mx25l25635f"; > amc->spi_model = "mx66l1g45g"; > amc->num_cs = 2; > amc->i2c_init = witherspoon_bmc_i2c_init; > -- > 2.35.3 >
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 1c611284819d..7e95abc55b09 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1157,7 +1157,7 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) amc->soc_name = "ast2400-a1"; amc->hw_strap1 = PALMETTO_BMC_HW_STRAP1; amc->fmc_model = "n25q256a"; - amc->spi_model = "mx25l25635e"; + amc->spi_model = "mx25l25635f"; amc->num_cs = 1; amc->i2c_init = palmetto_bmc_i2c_init; mc->default_ram_size = 256 * MiB; @@ -1208,7 +1208,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) amc->soc_name = "ast2500-a1"; amc->hw_strap1 = AST2500_EVB_HW_STRAP1; amc->fmc_model = "mx25l25635e"; - amc->spi_model = "mx25l25635e"; + amc->spi_model = "mx25l25635f"; amc->num_cs = 1; amc->i2c_init = ast2500_evb_i2c_init; mc->default_ram_size = 512 * MiB; @@ -1258,7 +1258,7 @@ static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)"; amc->soc_name = "ast2500-a1"; amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1; - amc->fmc_model = "mx25l25635e"; + amc->fmc_model = "mx25l25635f"; amc->spi_model = "mx66l1g45g"; amc->num_cs = 2; amc->i2c_init = witherspoon_bmc_i2c_init;
A mx25l25635f chip model is generally found on these machines. It's newer and uses 4B opcodes which is better to exercise the support in the Linux kernel. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/arm/aspeed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)