Re: [PATCH] hw/sd/sdcard: Fix calculation of size when using eMMC boot partitions

[Philippe Mathieu-Daudé]

On 2/11/24 12:06, Cédric Le Goater wrote:
> Philippe,
>
> I can take this patch through the aspeed branch.

I missed this patch because it was deeply buried in a long thread.

Since you mentioned this feature will be reworked in the next cycle:

Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> Thanks,
>
> C.
>
> On 10/28/24 17:23, Jan Luebbe wrote:
> > The sd_bootpart_offset() function calculates the *runtime* offset which
> > changes as the guest switches between accessing the main user data area
> > and the boot partitions by writing to the EXT_CSD_PART_CONFIG_ACC_MASK
> > bits, so it shouldn't be used to calculate the main user data area size.
> >
> > Instead, subtract the boot_part_size directly (twice, as there are two
> > identical boot partitions defined by the eMMC spec).
> >
> > Suggested-by: Cédric Le Goater <clg@kaod.org>
> > Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> > --->   hw/sd/sd.c | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> > index 2d3467c3d956..8430d5ae361c 100644
> > --- a/hw/sd/sd.c
> > +++ b/hw/sd/sd.c
> > @@ -826,7 +826,9 @@ static void sd_reset(DeviceState *dev)
> >           sect = 0;
> >       }
> >       size = sect << HWBLOCK_SHIFT;
> > -    size -= sd_bootpart_offset(sd);
> > +    if (sd_is_emmc(sd)) {
> > +        size -= sd->boot_part_size * 2;
> > +    }
> >       sect = sd_addr_to_wpnum(size) + 1;