Hi Devarsh,

On 10/11/23 20:59, Devarsh Thakkar wrote:

Add function spl_reserve_video which is a wrapper around video_reserve to setup video memory and update the relocation address pointer.

Setup video memory before page table reservation so that framebuffer memory gets reserved from the end of RAM.

This is as per the new policy being discussed for passing blobs where each of the reserved areas for bloblists to be passed need to be reserved at the end of RAM.

This is done to enable the next stage to directly skip the pre-reserved area from previous stage right from the end of RAM without having to make any gaps/holes to accommodate those regions which was the case before as previous stage reserved region not from the end of RAM.

Suggested-by: Simon Glass sjg@chromium.org Signed-off-by: Devarsh Thakkar devarsht@ti.com

Reviewed-By: Nikhil M Jain n-jain1@ti.com

Regards, Nikhil

---

V2:

• Make a generic function "spl_reserve_video" under common/spl which can be re-used by other platforms too for reserving video memory from spl.

V3:

• Change spl_reserve_video to spl_reserve_video_from_ram_top which enforce framebuffer reservation from end of RAM
• Use gd->ram_top instead of local ram_top and update gd->reloc_addr after each reservation
• Print error message on framebuffer reservation

---

arch/arm/mach-k3/common.c | 17 ++++++++++++----- common/spl/spl.c | 27 +++++++++++++++++++++++++++ include/spl.h | 6 ++++++ 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index c3006ba387..6590045140 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -525,19 +525,26 @@ void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size) void spl_enable_dcache(void) { #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))

• phys_addr_t ram_top = CFG_SYS_SDRAM_BASE;

• gd->ram_top = CFG_SYS_SDRAM_BASE;

• int ret = 0;

  dram_init();

  /* reserve TLB table */ gd->arch.tlb_size = PGTABLE_SIZE;

• ram_top += get_effective_memsize();

• gd->ram_top += get_effective_memsize(); /* keep ram_top in the 32-bit address space */

• if (ram_top >= 0x100000000)

• ram_top = (phys_addr_t) 0x100000000;
  

• if (gd->ram_top >= 0x100000000)

• gd->ram_top = (phys_addr_t)0x100000000;
  
  

• gd->arch.tlb_addr = ram_top - gd->arch.tlb_size;

• gd->relocaddr = gd->ram_top;
• ret = spl_reserve_video_from_ram_top();
• if (ret)

• pr_err("ERROR: Failed to framebuffer memory in SPL\n");
  

• gd->arch.tlb_addr = gd->relocaddr - gd->arch.tlb_size; gd->arch.tlb_addr &= ~(0x10000 - 1); debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr, gd->arch.tlb_addr + gd->arch.tlb_size);

diff --git a/common/spl/spl.c b/common/spl/spl.c index 732d90d39e..452bf303de 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -41,6 +41,7 @@ #include <fdt_support.h> #include <bootcount.h> #include <wdt.h> +#include <video.h>

DECLARE_GLOBAL_DATA_PTR; DECLARE_BINMAN_MAGIC_SYM; @@ -151,6 +152,32 @@ void spl_fixup_fdt(void *fdt_blob) #endif }

+/*

• • Reserve video memory for SPL splash screen from
• • end of RAM
• • RETURN
• • 0 : On success
• • Non-zero : On failure
• */

+int spl_reserve_video_from_ram_top(void) +{

• if (CONFIG_IS_ENABLED(VIDEO)) {

• ulong addr;
  

• int ret;
  

• addr = gd->ram_top;
  

• ret = video_reserve(&addr);
  

• if (ret)
  

• 	return ret;
  

• debug("Reserving %luk for video at: %08lx\n",
  

•       ((unsigned long)gd->relocaddr - addr) >> 10, addr);
  

• gd->relocaddr = addr;
  

• }
• return 0;

+}

