[PATCH] firmware: ti_sci: fix the secure_hdr in do_xfer

Kamlesh Gurudasani kamlesh at ti.com
Wed Jan 24 12:12:12 CET 2024


Dhruva Gole <d-gole at ti.com> writes:

> The secure_hdr needs to be 0 init-ed however this was never being put
> into the secure_buf, leading to possibility of the first 4 bytes of
> secure_buf being possibly garbage.
>
> Fix this by initialising the secure_hdr itself to the secure_buf
> location, thus when we make it 0, it automatically ensures the first 4
> bytes are 0.
>
> Fixes: 32cd25128bd849 ("firmware: Add basic support for TI System Control Interface (TI SCI)")
> Signed-off-by: Dhruva Gole <d-gole at ti.com>
> ---
>
> Boot tested for sanity on AM62x SK
> https://gist.github.com/DhruvaG2000/724ceba3a0db03f4b0bff47de1160074
>
> Cc: Nishanth Menon <nm at ti.com>
> Cc: Tom Rini <trini at konsulko.com>
>
>  drivers/firmware/ti_sci.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
> index f5f659c11274..83ee8401a731 100644
> --- a/drivers/firmware/ti_sci.c
> +++ b/drivers/firmware/ti_sci.c
> @@ -236,13 +236,13 @@ static int ti_sci_do_xfer(struct ti_sci_info *info,
>  {
>  	struct k3_sec_proxy_msg *msg = &xfer->tx_message;
>  	u8 secure_buf[info->desc->max_msg_size];
> -	struct ti_sci_secure_msg_hdr secure_hdr;
> +	struct ti_sci_secure_msg_hdr *secure_hdr = (struct ti_sci_secure_msg_hdr *)secure_buf;
>  	int ret;
>  
>  	if (info->is_secure) {
>  		/* ToDo: get checksum of the entire message */
> -		secure_hdr.checksum = 0;
> -		secure_hdr.reserved = 0;
> +		secure_hdr->checksum = 0;
> +		secure_hdr->reserved = 0;
>  		memcpy(&secure_buf[sizeof(secure_hdr)],xfer->tx_message.buf,
secure_hdr is pointer now, the value may be same but (struct
ti_sci_secure_msg_hdr) would make more sense

Regards,
Kamlesh

>  		       xfer->tx_message.len);
>  
>
> base-commit: a1448e3cf9a0602d284566d6cacf60b96c3c1316
> -- 
> 2.34.1


More information about the U-Boot mailing list