Re: [PATCH v6 06/25] spl: Remove dev from spl_load_info

[Sean Anderson <seanga2@gmail.com>]

On 11/7/23 23:23, Simon Glass wrote:
> Hi Sean,
> 
> On Sun, 5 Nov 2023 at 19:26, Sean Anderson <seanga2@gmail.com> wrote:
>>
>> dev and priv server the same purpose, and are never set at the same time.
> 
> serve
> 
>> Remove dev and convert all users to priv. While we're at it, reorder bl_len
>> to be last for better alignment.
> 
> It's a bit unfortunate to drop the device, isn't it? But then, as
> before, this is self-contained so Is suppose it doesn't matter what we
> store.

The original goal was to have something like

struct spl_load load = SPL_LOAD_INFO(my_load_function, my_private_data);

but I had to cut it because it was resulting in too many unnecessary assignments.

--Sean

> Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> Regards,
> Simon
> 
> 
> 
>>
>> Signed-off-by: Sean Anderson <seanga2@gmail.com>
>> ---
>>
>> Changes in v6:
>> - New
>>
>>   common/spl/spl_mmc.c       | 6 +++---
>>   common/spl/spl_spi.c       | 6 +++---
>>   drivers/usb/gadget/f_sdp.c | 6 +++---
>>   include/spl.h              | 4 +---
>>   4 files changed, 10 insertions(+), 12 deletions(-)
>>
>> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
>> index 6d9137c32e0..3d7551a7dae 100644
>> --- a/common/spl/spl_mmc.c
>> +++ b/common/spl/spl_mmc.c
>> @@ -65,7 +65,7 @@ static int mmc_load_legacy(struct spl_image_info *spl_image,
>>   static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
>>                               ulong count, void *buf)
>>   {
>> -       struct mmc *mmc = load->dev;
>> +       struct mmc *mmc = load->priv;
>>
>>          return blk_dread(mmc_get_blk_desc(mmc), sector, count, buf);
>>   }
>> @@ -105,7 +105,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
>>                  struct spl_load_info load;
>>
>>                  debug("Found FIT\n");
>> -               load.dev = mmc;
>> +               load.priv = mmc;
>>                  load.filename = NULL;
>>                  load.bl_len = mmc->read_bl_len;
>>                  load.read = h_spl_load_read;
>> @@ -114,7 +114,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
>>                     valid_container_hdr((void *)header)) {
>>                  struct spl_load_info load;
>>
>> -               load.dev = mmc;
>> +               load.priv = mmc;
>>                  load.filename = NULL;
>>                  load.bl_len = mmc->read_bl_len;
>>                  load.read = h_spl_load_read;
>> diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
>> index d83d70f2f33..af7a28e7c25 100644
>> --- a/common/spl/spl_spi.c
>> +++ b/common/spl/spl_spi.c
>> @@ -59,7 +59,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
>>   static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
>>                                ulong count, void *buf)
>>   {
>> -       struct spi_flash *flash = load->dev;
>> +       struct spi_flash *flash = load->priv;
>>          ulong ret;
>>
>>          ret = spi_flash_read(flash, sector, count, buf);
>> @@ -151,7 +151,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
>>                          struct spl_load_info load;
>>
>>                          debug("Found FIT\n");
>> -                       load.dev = flash;
>> +                       load.priv = flash;
>>                          load.filename = NULL;
>>                          load.bl_len = 1;
>>                          load.read = spl_spi_fit_read;
>> @@ -162,7 +162,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
>>                             valid_container_hdr((void *)header)) {
>>                          struct spl_load_info load;
>>
>> -                       load.dev = flash;
>> +                       load.priv = flash;
>>                          load.filename = NULL;
>>                          load.bl_len = 1;
>>                          load.read = spl_spi_fit_read;
>> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
>> index ee9384fb37e..1b16b7eb452 100644
>> --- a/drivers/usb/gadget/f_sdp.c
>> +++ b/drivers/usb/gadget/f_sdp.c
>> @@ -744,7 +744,7 @@ static ulong sdp_load_read(struct spl_load_info *load, ulong sector,
>>   {
>>          debug("%s: sector %lx, count %lx, buf %lx\n",
>>                __func__, sector, count, (ulong)buf);
>> -       memcpy(buf, (void *)(load->dev + sector), count);
>> +       memcpy(buf, (void *)(load->priv + sector), count);
>>          return count;
>>   }
>>
>> @@ -844,7 +844,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
>>                                  struct spl_load_info load;
>>
>>                                  debug("Found FIT\n");
>> -                               load.dev = header;
>> +                               load.priv = header;
>>                                  load.bl_len = 1;
>>                                  load.read = sdp_load_read;
>>                                  spl_load_simple_fit(spl_image, &load, 0,
>> @@ -857,7 +857,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
>>                              valid_container_hdr((void *)header)) {
>>                                  struct spl_load_info load;
>>
>> -                               load.dev = header;
>> +                               load.priv = header;
>>                                  load.bl_len = 1;
>>                                  load.read = sdp_load_read;
>>                                  spl_load_imx_container(spl_image, &load, 0);
>> diff --git a/include/spl.h b/include/spl.h
>> index 8ff20adc28e..951e136b9ea 100644
>> --- a/include/spl.h
>> +++ b/include/spl.h
>> @@ -285,16 +285,13 @@ static inline void *spl_image_fdt_addr(struct spl_image_info *info)
>>   /**
>>    * Information required to load data from a device
>>    *
>> - * @dev: Pointer to the device, e.g. struct mmc *
>>    * @priv: Private data for the device
>>    * @bl_len: Block length for reading in bytes
>>    * @filename: Name of the fit image file.
>>    * @read: Function to call to read from the device
>>    */
>>   struct spl_load_info {
>> -       void *dev;
>>          void *priv;
>> -       int bl_len;
>>          const char *filename;
>>          /**
>>           * read() - Read from device
>> @@ -307,6 +304,7 @@ struct spl_load_info {
>>           */
>>          ulong (*read)(struct spl_load_info *load, ulong sector, ulong count,
>>                        void *buf);
>> +       int bl_len;
>>   };
>>
>>   /*
>> --
>> 2.37.1
>>