ulong spl_get_image_pos(void) { if (!CONFIG_IS_ENABLED(BINMAN_UBOOT_SYMBOLS)) diff --git a/include/spl.h b/include/spl.h index 0d49e4a454..39f2a7581d 100644 --- a/include/spl.h +++ b/include/spl.h @@ -825,6 +825,12 @@ int spl_usb_load(struct spl_image_info *spl_image,

int spl_ymodem_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev); +/**

• • spl_reserve_video_from_ram_top() - Reserve framebuffer memory from end of RAM
• • Return: 0 on success, otherwise error code
• */

+int spl_reserve_video_from_ram_top(void);

/**

• spl_invoke_atf - boot using an ARM trusted firmware image

On Fri, 10 Nov 2023 at 08:29, Devarsh Thakkar devarsht@ti.com wrote:

Start reservations needed for init sequence only after catching bloblists from previous stage.

This is to avoid catching bloblists in the middle causing gaps while u-boot is reserving.

Adjust the relocaddr as per video hand-off information received from previous stage so that further reservations start only after regions reserved for previous stages

Skip reservation for video memory if it was already filled by a bloblist.

Signed-off-by: Devarsh Thakkar devarsht@ti.com

V2: Fix typo in commit title and checkpatch warnings/checks V3: No change

---

common/board_f.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)

Reviewed-by: Simon Glass sjg@chromium.org

diff --git a/common/board_f.c b/common/board_f.c index d4d7d01f8f..acf802c9cb 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -403,7 +403,7 @@ __weak int arch_reserve_mmu(void) return 0; }

-static int reserve_video(void) +static int reserve_video_from_videoblob(void) { if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) { struct video_handoff *ho; @@ -412,8 +412,34 @@ static int reserve_video(void) if (!ho) return log_msg_ret("blf", -ENOENT); video_reserve_from_bloblist(ho);

•           gd->relocaddr = ho->fb;
  

•   } else if (CONFIG_IS_ENABLED(VIDEO)) {
  

•           /* Sanity check fb from blob is before current relocaddr */
  

•           if (likely(gd->relocaddr > (unsigned long)ho->fb))
  

•                   gd->relocaddr = ho->fb;
  

•   }
  

•   return 0;
  

+}

+/*

• • Check if any bloblist received specifying reserved areas from previous stage and adjust
• • gd->relocaddr accordingly, so that we start reserving after pre-reserved areas
• • from previous stage.
• • NOTE:
• • IT is recommended that all bloblists from previous stage are reserved from ram_top
• • as next stage will simply start reserving further regions after them.
• */

+static int setup_relocaddr_from_bloblist(void) +{

•   reserve_video_from_videoblob();
  

•   return 0;
  

+}

+static int reserve_video(void) +{

•   if (CONFIG_IS_ENABLED(VIDEO)) {
            ulong addr;
            int ret;
  
  

@@ -923,6 +949,7 @@ static const init_fnc_t init_sequence_f[] = { reserve_pram, #endif reserve_round_4k,

•   setup_relocaddr_from_bloblist,
    arch_reserve_mmu,
    reserve_video,
    reserve_trace,
  

-- 2.34.1

Hi Devarsh,

On Fri, 10 Nov 2023 at 08:29, Devarsh Thakkar devarsht@ti.com wrote:

Skip framebufer reservation if it was already reserved from previous stage and whose information was passed using a bloblist.

Signed-off-by: Devarsh Thakkar devarsht@ti.com Reviewed-by: Simon Glass sjg@chromium.org

---

V2:

• Add debug prints
• Fix commenting style

V3:

• Fix commenting style

---

drivers/video/video-uclass.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f743ed74c8..f619b5ae56 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -123,6 +123,19 @@ int video_reserve(ulong *addrp) struct udevice *dev; ulong size;

•   if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) {
  

•           /*
  

•            * Skip allocation if already received a bloblist which
  

•            * filled below fields
  

•            */
  

•           if (gd->fb_base && gd->video_top && gd->video_bottom) {
  

Can you drop that line? It should be an error to not have found the handoff info.

•                   debug("Found pre-reserved video memory from %lx to %lx\n",
  

•                         gd->video_bottom, gd->video_top);
  

•                   debug("Skipping video frame buffer allocation\n");
  

•                   return 0;
  

•           }
  

•   }
  

•   gd->video_top = *addrp;
    for (uclass_find_first_device(UCLASS_VIDEO, &dev);
         dev;
  

-- 2.34.1

Regards, Simon

Hi Devarsh,

On Fri, 10 Nov 2023 at 08:29, Devarsh Thakkar devarsht@ti.com wrote:

Fill video handoff fields in video_post_probe as at this point we have full framebuffer-related information.

Also fill all the fields available in video hand-off struct as those were missing earlier and U-boot

U-Boot

framework expects them to be filled for some of the functionalities.

Can you wrap your commit messages to closer to 72 chars?

Reported-by: Simon Glass sjg@chromium.org Signed-off-by: Devarsh Thakkar devarsht@ti.com

---

V2:

• No change

V3:

• Fix commit message per review comment
• Add a note explaining assumption of single framebuffer

---

drivers/video/video-uclass.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f619b5ae56..edc3376b46 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -154,16 +154,6 @@ int video_reserve(ulong *addrp) debug("Video frame buffers from %lx to %lx\n", gd->video_bottom, gd->video_top);

•   if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(VIDEO_HANDOFF)) {
  

•           struct video_handoff *ho;
  

•           ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);
  

•           if (!ho)
  

•                   return log_msg_ret("blf", -ENOENT);
  

•           ho->fb = *addrp;
  

•           ho->size = size;
  

•   }
  

•   return 0;
  

}

