Move video memory reservation for SPL to the
Subsystems (3)
v2 cover Move video memory reservation for SPL to the
Move video memory reservation for SPL at end of RAM so that it does not interefere with reservations for next stage so that the next stage need not have holes in between for passed regions and instead it can maintain continuity in reservations.
Also catch the bloblist before starting reservations to avoid the same problem.
While at it, also fill missing fields in video handoff struct before passing it to next stage.
This is as per discussions at :
For moving SPL framebuffer reservation at end of RAM:
https://lore.kernel.org/all/CAPnjgZ3xSoe_G3yrqwuAvoiVjUfZ+YQgkOR0ZTVXGT9VK8TwJg@mail.gmail.com/
For filling missing video handoff fields :
https://lore.kernel.org/all/CAPnjgZ1Hs0rNf0JDirp6YPsOQ5=QqQSP9g9qRwLoOASUV8a4cw@mail.gmail.com/
Changelog (w.r.t previous RFC series that was sent before):
V2:
- Make a generic function to reserve video memory at SPL stage
- Add debug prints while skipping framebuffer allocation at uboot
- Correct commenting style as suggested
Previous RFC series:
https://lore.kernel.org/all/[email protected]/
Test logs (at tip of U-Boot 2024.01-rc1+ this series (with debugs)):
https://gist.github.com/devarsht/43dbcc02c585a0b18f8f99e910bf5ef9
Devarsh Thakkar (5):
arm: mach-k3: common: Reserve video memory from end of the RAM
board: ti: am62x: evm: Remove video_setup from spl_board_init common/board_f: Catch bloblist before starting resevations
video: Skip framebuffer reservation if already reserved
video: Fill video handoff in video post probe
arch/arm/mach-k3/common.c | 2 ++ board/ti/am62x/evm.c | 18 ------------------ common/board_f.c | 33 +++++++++++++++++++++++++++++--- common/spl/spl.c | 19 ++++++++++++++++++ drivers/video/video-uclass.c | 37 ++++++++++++++++++++++++++---------- include/spl.h | 4 ++++ 6 files changed, 82 insertions(+), 31 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/5 arm: mach-k3: common: Reserve video memory from end of the RAM
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.
---
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.
--- arch/arm/mach-k3/common.c | 2 ++ common/spl/spl.c | 19 +++++++++++++++++++ include/spl.h | 4 ++++ 3 files changed, 25 insertions(+)
arch/arm/mach-k3/common.c +2 -0
@@ -537,6 +537,8 @@ void spl_enable_dcache(void)if (ram_top >=0x100000000 ) ram_top = (phys_addr_t )0x100000000 ; + gd->relocaddr = ram_top; +spl_reserve_video (); gd->arch.tlb_addr = ram_top - gd->arch.tlb_size; gd->arch.tlb_addr &= ~(0x10000 -1 ); debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,
common/spl/spl.c +19 -0
@@ -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,24 @@ void spl_fixup_fdt(void *fdt_blob)#endif } +int spl_reserve_video (void ) +{ +if (CONFIG_IS_ENABLED (VIDEO )) { +ulong addr; +int ret; + + addr = gd->relocaddr; + 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 ))
include/spl.h +4 -0
@@ -825,6 +825,10 @@ 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() - Reserve video and update relocation address +*/ +int spl_reserve_video (void );/** * spl_invoke_atf - boot using an ARM trusted firmware image
Signature · 1 line
2.34.1
PATCH v2 2/5 board: ti: am62x: evm: Remove video_setup from spl_board_init
In reply to Devarsh ThakkarRemove video_setup from evm_init sequence since video memory is getting called at an earlier place to make sure video memory is reserved at the end of RAM.
---
V2: No change
--- board/ti/am62x/evm.c | 18 ------------------ 1 file changed, 18 deletions(-)
board/ti/am62x/evm.c +0 -18
@@ -60,27 +60,9 @@ int dram_init_banksize(void) }#if defined(CONFIG_SPL_BUILD ) -static int video_setup (void ) -{ -if (CONFIG_IS_ENABLED (VIDEO )) { -ulong addr; -int ret; - - addr = gd->relocaddr; - 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 ; -}void spl_board_init (void ) { -video_setup ();enable_caches ();if (IS_ENABLED (CONFIG_SPL_SPLASH_SCREEN ) &&IS_ENABLED (CONFIG_SPL_BMP ))splash_display ();
Signature · 1 line
2.34.1
PATCH v2 3/5 common/board_f: Catch bloblist before starting resevations
In reply to Devarsh ThakkarStart 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.
---
V2: Fix typo in commit title and checkpatch warnings/checks
--- common/board_f.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)
common/board_f.c +30 -3
@@ -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,
Signature · 1 line
2.34.1
PATCH v2 4/5 video: Skip framebuffer reservation if already reserved
In reply to Devarsh ThakkarSkip framebufer reservation if it was already reserved from previous stage and whose information was passed using a bloblist.
---
V2:
- Add debug prints
- Fix commenting style
--- drivers/video/video-uclass.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/video/video-uclass.c +12 -0
@@ -123,6 +123,18 @@ 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) { +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;
Signature · 1 line
2.34.1
PATCH v2 5/5 video: Fill video handoff in video post probe
In reply to Devarsh ThakkarFill 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 framework expects them to be filled for some of the functionalities.
---
V2: No change
--- drivers/video/video-uclass.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/video/video-uclass.c +15 -10
@@ -153,16 +153,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 ; }
@@ -558,6 +548,21 @@ 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 */ +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; + 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);
Signature · 1 line
2.34.1
Re: [PATCH v2 1/5] arm: mach-k3: common: Reserve video memory from end of the RAM
In reply to Devarsh ThakkarHi Devarsh,
Quoted 36 lines · Devarsh Thakkar
Add function
spl_reserve_videowhich is a wrapper aroundvideo_reserveto 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 <[email protected]>Signed-off-by Devarsh Thakkar <[email protected]>---
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.--- arch/arm/mach-k3/common.c | 2 ++ common/spl/spl.c | 19 +++++++++++++++++++ include/spl.h | 4 ++++ 3 files changed, 25 insertions(+)arch/arm/mach-k3/common.c +0
-0
arch/arm/mach-k3/common.c void spl_enable_dcache(void) · line 541
Quoted 5 lines
arch/arm/mach-k3/common.c +2
-0@@ -537,6 +537,8 @@ void spl_enable_dcache(void)if (ram_top >=0x100000000 ) ram_top = (phys_addr_t )0x100000000 ; + gd->relocaddr = ram_top; +spl_reserve_video ();
Need to check error here
Quoted 45 lines
arch/arm/mach-k3/common.c +0
-0gd->arch.tlb_addr = ram_top - gd->arch.tlb_size; gd->arch.tlb_addr &= ~(0x10000 -1 ); debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,common/spl/spl.c +19
-0@@ -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,24 @@ void spl_fixup_fdt(void *fdt_blob)#endif } +int spl_reserve_video (void ) +{ +if (CONFIG_IS_ENABLED (VIDEO )) { +ulong addr; +int ret; + + addr = gd->relocaddr; + 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 ))include/spl.h +0
-0
include/spl.h int spl_usb_load(struct spl_image_info *spl_image, · line 829
Quoted 5 lines
include/spl.h +2
-0@@ -825,6 +825,10 @@ 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() - Reserve video and update relocation address
This needs more detail about:
- gd->relocaddr
- where the video memory is allocated
- where the allocation is stored (in the video-device plat?)
- return value
Quoted 8 lines
include/spl.h +2
-1+*/ +int spl_reserve_video (void );/** * spl_invoke_atf - boot using an ARM trusted firmware image -- 2.34.1
Regards,
Simon
Re: [PATCH v2 4/5] video: Skip framebuffer reservation if already reserved
In reply to Devarsh ThakkarQuoted 20 lines · Devarsh Thakkar
Skip framebufer reservation if it was already reserved from previous stage and whose information was passed using a bloblist.
Signed-off-by Devarsh Thakkar <[email protected]>Reviewed-by Simon Glass <[email protected]>---
V2:
- Add debug prints
- Fix commenting style--- drivers/video/video-uclass.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/video/video-uclass.c +0
-0
drivers/video/video-uclass.c int video_reserve(ulong *addrp) · line 127
Quoted 5 lines
drivers/video/video-uclass.c +2
-0@@ -123,6 +123,18 @@ 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
comment style
/*
* Skip ...
Quoted 14 lines
drivers/video/video-uclass.c +10
-1+* filled below fields +*/ +if (gd->fb_base && gd->video_top && gd->video_bottom) { +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; --
Quoted 2 lines
2.34.1
Regards,
Simon
Re: [PATCH v2 5/5] video: Fill video handoff in video post probe
In reply to Devarsh ThakkarHi Devarsh,
Quoted 3 lines · Devarsh Thakkar
Fill video handoff fields in
video_post_probeas at this point we have full framebuffer related
framebuffer-related
Quoted 4 lines
information.
Also fill all the fields available in video hand-off struct as those were missing earlier and u-boot
U-Boot
Quoted 17 lines
framework expects them to be filled for some of the functionalities.
Reported-by Simon Glass <[email protected]>Signed-off-by Devarsh Thakkar <[email protected]>---
V2: No change--- drivers/video/video-uclass.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)drivers/video/video-uclass.c +0
-0@@ -153,16 +153,6 @@ int video_reserve(ulong *addrp) debug("Video frame buffers from %lx to %lx\n", gd->video_bottom,
drivers/video/video-uclass.c int video_reserve(ulong *addrp) · line 163
Quoted 10 lines
drivers/video/video-uclass.c +0
-8gd->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;
You also need to fill out the other fields in there:
struct video_handoff {
u64 fb;
u32 size;
u16 xsize;
u16 ysize;
u32 line_length;
u8 bpix;
};
Quoted 7 lines
drivers/video/video-uclass.c +0
-2- } -return 0 ; }@@ -558,6 +548,21 @@ static int video_post_probe(struct udevice *dev)
drivers/video/video-uclass.c static int video_post_probe(struct udevice *dev) · line 558
Quoted 10 lines
drivers/video/video-uclass.c +8
-0priv->fb_size = priv->line_length * priv->ysize; +/* Set up video handoff fields for passing video blob to next stage */ +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;
This is a bit odd, since it assumes there is a single video framebuffer. I suppose that is normally the case, but please add a comment saying that only one is supported.
Quoted 11 lines
drivers/video/video-uclass.c +7
-1+ ho->size = gd->video_top - gd->video_bottom; + 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); --
Quoted 2 lines
2.34.1
Please can you add some documentation to doc/develop/spl.rst or similar?
Regards,
Simon
Re: [PATCH v2 3/5] common/board_f: Catch bloblist before starting resevations
In reply to Devarsh ThakkarHi Devarsh,
Quoted 72 lines · Devarsh Thakkar
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 <[email protected]>---
V2: Fix typo in commit title and checkpatch warnings/checks--- common/board_f.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)common/board_f.c +29
-3@@ -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;
common/board_f.c static const init_fnc_t init_sequence_f[] = { · line 954
Quoted 6 lines
common/board_f.c +1
-0@@ -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,
But you have renamed this function, so how does this commit build?
buildman -b <branch> --board sandbox_spl
might help?
Quoted 4 lines
common/board_f.c +0
-1reserve_trace, --2.34.1
Regards,
Simon
Re: [PATCH v2 1/5] arm: mach-k3: common: Reserve video memory from end of the RAM
In reply to Simon GlassHi Simon,
Thanks for the review.
Quoted 42 lines · Simon Glass
Hi Devarsh,
Quoted 39 lines · Devarsh Thakkar
Add function
spl_reserve_videowhich is a wrapper aroundvideo_reserveto 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 <[email protected]>Signed-off-by Devarsh Thakkar <[email protected]>---
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.--- arch/arm/mach-k3/common.c | 2 ++ common/spl/spl.c | 19 +++++++++++++++++++ include/spl.h | 4 ++++ 3 files changed, 25 insertions(+)arch/arm/mach-k3/common.c +0
-0@@ -537,6 +537,8 @@ void spl_enable_dcache(void)if (ram_top >=0x100000000 ) ram_top = (phys_addr_t )0x100000000 ;
Quoted 5 lines
arch/arm/mach-k3/common.c void spl_enable_dcache(void) · line 541
Quoted 2 lines
arch/arm/mach-k3/common.c +2
-0+ gd->relocaddr = ram_top; +spl_reserve_video ();Need to check error here
Ok, I can check for error and print a message, but would still proceed with build (similar to reserve_video in u-boot proper (from which this is derived)), I hope that is fine.
Quoted 46 lines
Quoted 46 lines
arch/arm/mach-k3/common.c +0
-0gd->arch.tlb_addr = ram_top - gd->arch.tlb_size; gd->arch.tlb_addr &= ~(0x10000 -1 ); debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,common/spl/spl.c +19
-0@@ -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,24 @@ void spl_fixup_fdt(void *fdt_blob)#endif } +int spl_reserve_video (void ) +{ +if (CONFIG_IS_ENABLED (VIDEO )) { +ulong addr; +int ret; + + addr = gd->relocaddr; + 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 ))include/spl.h +0
-0@@ -825,6 +825,10 @@ int spl_usb_load(struct spl_image_info *spl_image,
Quoted 7 lines
include/spl.h int spl_usb_load(struct spl_image_info *spl_image, · line 829
Quoted 4 lines
include/spl.h +2
-0int spl_ymodem_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev); +/** +* spl_reserve_video() - Reserve video and update relocation address This needs more detail about:
-gd->relocaddr
Points to current relocation address which points to region below reserved area ?
Quoted 1 line
- where the video memory is allocated
I didn't get you, allocation is stored in RAM, is that what you mean ?
Quoted 4 lines
- where the allocation is stored (in the video-device plat?)ok
- return value
Just a point of note, this spl_reserve_video is inspired by reserve_video from u-boot proper and we are essentially leaving upto users to follow the "guideline" to reserve video from RAM by setting gd->relocaddr to end of RAM before calling to function.
But if we want to directly enforce the guideline, I can move that logic inside this API and we can have spl_reserve_video_from_ramtop, let me know your opinion on this if we want to go this way.
Regards
Devarsh
Quoted 11 lines
Quoted 8 lines
include/spl.h +2
-1+*/ +int spl_reserve_video (void );/** * spl_invoke_atf - boot using an ARM trusted firmware image -- 2.34.1
Regards,
Simon
Re: [PATCH v2 3/5] common/board_f: Catch bloblist before starting resevations
In reply to Simon GlassHi Simon,
Thanks for the review.
Quoted 61 lines · Simon Glass
Hi Devarsh,
Quoted 58 lines · Devarsh Thakkar
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 <[email protected]>---
V2: Fix typo in commit title and checkpatch warnings/checks--- common/board_f.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-)common/board_f.c +19
-3@@ -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. +*/
Quoted 8 lines
common/board_f.c static int reserve_video(void) · line 440
Quoted 8 lines
common/board_f.c +8
-0+static int setup_relocaddr_from_bloblist (void ) +{ +reserve_video_from_videoblob (); + +return 0 ; +} + +static int reserve_video (void )
[1] Here.
Quoted 5 lines
Quoted 5 lines
common/board_f.c +2
-0+{ +if (CONFIG_IS_ENABLED (VIDEO )) {ulong addr;int ret;
Quoted 10 lines
common/board_f.c static const init_fnc_t init_sequence_f[] = { · line 954
Quoted 7 lines
common/board_f.c +1
-0@@ -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,But you have renamed this function, so how does this commit build?
Sorry I didn't get you, maybe the diff is creating an illusion, this is a new function to reserve from bloblist and a wrapper around reserve_video_from_bloblist. I created the wrapper so that in future if any new blobs are getting passed they can be added inside this (they need to be after video region which is from end of ram) and relocaddr adjusted accordingly before proceeding with uboot proper reservations. This is inline with our strategy to have SPL regions reserved from end of RAM so that uboot starts reserving right after them.
The existing function to reserve_video is still there [1]
Quoted 2 lines
buildman -b <branch> --board
sandbox_spl
I remember testing this with make and also testing the functionality part of it, will try check with this command too.
Regards
Devarsh
Quoted 9 lines
might help?
Quoted 4 lines
common/board_f.c +0
-1reserve_trace, --2.34.1
Regards,
Simon
Re: [PATCH v2 4/5] video: Skip framebuffer reservation if already reserved
In reply to Simon GlassHi Simon,
Thanks for the review.
Quoted 24 lines · Simon Glass
Quoted 23 lines · Devarsh Thakkar
Skip framebufer reservation if it was already reserved from previous stage and whose information was passed using a bloblist.
Signed-off-by Devarsh Thakkar <[email protected]>Reviewed-by Simon Glass <[email protected]>---
V2:
- Add debug prints
- Fix commenting style--- drivers/video/video-uclass.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/video/video-uclass.c +0
-0@@ -123,6 +123,18 @@ int video_reserve(ulong *addrp)struct udevice *dev;ulong size;
Quoted 7 lines
drivers/video/video-uclass.c int video_reserve(ulong *addrp) · line 127
Quoted 2 lines
drivers/video/video-uclass.c +2
-0+if (IS_ENABLED (CONFIG_SPL_VIDEO_HANDOFF ) &&spl_phase () >PHASE_SPL ) { +/* Skip allocation if already received a bloblist which comment style
/*
* Skip ...
Oops, thanks for the nitpick, will correct this, I wonder why checkpatch didn't catch this :)
Regards
Devarsh
Quoted 20 lines
Quoted 15 lines
drivers/video/video-uclass.c +10
-1+* filled below fields +*/ +if (gd->fb_base && gd->video_top && gd->video_bottom) { +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; --Quoted 2 lines
2.34.1
Regards,
Simon
Re: [PATCH v2 1/5] arm: mach-k3: common: Reserve video memory from end of the RAM
In reply to Devarsh ThakkarHi Devarsh,
Quoted 54 lines · Devarsh Thakkar
Hi Simon,
Thanks for the review.
Quoted 42 lines · Simon Glass
Hi Devarsh,
Quoted 39 lines · Devarsh Thakkar
Add function
spl_reserve_videowhich is a wrapper aroundvideo_reserveto 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 <[email protected]>Signed-off-by Devarsh Thakkar <[email protected]>---
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.--- arch/arm/mach-k3/common.c | 2 ++ common/spl/spl.c | 19 +++++++++++++++++++ include/spl.h | 4 ++++ 3 files changed, 25 insertions(+)arch/arm/mach-k3/common.c +0
-0@@ -537,6 +537,8 @@ void spl_enable_dcache(void)if (ram_top >=0x100000000 ) ram_top = (phys_addr_t )0x100000000 ;Quoted 5 lines
arch/arm/mach-k3/common.c void spl_enable_dcache(void) · line 541
Quoted 2 lines
arch/arm/mach-k3/common.c +2
-0+ gd->relocaddr = ram_top; +spl_reserve_video ();Need to check error here
Quoted 3 lines
Ok, I can check for error and print a message, but would still proceed with build (similar to
reserve_videoin u-boot proper (from which this is derived)), I hope that is fine.
No, we need to fail if something is wrong.
Quoted 55 lines
Quoted 47 lines
Quoted 47 lines
arch/arm/mach-k3/common.c +0
-0gd->arch.tlb_addr = ram_top - gd->arch.tlb_size; gd->arch.tlb_addr &= ~(0x10000 -1 ); debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,common/spl/spl.c +19
-0@@ -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,24 @@ void spl_fixup_fdt(void *fdt_blob)#endif } +int spl_reserve_video (void ) +{ +if (CONFIG_IS_ENABLED (VIDEO )) { +ulong addr; +int ret; + + addr = gd->relocaddr; + 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 ))include/spl.h +0
-0@@ -825,6 +825,10 @@ int spl_usb_load(struct spl_image_info *spl_image,Quoted 7 lines
include/spl.h int spl_usb_load(struct spl_image_info *spl_image, · line 829
Quoted 4 lines
include/spl.h +2
-0int spl_ymodem_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev); +/** +* spl_reserve_video() - Reserve video and update relocation address This needs more detail about:
-gd->relocaddr
Quoted 5 lines
Points to current relocation address which points to region below reserved area ?
Quoted 1 line
- where the video memory is allocated
I didn't get you, allocation is stored in RAM, is that what you mean ?
Yes, but specifically at the top of RAM, I believe?
Quoted 6 lines
Quoted 5 lines
- where the allocation is stored (in the video-device plat?)ok
- return value
Quoted 8 lines
Just a point of note, this
spl_reserve_videois inspired byreserve_videofrom u-boot proper and we are essentially leaving upto users to follow the "guideline" to reserve video from RAM by settinggd->relocaddrto end of RAM before calling to function.But if we want to directly enforce the guideline, I can move that logic inside this API and we can have
spl_reserve_video_from_ramtop, let me know your opinion on this if we want to go this way.
That seems OK to me, so far as I understand what you are saying.
[..]
Regards,
Simon
Re: [PATCH v2 1/5] arm: mach-k3: common: Reserve video memory from end of the RAM
Hi Simon,
Thanks for the review.
Quoted 57 lines · Simon Glass
Hi Devarsh,
Quoted 54 lines · Devarsh Thakkar
Hi Simon,
Thanks for the review.
Quoted 47 lines · Simon Glass
Hi Devarsh,
Quoted 36 lines · Devarsh Thakkar
Add function
spl_reserve_videowhich is a wrapper aroundvideo_reserveto 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 <[email protected]>Signed-off-by Devarsh Thakkar <[email protected]>---
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.--- arch/arm/mach-k3/common.c | 2 ++ common/spl/spl.c | 19 +++++++++++++++++++ include/spl.h | 4 ++++ 3 files changed, 25 insertions(+)arch/arm/mach-k3/common.c +0
-0arch/arm/mach-k3/common.c void spl_enable_dcache(void) · line 541
Quoted 5 lines
arch/arm/mach-k3/common.c +2
-0@@ -537,6 +537,8 @@ void spl_enable_dcache(void)if (ram_top >=0x100000000 ) ram_top = (phys_addr_t )0x100000000 ; + gd->relocaddr = ram_top; +spl_reserve_video ();Need to check error here
Quoted 6 lines
Quoted 3 lines
Ok, I can check for error and print a message, but would still proceed with build (similar to
reserve_videoin u-boot proper (from which this is derived)), I hope that is fine.No, we need to fail if something is wrong.
Yes the caller of the function is having void return value so can't propagate it but I can still do a exit or hang. But besides this the API as such returns the success/failure and it is left upto user to decide. As the user in this case is TI (mack-k3) the previous behavior was preserved where it proceed with boot on video reservation failure, I guess I will check again with more folks here at TI and based on that take a decision.
Quoted 74 lines
Quoted 55 lines
Quoted 47 lines
Quoted 47 lines
arch/arm/mach-k3/common.c +0
-0gd->arch.tlb_addr = ram_top - gd->arch.tlb_size; gd->arch.tlb_addr &= ~(0x10000 -1 ); debug("TLB table from %08lx to %08lx\n", gd->arch.tlb_addr,common/spl/spl.c +19
-0@@ -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,24 @@ void spl_fixup_fdt(void *fdt_blob)#endif } +int spl_reserve_video (void ) +{ +if (CONFIG_IS_ENABLED (VIDEO )) { +ulong addr; +int ret; + + addr = gd->relocaddr; + 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 ))include/spl.h +0
-0@@ -825,6 +825,10 @@ int spl_usb_load(struct spl_image_info *spl_image,Quoted 7 lines
include/spl.h int spl_usb_load(struct spl_image_info *spl_image, · line 829
Quoted 4 lines
include/spl.h +2
-0int spl_ymodem_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev); +/** +* spl_reserve_video() - Reserve video and update relocation address This needs more detail about:
-gd->relocaddrQuoted 5 lines
Points to current relocation address which points to region below reserved area ?
Quoted 1 line
- where the video memory is allocated
I didn't get you, allocation is stored in RAM, is that what you mean ?
Yes, but specifically at the top of RAM, I believe?
Quoted 11 lines
Quoted 5 lines
- where the allocation is stored (in the video-device plat?)ok
- return value
Just a point of note, this
spl_reserve_videois inspired byreserve_videofrom u-boot proper and we are essentially leaving upto users to follow the "guideline" to reserve video from RAM by settinggd->relocaddrto end of RAM before calling to function.
Quoted 6 lines
Quoted 3 lines
But if we want to directly enforce the guideline, I can move that logic inside this API and we can have
spl_reserve_video_from_ramtop, let me know your opinion on this if we want to go this way.That seems OK to me, so far as I understand what you are saying.
Ok, will make it spl_video_reserve_from_ram_top, thanks!.
Regards
Devarsh
Quoted 4 lines
[..]
Regards,
Simon