Re: [PATCH 1/3] drm/amdkfd: Sync trap handler binary with source

[Lancelot SIX <Lancelot.Six@xxxxxxx>]

On 23/05/2024 15:08, Jay Cornwall wrote:
> Source and binary have become mismatched during branch activity.
>
> Signed-off-by: Jay Cornwall <jay.cornwall@xxxxxxx>
> Cc: Lancelot Six <lancelot.six@xxxxxxx>

Thanks for doing this.

This matches what I have when rebuilding the trap handlers.

Reviewed-by: Lancelot Six <lancelot.six@xxxxxxx>

> ---
>   .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h    | 57 ++++++++-----------
>   1 file changed, 24 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
> index 73d3772cdb76..11d076eb770c 100644
> --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
> +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
> @@ -718,12 +718,12 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
>   	0xf4051ebd, 0xfa000008,
>   	0xbf8cc07f, 0x87ee6e6e,
>   	0xbf840001, 0xbe80206e,
> -	0x876eff6d, 0x01ff0000,
> -	0xbf850005, 0x8878ff78,
> -	0x00002000, 0x80ec886c,
> -	0x82ed806d, 0xbf820005,
> -	0x876eff6d, 0x01000000,
> -	0xbf850002, 0x806c846c,
> +	0x876eff6d, 0x00ff0000,
> +	0xbf850008, 0x876eff6d,
> +	0x01000000, 0xbf850007,
> +	0x8878ff78, 0x00002000,
> +	0x80ec886c, 0x82ed806d,
> +	0xbf820002, 0x806c846c,
>   	0x826d806d, 0x876dff6d,
>   	0x0000ffff, 0x907a8977,
>   	0x877bff7a, 0x003f8000,
> @@ -1136,7 +1136,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
>   	0xe0704000, 0x705d0000,
>   	0x807c817c, 0x8070ff70,
>   	0x00000080, 0xbf0a7b7c,
> -	0xbf85fff8, 0xbf820144,
> +	0xbf85fff8, 0xbf82013e,
>   	0xbef4037e, 0x8775ff7f,
>   	0x0000ffff, 0x8875ff75,
>   	0x00040000, 0xbef60380,
> @@ -1276,10 +1276,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
>   	0x80788478, 0xbf8cc07f,
>   	0xb9eef815, 0xbefc036f,
>   	0xbefe0370, 0xbeff0371,
> -	0x876f7bff, 0x000003ff,
> -	0xb9ef4803, 0xb9f9f816,
> -	0x876f7bff, 0xfffff800,
> -	0x906f8b6f, 0xb9efa2c3,
> +	0xb9f9f816, 0xb9fbf803,
>   	0xb9f3f801, 0xb96e3a05,
>   	0x806e816e, 0xbf0d9972,
>   	0xbf850002, 0x8f6e896e,
> @@ -2309,12 +2306,12 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
>   	0xf4051ebd, 0xfa000008,
>   	0xbf8cc07f, 0x87ee6e6e,
>   	0xbf840001, 0xbe80206e,
> -	0x876eff6d, 0x01ff0000,
> -	0xbf850005, 0x8878ff78,
> -	0x00002000, 0x80ec886c,
> -	0x82ed806d, 0xbf820005,
> -	0x876eff6d, 0x01000000,
> -	0xbf850002, 0x806c846c,
> +	0x876eff6d, 0x00ff0000,
> +	0xbf850008, 0x876eff6d,
> +	0x01000000, 0xbf850007,
> +	0x8878ff78, 0x00002000,
> +	0x80ec886c, 0x82ed806d,
> +	0xbf820002, 0x806c846c,
>   	0x826d806d, 0x876dff6d,
>   	0x0000ffff, 0x87fe7e7e,
>   	0x87ea6a6a, 0xb9f8f802,
> @@ -2549,7 +2546,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
>   	0x705d0000, 0x807c817c,
>   	0x8070ff70, 0x00000080,
>   	0xbf0a7b7c, 0xbf85fff8,
> -	0xbf82013b, 0xbef4037e,
> +	0xbf820135, 0xbef4037e,
>   	0x8775ff7f, 0x0000ffff,
>   	0x8875ff75, 0x00040000,
>   	0xbef60380, 0xbef703ff,
> @@ -2688,10 +2685,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
>   	0xf0000000, 0x80788478,
>   	0xbf8cc07f, 0xb9eef815,
>   	0xbefc036f, 0xbefe0370,
> -	0xbeff0371, 0x876f7bff,
> -	0x000003ff, 0xb9ef4803,
> -	0x876f7bff, 0xfffff800,
> -	0x906f8b6f, 0xb9efa2c3,
> +	0xbeff0371, 0xb9fbf803,
>   	0xb9f3f801, 0xb96e3a05,
>   	0x806e816e, 0xbf0d9972,
>   	0xbf850002, 0x8f6e896e,
> @@ -2749,11 +2743,11 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
>   	0xf8000008, 0xbf89fc07,
>   	0x8bee6e6e, 0xbfa10001,
>   	0xbe80486e, 0x8b6eff6d,
> -	0x01ff0000, 0xbfa20005,
> -	0x8c78ff78, 0x00002000,
> -	0x80ec886c, 0x82ed806d,
> -	0xbfa00005, 0x8b6eff6d,
> -	0x01000000, 0xbfa20002,
> +	0x00ff0000, 0xbfa20008,
> +	0x8b6eff6d, 0x01000000,
> +	0xbfa20007, 0x8c78ff78,
> +	0x00002000, 0x80ec886c,
> +	0x82ed806d, 0xbfa00002,
>   	0x806c846c, 0x826d806d,
>   	0x8b6dff6d, 0x0000ffff,
>   	0x8bfe7e7e, 0x8bea6a6a,
> @@ -2988,7 +2982,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
>   	0x701d0000, 0x807d817d,
>   	0x8070ff70, 0x00000080,
>   	0xbf0a7b7d, 0xbfa2fff8,
> -	0xbfa00146, 0xbef4007e,
> +	0xbfa00140, 0xbef4007e,
>   	0x8b75ff7f, 0x0000ffff,
>   	0x8c75ff75, 0x00040000,
>   	0xbef60080, 0xbef700ff,
> @@ -3130,10 +3124,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
>   	0xf0000000, 0x80788478,
>   	0xbf89fc07, 0xb96ef815,
>   	0xbefd006f, 0xbefe0070,
> -	0xbeff0071, 0x8b6f7bff,
> -	0x000003ff, 0xb96f4803,
> -	0x8b6f7bff, 0xfffff800,
> -	0x856f8b6f, 0xb96fa2c3,
> +	0xbeff0071, 0xb97bf803,
>   	0xb973f801, 0xb8ee3b05,
>   	0x806e816e, 0xbf0d9972,
>   	0xbfa20002, 0x846e896e,
> @@ -4119,7 +4110,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
>   	0x8b6dff6d, 0x0000ffff,
>   	0x8bfe7e7e, 0x8bea6a6a,
>   	0xb97af804, 0xbe804a6c,
> -	0xbfb00000, 0xbf9f0000,
> +	0xbfb10000, 0xbf9f0000,
>   	0xbf9f0000, 0xbf9f0000,
>   	0xbf9f0000, 0xbf9f0000,
>   };