@@ -559,6 +549,25 @@ static int video_post_probe(struct udevice *dev)

    priv->fb_size = priv->line_length * priv->ysize;

•   /*
  

•    * Set up video handoff fields for passing video blob to next stage
  

•    * NOTE:
  

•    * This assumes that reserved video memory only uses a single framebuffer
  

•    */
  

•   if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
  

•           struct video_handoff *ho;
  

•           ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);
  

•           if (!ho)
  

•                   return log_msg_ret("blf", -ENOENT);
  

•           ho->fb = gd->video_bottom;
  

•           ho->size = gd->video_top - gd->video_bottom;
  

should be plat->base and plat->size

•           ho->xsize = priv->xsize;
  

•           ho->ysize = priv->ysize;
  

•           ho->line_length = priv->line_length;
  

•           ho->bpix = priv->bpix;
  

•   }
  

•   if (IS_ENABLED(CONFIG_VIDEO_COPY) && plat->copy_base)
            priv->copy_fb = map_sysmem(plat->copy_base, plat->size);
  
  

-- 2.34.1

Regards, Simon

Hi Devarsh,

On Sat, 25 Nov 2023 at 07:27, Devarsh Thakkar devarsht@ti.com wrote:

Hi Simon,

Thanks for the review.

On 13/11/23 01:31, Simon Glass wrote:

...

Hi Devarsh,

On Fri, 10 Nov 2023 at 08:29, Devarsh Thakkar devarsht@ti.com wrote:

...

Fill video handoff fields in video_post_probe as at this point we have full framebuffer-related information.

Also fill all the fields available in video hand-off struct as those were missing earlier and U-boot

U-Boot

...

framework expects them to be filled for some of the functionalities.

Can you wrap your commit messages to closer to 72 chars?

...

Reported-by: Simon Glass sjg@chromium.org Signed-off-by: Devarsh Thakkar devarsht@ti.com

---

V2:

• No change

V3:

• Fix commit message per review comment
• Add a note explaining assumption of single framebuffer

---

drivers/video/video-uclass.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f619b5ae56..edc3376b46 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -154,16 +154,6 @@ int video_reserve(ulong *addrp) debug("Video frame buffers from %lx to %lx\n", gd->video_bottom, gd->video_top);

•   if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(VIDEO_HANDOFF)) {
  

•           struct video_handoff *ho;
  

•           ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);
  

•           if (!ho)
  

•                   return log_msg_ret("blf", -ENOENT);
  

•           ho->fb = *addrp;
  

•           ho->size = size;
  

•   }
  

•   return 0;
  

}

@@ -559,6 +549,25 @@ static int video_post_probe(struct udevice *dev)

    priv->fb_size = priv->line_length * priv->ysize;

•   /*
  

•    * Set up video handoff fields for passing video blob to next stage
  

•    * NOTE:
  

•    * This assumes that reserved video memory only uses a single framebuffer
  

•    */
  

•   if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
  

•           struct video_handoff *ho;
  

•           ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);
  

•           if (!ho)
  

•                   return log_msg_ret("blf", -ENOENT);
  

•           ho->fb = gd->video_bottom;
  

•           ho->size = gd->video_top - gd->video_bottom;
  

should be plat->base and plat->size

plat->size contains the unaligned size actually. While reserving video memory, the size of allocation is updated [0] as per default alignment (1 MiB) or alignment requested by driver. So I thought it is better to pass actual allocated size calculated using gd as the next stage receiving hand-off can directly skip the region as per passed size. And since I used gd for calculating size, I thought to stick to using gd for ho->fb too for consistency.

Kindly let me know if any queries.

This sort of thing would have been useful to put in a comment in the code, or commit message.

I still don't really see why the 'aligned' size isn't already in plat, after alloc_fb() is called.

Anyway I will leave this to Anatolij

Reviewed-by: Simon Glass sjg@chromium.org

Regards Devarsh

...

...

•           ho->xsize = priv->xsize;
  

•           ho->ysize = priv->ysize;
  

•           ho->line_length = priv->line_length;
  

•           ho->bpix = priv->bpix;
  

•   }
  

•   if (IS_ENABLED(CONFIG_VIDEO_COPY) && plat->copy_base)
            priv->copy_fb = map_sysmem(plat->copy_base, plat->size);
  
  

-- 2.34.1

Regards, Simon