Skip to content

L
linux
Commit fda812eb authored by Jay Cornwall's avatar Jay Cornwall Committed by Alex Deucher
Browse files
Options

drm/amdkfd: gfx12 context save/restore trap handler fixes 

Fix LDS size interpretation: 512 bytes (>= gfx12) vs 256 (< gfx12).

Ensure STATE_PRIV.BARRIER_COMPLETE cannot change after reading or
before writing. Other waves in the threadgroup may cause this field
to assert if they complete the barrier.

Do not overwrite EXCP_FLAG_PRIV.{SAVE_CONTEXT,HOST_TRAP} when
restoring this register. Both of these fields can assert while the
wavefront is running the trap handler.
Signed-off-by: default avatarJay Cornwall <jay.cornwall@amd.com>
Reviewed-by: default avatarLancelot Six <lancelot.six@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 813e7d4c
Show whitespace changes
Inline Side-by-side
Showing with 639 additions and 607 deletions
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
View file @ fda812eb
...@@ -678,7 +678,7 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { ...@@ -678,7 +678,7 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {
}; };
static const uint32_t cwsr_trap_nv1x_hex[] = { static const uint32_t cwsr_trap_nv1x_hex[] = {
0xbf820001, 0xbf820394, 0xbf820001, 0xbf820393,
0xb0804004, 0xb978f802, 0xb0804004, 0xb978f802,
0x8a78ff78, 0x00020006, 0x8a78ff78, 0x00020006,
0xb97bf803, 0x876eff78, 0xb97bf803, 0x876eff78,
...@@ -932,23 +932,48 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -932,23 +932,48 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0xbf850002, 0xbeff0380, 0xbf850002, 0xbeff0380,
0xbf820001, 0xbeff03c1, 0xbf820001, 0xbeff03c1,
0xb97b4306, 0x877bc17b, 0xb97b4306, 0x877bc17b,
0xbf840086, 0xbf8a0000, 0xbf840085, 0xbf8a0000,
0x877aff6d, 0x80000000, 0x877aff6d, 0x80000000,
0xbf840082, 0x8f7b867b, 0xbf840081, 0x8f7b887b,
0x8f7b827b, 0xbef6037b, 0xbef6037b, 0xb9703a05,
0xb9703a05, 0x80708170, 0x80708170, 0xbf0d9973,
0xbf0d9973, 0xbf850002, 0xbf850002, 0x8f708970,
0x8f708970, 0xbf820001, 0xbf820001, 0x8f708a70,
0x8f708a70, 0xb97a1e06, 0xb97a1e06, 0x8f7a8a7a,
0x8f7a8a7a, 0x80707a70, 0x80707a70, 0x8070ff70,
0x8070ff70, 0x00000200, 0x00000200, 0x8070ff70,
0x8070ff70, 0x00000080, 0x00000080, 0xbef603ff,
0xbef603ff, 0x01000000, 0x01000000, 0xd7650000,
0xd7650000, 0x000100c1, 0x000100c1, 0xd7660000,
0xd7660000, 0x000200c1, 0x000200c1, 0x16000084,
0x16000084, 0x907c9973, 0x907c9973, 0x877c817c,
0x877c817c, 0xbf06817c, 0xbf06817c, 0xbefc0380,
0xbefc0380, 0xbf850033, 0xbf850033, 0xb97af803,
0x8a7a7aff, 0x10000000,
0xbf85001d, 0xd8d80000,
0x01000000, 0xbf8c0000,
0xbe840380, 0xd7600000,
0x00000901, 0x80048104,
0xd7600001, 0x00000901,
0x80048104, 0xd7600002,
0x00000901, 0x80048104,
0xd7600003, 0x00000901,
0x80048104, 0xf469003a,
0xe0000000, 0x80709070,
0xbf06a004, 0xbf84ffef,
0x807cff7c, 0x00000080,
0xd5250000, 0x0001ff00,
0x00000080, 0xbf0a7b7c,
0xbf85ffe4, 0xbf820044,
0xbe8303ff, 0x00000080,
0xbf800000, 0xbf800000,
0xbf800000, 0xd8d80000,
0x01000000, 0xbf8c0000,
0xe0704000, 0x705d0100,
0x807c037c, 0x80700370,
0xd5250000, 0x0001ff00,
0x00000080, 0xbf0a7b7c,
0xbf85fff4, 0xbf820032,
0xb97af803, 0x8a7a7aff, 0xb97af803, 0x8a7a7aff,
0x10000000, 0xbf85001d, 0x10000000, 0xbf85001d,
0xd8d80000, 0x01000000, 0xd8d80000, 0x01000000,
...@@ -960,24 +985,45 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -960,24 +985,45 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0x80048104, 0xd7600003, 0x80048104, 0xd7600003,
0x00000901, 0x80048104, 0x00000901, 0x80048104,
0xf469003a, 0xe0000000, 0xf469003a, 0xe0000000,
0x80709070, 0xbf06a004, 0x80709070, 0xbf06c004,
0xbf84ffef, 0x807cff7c, 0xbf84ffef, 0x807cff7c,
0x00000080, 0xd5250000, 0x00000100, 0xd5250000,
0x0001ff00, 0x00000080, 0x0001ff00, 0x00000100,
0xbf0a7b7c, 0xbf85ffe4, 0xbf0a7b7c, 0xbf85ffe4,
0xbf820044, 0xbe8303ff, 0xbf820011, 0xbe8303ff,
0x00000080, 0xbf800000, 0x00000100, 0xbf800000,
0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000,
0xd8d80000, 0x01000000, 0xd8d80000, 0x01000000,
0xbf8c0000, 0xe0704000, 0xbf8c0000, 0xe0704000,
0x705d0100, 0x807c037c, 0x705d0100, 0x807c037c,
0x80700370, 0xd5250000, 0x80700370, 0xd5250000,
0x0001ff00, 0x00000080, 0x0001ff00, 0x00000100,
0xbf0a7b7c, 0xbf85fff4, 0xbf0a7b7c, 0xbf85fff4,
0xbf820032, 0xb97af803, 0xbefe03c1, 0x907c9973,
0x8a7a7aff, 0x10000000, 0x877c817c, 0xbf06817c,
0xbf85001d, 0xd8d80000, 0xbf850004, 0xbef003ff,
0x01000000, 0xbf8c0000, 0x00000200, 0xbeff0380,
0xbf820003, 0xbef003ff,
0x00000400, 0xbeff03c1,
0xb97b3a05, 0x807b817b,
0x8f7b827b, 0x907c9973,
0x877c817c, 0xbf06817c,
0xbf85006b, 0xbef603ff,
0x01000000, 0xbefc0384,
0xbf0a7b7c, 0xbf8400fa,
0xb97af803, 0x8a7a7aff,
0x10000000, 0xbf850050,
0x7e008700, 0x7e028701,
0x7e048702, 0x7e068703,
0xbe840380, 0xd7600000,
0x00000900, 0x80048104,
0xd7600001, 0x00000900,
0x80048104, 0xd7600002,
0x00000900, 0x80048104,
0xd7600003, 0x00000900,
0x80048104, 0xf469003a,
0xe0000000, 0x80709070,
0xbf06a004, 0xbf84ffef,
0xbe840380, 0xd7600000, 0xbe840380, 0xd7600000,
0x00000901, 0x80048104, 0x00000901, 0x80048104,
0xd7600001, 0x00000901, 0xd7600001, 0x00000901,
...@@ -986,32 +1032,39 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -986,32 +1032,39 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0xd7600003, 0x00000901, 0xd7600003, 0x00000901,
0x80048104, 0xf469003a, 0x80048104, 0xf469003a,
0xe0000000, 0x80709070, 0xe0000000, 0x80709070,
0xbf06c004, 0xbf84ffef, 0xbf06a004, 0xbf84ffef,
0x807cff7c, 0x00000100, 0xbe840380, 0xd7600000,
0xd5250000, 0x0001ff00, 0x00000902, 0x80048104,
0x00000100, 0xbf0a7b7c, 0xd7600001, 0x00000902,
0xbf85ffe4, 0xbf820011, 0x80048104, 0xd7600002,
0xbe8303ff, 0x00000100, 0x00000902, 0x80048104,
0xbf800000, 0xbf800000, 0xd7600003, 0x00000902,
0xbf800000, 0xd8d80000, 0x80048104, 0xf469003a,
0x01000000, 0xbf8c0000, 0xe0000000, 0x80709070,
0xe0704000, 0x705d0100, 0xbf06a004, 0xbf84ffef,
0x807c037c, 0x80700370, 0xbe840380, 0xd7600000,
0xd5250000, 0x0001ff00, 0x00000903, 0x80048104,
0x00000100, 0xbf0a7b7c, 0xd7600001, 0x00000903,
0xbf85fff4, 0xbefe03c1, 0x80048104, 0xd7600002,
0x907c9973, 0x877c817c, 0x00000903, 0x80048104,
0xbf06817c, 0xbf850004, 0xd7600003, 0x00000903,
0xbef003ff, 0x00000200, 0x80048104, 0xf469003a,
0xbeff0380, 0xbf820003, 0xe0000000, 0x80709070,
0xbef003ff, 0x00000400, 0xbf06a004, 0xbf84ffef,
0xbeff03c1, 0xb97b3a05, 0x807c847c, 0xbf0a7b7c,
0x807b817b, 0x8f7b827b, 0xbf85ffb1, 0xbf8200a6,
0x907c9973, 0x877c817c, 0x7e008700, 0x7e028701,
0xbf06817c, 0xbf85006b, 0x7e048702, 0x7e068703,
0xe0704000, 0x705d0000,
0xe0704080, 0x705d0100,
0xe0704100, 0x705d0200,
0xe0704180, 0x705d0300,
0x807c847c, 0x8070ff70,
0x00000200, 0xbf0a7b7c,
0xbf85ffef, 0xbf820094,
0xbef603ff, 0x01000000, 0xbef603ff, 0x01000000,
0xbefc0384, 0xbf0a7b7c, 0xbefc0384, 0xbf0a7b7c,
0xbf8400fa, 0xb97af803, 0xbf840065, 0xb97af803,
0x8a7a7aff, 0x10000000, 0x8a7a7aff, 0x10000000,
0xbf850050, 0x7e008700, 0xbf850050, 0x7e008700,
0x7e028701, 0x7e048702, 0x7e028701, 0x7e048702,
...@@ -1023,7 +1076,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -1023,7 +1076,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0x80048104, 0xd7600003, 0x80048104, 0xd7600003,
0x00000900, 0x80048104, 0x00000900, 0x80048104,
0xf469003a, 0xe0000000, 0xf469003a, 0xe0000000,
0x80709070, 0xbf06a004, 0x80709070, 0xbf06c004,
0xbf84ffef, 0xbe840380, 0xbf84ffef, 0xbe840380,
0xd7600000, 0x00000901, 0xd7600000, 0x00000901,
0x80048104, 0xd7600001, 0x80048104, 0xd7600001,
...@@ -1032,7 +1085,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -1032,7 +1085,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0x80048104, 0xd7600003, 0x80048104, 0xd7600003,
0x00000901, 0x80048104, 0x00000901, 0x80048104,
0xf469003a, 0xe0000000, 0xf469003a, 0xe0000000,
0x80709070, 0xbf06a004, 0x80709070, 0xbf06c004,
0xbf84ffef, 0xbe840380, 0xbf84ffef, 0xbe840380,
0xd7600000, 0x00000902, 0xd7600000, 0x00000902,
0x80048104, 0xd7600001, 0x80048104, 0xd7600001,
...@@ -1041,7 +1094,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -1041,7 +1094,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0x80048104, 0xd7600003, 0x80048104, 0xd7600003,
0x00000902, 0x80048104, 0x00000902, 0x80048104,
0xf469003a, 0xe0000000, 0xf469003a, 0xe0000000,
0x80709070, 0xbf06a004, 0x80709070, 0xbf06c004,
0xbf84ffef, 0xbe840380, 0xbf84ffef, 0xbe840380,
0xd7600000, 0x00000903, 0xd7600000, 0x00000903,
0x80048104, 0xd7600001, 0x80048104, 0xd7600001,
...@@ -1050,25 +1103,24 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -1050,25 +1103,24 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0x80048104, 0xd7600003, 0x80048104, 0xd7600003,
0x00000903, 0x80048104, 0x00000903, 0x80048104,
0xf469003a, 0xe0000000, 0xf469003a, 0xe0000000,
0x80709070, 0xbf06a004, 0x80709070, 0xbf06c004,
0xbf84ffef, 0x807c847c, 0xbf84ffef, 0x807c847c,
0xbf0a7b7c, 0xbf85ffb1, 0xbf0a7b7c, 0xbf85ffb1,
0xbf8200a6, 0x7e008700, 0xbf82003b, 0x7e008700,
0x7e028701, 0x7e048702, 0x7e028701, 0x7e048702,
0x7e068703, 0xe0704000, 0x7e068703, 0xe0704000,
0x705d0000, 0xe0704080, 0x705d0000, 0xe0704100,
0x705d0100, 0xe0704100, 0x705d0100, 0xe0704200,
0x705d0200, 0xe0704180, 0x705d0200, 0xe0704300,
0x705d0300, 0x807c847c, 0x705d0300, 0x807c847c,
0x8070ff70, 0x00000200, 0x8070ff70, 0x00000400,
0xbf0a7b7c, 0xbf85ffef, 0xbf0a7b7c, 0xbf85ffef,
0xbf820094, 0xbef603ff, 0xb97b1e06, 0x877bc17b,
0x01000000, 0xbefc0384, 0xbf840027, 0x8f7b837b,
0xbf0a7b7c, 0xbf840065, 0x807b7c7b, 0xbefe03c1,
0xb97af803, 0x8a7a7aff, 0xbeff0380, 0xb97af803,
0x10000000, 0xbf850050, 0x8a7a7aff, 0x10000000,
0x7e008700, 0x7e028701, 0xbf850017, 0x7e008700,
0x7e048702, 0x7e068703,
0xbe840380, 0xd7600000, 0xbe840380, 0xd7600000,
0x00000900, 0x80048104, 0x00000900, 0x80048104,
0xd7600001, 0x00000900, 0xd7600001, 0x00000900,
...@@ -1078,78 +1130,25 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { ...@@ -1078,78 +1130,25 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
0x80048104, 0xf469003a, 0x80048104, 0xf469003a,
0xe0000000, 0x80709070, 0xe0000000, 0x80709070,
0xbf06c004, 0xbf84ffef, 0xbf06c004, 0xbf84ffef,
0xbe840380, 0xd7600000, 0x807c817c, 0xbf0a7b7c,
0x00000901, 0x80048104, 0xbf85ffea, 0xbf820008,
0xd7600001, 0x00000901, 0x7e008700, 0xe0704000,
0x80048104, 0xd7600002, 0x705d0000, 0x807c817c,
0x00000901, 0x80048104, 0x8070ff70, 0x00000080,
0xd7600003, 0x00000901, 0xbf0a7b7c, 0xbf85fff8,
0x80048104, 0xf469003a, 0xbf82013d, 0xbef4037e,
0xe0000000, 0x80709070, 0x8775ff7f, 0x0000ffff,
0xbf06c004, 0xbf84ffef, 0x8875ff75, 0x00040000,
0xbe840380, 0xd7600000, 0xbef60380, 0xbef703ff,
0x00000902, 0x80048104, 0x10807fac, 0xb97202dc,
0xd7600001, 0x00000902, 0x8f729972, 0x876eff7f,
0x80048104, 0xd7600002, 0x04000000, 0xbf840033,
0x00000902, 0x80048104, 0xbefe03c1, 0x907c9972,
0xd7600003, 0x00000902, 0x877c817c, 0xbf06817c,
0x80048104, 0xf469003a, 0xbf850002, 0xbeff0380,
0xe0000000, 0x80709070, 0xbf820001, 0xbeff03c1,
0xbf06c004, 0xbf84ffef, 0xb96f4306, 0x876fc16f,
0xbe840380, 0xd7600000, 0xbf840028, 0x8f6f886f,
0x00000903, 0x80048104,
0xd7600001, 0x00000903,
0x80048104, 0xd7600002,
0x00000903, 0x80048104,
0xd7600003, 0x00000903,
0x80048104, 0xf469003a,
0xe0000000, 0x80709070,
0xbf06c004, 0xbf84ffef,
0x807c847c, 0xbf0a7b7c,
0xbf85ffb1, 0xbf82003b,
0x7e008700, 0x7e028701,
0x7e048702, 0x7e068703,
0xe0704000, 0x705d0000,
0xe0704100, 0x705d0100,
0xe0704200, 0x705d0200,
0xe0704300, 0x705d0300,
0x807c847c, 0x8070ff70,
0x00000400, 0xbf0a7b7c,
0xbf85ffef, 0xb97b1e06,
0x877bc17b, 0xbf840027,
0x8f7b837b, 0x807b7c7b,
0xbefe03c1, 0xbeff0380,
0xb97af803, 0x8a7a7aff,
0x10000000, 0xbf850017,
0x7e008700, 0xbe840380,
0xd7600000, 0x00000900,
0x80048104, 0xd7600001,
0x00000900, 0x80048104,
0xd7600002, 0x00000900,
0x80048104, 0xd7600003,
0x00000900, 0x80048104,
0xf469003a, 0xe0000000,
0x80709070, 0xbf06c004,
0xbf84ffef, 0x807c817c,
0xbf0a7b7c, 0xbf85ffea,
0xbf820008, 0x7e008700,
0xe0704000, 0x705d0000,
0x807c817c, 0x8070ff70,
0x00000080, 0xbf0a7b7c,
0xbf85fff8, 0xbf82013e,
0xbef4037e, 0x8775ff7f,
0x0000ffff, 0x8875ff75,
0x00040000, 0xbef60380,
0xbef703ff, 0x10807fac,
0xb97202dc, 0x8f729972,
0x876eff7f, 0x04000000,
0xbf840034, 0xbefe03c1,
0x907c9972, 0x877c817c,
0xbf06817c, 0xbf850002,
0xbeff0380, 0xbf820001,
0xbeff03c1, 0xb96f4306,
0x876fc16f, 0xbf840029,
0x8f6f866f, 0x8f6f826f,
0xbef6036f, 0xb9783a05, 0xbef6036f, 0xb9783a05,
0x80788178, 0xbf0d9972, 0x80788178, 0xbf0d9972,
0xbf850002, 0x8f788978, 0xbf850002, 0x8f788978,
...@@ -2273,7 +2272,7 @@ static const uint32_t cwsr_trap_aldebaran_hex[] = { ...@@ -2273,7 +2272,7 @@ static const uint32_t cwsr_trap_aldebaran_hex[] = {
}; };
static const uint32_t cwsr_trap_gfx10_hex[] = { static const uint32_t cwsr_trap_gfx10_hex[] = {
0xbf820001, 0xbf820221, 0xbf820001, 0xbf820220,
0xb0804004, 0xb978f802, 0xb0804004, 0xb978f802,
0x8a78ff78, 0x00020006, 0x8a78ff78, 0x00020006,
0xb97bf803, 0x876eff78, 0xb97bf803, 0x876eff78,
...@@ -2472,94 +2471,93 @@ static const uint32_t cwsr_trap_gfx10_hex[] = { ...@@ -2472,94 +2471,93 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
0xbf850002, 0xbeff0380, 0xbf850002, 0xbeff0380,
0xbf820001, 0xbeff03c1, 0xbf820001, 0xbeff03c1,
0xb97b4306, 0x877bc17b, 0xb97b4306, 0x877bc17b,
0xbf840044, 0xbf8a0000, 0xbf840043, 0xbf8a0000,
0x877aff6d, 0x80000000, 0x877aff6d, 0x80000000,
0xbf840040, 0x8f7b867b, 0xbf84003f, 0x8f7b887b,
0x8f7b827b, 0xbef6037b, 0xbef6037b, 0xb9703a05,
0xb9703a05, 0x80708170, 0x80708170, 0xbf0d9973,
0xbf0d9973, 0xbf850002, 0xbf850002, 0x8f708970,
0x8f708970, 0xbf820001, 0xbf820001, 0x8f708a70,
0x8f708a70, 0xb97a1e06, 0xb97a1e06, 0x8f7a8a7a,
0x8f7a8a7a, 0x80707a70, 0x80707a70, 0x8070ff70,
0x8070ff70, 0x00000200, 0x00000200, 0x8070ff70,
0x8070ff70, 0x00000080, 0x00000080, 0xbef603ff,
0xbef603ff, 0x01000000, 0x01000000, 0xd7650000,
0xd7650000, 0x000100c1, 0x000100c1, 0xd7660000,
0xd7660000, 0x000200c1, 0x000200c1, 0x16000084,
0x16000084, 0x907c9973, 0x907c9973, 0x877c817c,
0x877c817c, 0xbf06817c, 0xbf06817c, 0xbefc0380,
0xbefc0380, 0xbf850012, 0xbf850012, 0xbe8303ff,
0xbe8303ff, 0x00000080, 0x00000080, 0xbf800000,
0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000,
0xbf800000, 0xd8d80000, 0xd8d80000, 0x01000000,
0x01000000, 0xbf8c0000, 0xbf8c0000, 0xe0704000,
0xe0704000, 0x705d0100, 0x705d0100, 0x807c037c,
0x807c037c, 0x80700370, 0x80700370, 0xd5250000,
0xd5250000, 0x0001ff00, 0x0001ff00, 0x00000080,
0x00000080, 0xbf0a7b7c, 0xbf0a7b7c, 0xbf85fff4,
0xbf85fff4, 0xbf820011, 0xbf820011, 0xbe8303ff,
0xbe8303ff, 0x00000100, 0x00000100, 0xbf800000,
0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000,
0xbf800000, 0xd8d80000, 0xd8d80000, 0x01000000,
0x01000000, 0xbf8c0000, 0xbf8c0000, 0xe0704000,
0xe0704000, 0x705d0100, 0x705d0100, 0x807c037c,
0x807c037c, 0x80700370, 0x80700370, 0xd5250000,
0xd5250000, 0x0001ff00, 0x0001ff00, 0x00000100,
0x00000100, 0xbf0a7b7c, 0xbf0a7b7c, 0xbf85fff4,
0xbf85fff4, 0xbefe03c1, 0xbefe03c1, 0x907c9973,
0x907c9973, 0x877c817c, 0x877c817c, 0xbf06817c,
0xbf06817c, 0xbf850004, 0xbf850004, 0xbef003ff,
0xbef003ff, 0x00000200, 0x00000200, 0xbeff0380,
0xbeff0380, 0xbf820003, 0xbf820003, 0xbef003ff,
0xbef003ff, 0x00000400, 0x00000400, 0xbeff03c1,
0xbeff03c1, 0xb97b3a05, 0xb97b3a05, 0x807b817b,
0x807b817b, 0x8f7b827b, 0x8f7b827b, 0x907c9973,
0x907c9973, 0x877c817c, 0x877c817c, 0xbf06817c,
0xbf06817c, 0xbf850017, 0xbf850017, 0xbef603ff,
0x01000000, 0xbefc0384,
0xbf0a7b7c, 0xbf840037,
0x7e008700, 0x7e028701,
0x7e048702, 0x7e068703,
0xe0704000, 0x705d0000,
0xe0704080, 0x705d0100,
0xe0704100, 0x705d0200,
0xe0704180, 0x705d0300,
0x807c847c, 0x8070ff70,
0x00000200, 0xbf0a7b7c,
0xbf85ffef, 0xbf820025,
0xbef603ff, 0x01000000, 0xbef603ff, 0x01000000,
0xbefc0384, 0xbf0a7b7c, 0xbefc0384, 0xbf0a7b7c,
0xbf840037, 0x7e008700, 0xbf840011, 0x7e008700,
0x7e028701, 0x7e048702, 0x7e028701, 0x7e048702,
0x7e068703, 0xe0704000, 0x7e068703, 0xe0704000,
0x705d0000, 0xe0704080, 0x705d0000, 0xe0704100,
0x705d0100, 0xe0704100, 0x705d0100, 0xe0704200,
0x705d0200, 0xe0704180, 0x705d0200, 0xe0704300,
0x705d0300, 0x807c847c, 0x705d0300, 0x807c847c,
0x8070ff70, 0x00000200, 0x8070ff70, 0x00000400,
0xbf0a7b7c, 0xbf85ffef, 0xbf0a7b7c, 0xbf85ffef,
0xbf820025, 0xbef603ff, 0xb97b1e06, 0x877bc17b,
0x01000000, 0xbefc0384, 0xbf84000c, 0x8f7b837b,
0xbf0a7b7c, 0xbf840011, 0x807b7c7b, 0xbefe03c1,
0x7e008700, 0x7e028701, 0xbeff0380, 0x7e008700,
0x7e048702, 0x7e068703,
0xe0704000, 0x705d0000, 0xe0704000, 0x705d0000,
0xe0704100, 0x705d0100, 0x807c817c, 0x8070ff70,
0xe0704200, 0x705d0200, 0x00000080, 0xbf0a7b7c,
0xe0704300, 0x705d0300, 0xbf85fff8, 0xbf820134,
0x807c847c, 0x8070ff70, 0xbef4037e, 0x8775ff7f,
0x00000400, 0xbf0a7b7c, 0x0000ffff, 0x8875ff75,
0xbf85ffef, 0xb97b1e06, 0x00040000, 0xbef60380,
0x877bc17b, 0xbf84000c, 0xbef703ff, 0x10807fac,
0x8f7b837b, 0x807b7c7b, 0xb97202dc, 0x8f729972,
0xbefe03c1, 0xbeff0380, 0x876eff7f, 0x04000000,
0x7e008700, 0xe0704000, 0xbf840033, 0xbefe03c1,
0x705d0000, 0x807c817c, 0x907c9972, 0x877c817c,
0x8070ff70, 0x00000080, 0xbf06817c, 0xbf850002,
0xbf0a7b7c, 0xbf85fff8, 0xbeff0380, 0xbf820001,
0xbf820135, 0xbef4037e, 0xbeff03c1, 0xb96f4306,
0x8775ff7f, 0x0000ffff, 0x876fc16f, 0xbf840028,
0x8875ff75, 0x00040000, 0x8f6f886f, 0xbef6036f,
0xbef60380, 0xbef703ff,
0x10807fac, 0xb97202dc,
0x8f729972, 0x876eff7f,
0x04000000, 0xbf840034,
0xbefe03c1, 0x907c9972,
0x877c817c, 0xbf06817c,
0xbf850002, 0xbeff0380,
0xbf820001, 0xbeff03c1,
0xb96f4306, 0x876fc16f,
0xbf840029, 0x8f6f866f,
0x8f6f826f, 0xbef6036f,
0xb9783a05, 0x80788178, 0xb9783a05, 0x80788178,
0xbf0d9972, 0xbf850002, 0xbf0d9972, 0xbf850002,
0x8f788978, 0xbf820001, 0x8f788978, 0xbf820001,
...@@ -2707,7 +2705,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = { ...@@ -2707,7 +2705,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
}; };
static const uint32_t cwsr_trap_gfx11_hex[] = { static const uint32_t cwsr_trap_gfx11_hex[] = {
0xbfa00001, 0xbfa00225, 0xbfa00001, 0xbfa00224,
0xb0804006, 0xb8f8f802, 0xb0804006, 0xb8f8f802,
0x9178ff78, 0x00020006, 0x9178ff78, 0x00020006,
0xb8fbf803, 0xbf0d9e6d, 0xb8fbf803, 0xbf0d9e6d,
...@@ -2908,94 +2906,93 @@ static const uint32_t cwsr_trap_gfx11_hex[] = { ...@@ -2908,94 +2906,93 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
0xbfa20002, 0xbeff0080, 0xbfa20002, 0xbeff0080,
0xbfa00001, 0xbeff00c1, 0xbfa00001, 0xbeff00c1,
0xb8fb4306, 0x8b7bc17b, 0xb8fb4306, 0x8b7bc17b,
0xbfa10044, 0xbfbd0000, 0xbfa10043, 0xbfbd0000,
0x8b7aff6d, 0x80000000, 0x8b7aff6d, 0x80000000,
0xbfa10040, 0x847b867b, 0xbfa1003f, 0x847b887b,
0x847b827b, 0xbef6007b, 0xbef6007b, 0xb8f03b05,
0xb8f03b05, 0x80708170, 0x80708170, 0xbf0d9973,
0xbf0d9973, 0xbfa20002, 0xbfa20002, 0x84708970,
0x84708970, 0xbfa00001, 0xbfa00001, 0x84708a70,
0x84708a70, 0xb8fa1e06, 0xb8fa1e06, 0x847a8a7a,
0x847a8a7a, 0x80707a70, 0x80707a70, 0x8070ff70,
0x8070ff70, 0x00000200, 0x00000200, 0x8070ff70,
0x8070ff70, 0x00000080, 0x00000080, 0xbef600ff,
0xbef600ff, 0x01000000, 0x01000000, 0xd71f0000,
0xd71f0000, 0x000100c1, 0x000100c1, 0xd7200000,
0xd7200000, 0x000200c1, 0x000200c1, 0x16000084,
0x16000084, 0x857d9973, 0x857d9973, 0x8b7d817d,
0x8b7d817d, 0xbf06817d, 0xbf06817d, 0xbefd0080,
0xbefd0080, 0xbfa20012, 0xbfa20012, 0xbe8300ff,
0xbe8300ff, 0x00000080, 0x00000080, 0xbf800000,
0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000,
0xbf800000, 0xd8d80000, 0xd8d80000, 0x01000000,
0x01000000, 0xbf890000, 0xbf890000, 0xe0685000,
0xe0685000, 0x701d0100, 0x701d0100, 0x807d037d,
0x807d037d, 0x80700370, 0x80700370, 0xd5250000,
0xd5250000, 0x0001ff00, 0x0001ff00, 0x00000080,
0x00000080, 0xbf0a7b7d, 0xbf0a7b7d, 0xbfa2fff4,
0xbfa2fff4, 0xbfa00011, 0xbfa00011, 0xbe8300ff,
0xbe8300ff, 0x00000100, 0x00000100, 0xbf800000,
0xbf800000, 0xbf800000, 0xbf800000, 0xbf800000,
0xbf800000, 0xd8d80000, 0xd8d80000, 0x01000000,
0x01000000, 0xbf890000, 0xbf890000, 0xe0685000,
0xe0685000, 0x701d0100, 0x701d0100, 0x807d037d,
0x807d037d, 0x80700370, 0x80700370, 0xd5250000,
0xd5250000, 0x0001ff00, 0x0001ff00, 0x00000100,
0x00000100, 0xbf0a7b7d, 0xbf0a7b7d, 0xbfa2fff4,
0xbfa2fff4, 0xbefe00c1, 0xbefe00c1, 0x857d9973,
0x857d9973, 0x8b7d817d, 0x8b7d817d, 0xbf06817d,
0xbf06817d, 0xbfa20004, 0xbfa20004, 0xbef000ff,
0xbef000ff, 0x00000200, 0x00000200, 0xbeff0080,
0xbeff0080, 0xbfa00003, 0xbfa00003, 0xbef000ff,
0xbef000ff, 0x00000400, 0x00000400, 0xbeff00c1,
0xbeff00c1, 0xb8fb3b05, 0xb8fb3b05, 0x807b817b,
0x807b817b, 0x847b827b, 0x847b827b, 0x857d9973,
0x857d9973, 0x8b7d817d, 0x8b7d817d, 0xbf06817d,
0xbf06817d, 0xbfa20017, 0xbfa20017, 0xbef600ff,
0x01000000, 0xbefd0084,
0xbf0a7b7d, 0xbfa10037,
0x7e008700, 0x7e028701,
0x7e048702, 0x7e068703,
0xe0685000, 0x701d0000,
0xe0685080, 0x701d0100,
0xe0685100, 0x701d0200,
0xe0685180, 0x701d0300,
0x807d847d, 0x8070ff70,
0x00000200, 0xbf0a7b7d,
0xbfa2ffef, 0xbfa00025,
0xbef600ff, 0x01000000, 0xbef600ff, 0x01000000,
0xbefd0084, 0xbf0a7b7d, 0xbefd0084, 0xbf0a7b7d,
0xbfa10037, 0x7e008700, 0xbfa10011, 0x7e008700,
0x7e028701, 0x7e048702, 0x7e028701, 0x7e048702,
0x7e068703, 0xe0685000, 0x7e068703, 0xe0685000,
0x701d0000, 0xe0685080, 0x701d0000, 0xe0685100,
0x701d0100, 0xe0685100, 0x701d0100, 0xe0685200,
0x701d0200, 0xe0685180, 0x701d0200, 0xe0685300,
0x701d0300, 0x807d847d, 0x701d0300, 0x807d847d,
0x8070ff70, 0x00000200, 0x8070ff70, 0x00000400,
0xbf0a7b7d, 0xbfa2ffef, 0xbf0a7b7d, 0xbfa2ffef,
0xbfa00025, 0xbef600ff, 0xb8fb1e06, 0x8b7bc17b,
0x01000000, 0xbefd0084, 0xbfa1000c, 0x847b837b,
0xbf0a7b7d, 0xbfa10011, 0x807b7d7b, 0xbefe00c1,
0x7e008700, 0x7e028701, 0xbeff0080, 0x7e008700,
0x7e048702, 0x7e068703,
0xe0685000, 0x701d0000, 0xe0685000, 0x701d0000,
0xe0685100, 0x701d0100, 0x807d817d, 0x8070ff70,
0xe0685200, 0x701d0200, 0x00000080, 0xbf0a7b7d,
0xe0685300, 0x701d0300, 0xbfa2fff8, 0xbfa0013f,
0x807d847d, 0x8070ff70, 0xbef4007e, 0x8b75ff7f,
0x00000400, 0xbf0a7b7d, 0x0000ffff, 0x8c75ff75,
0xbfa2ffef, 0xb8fb1e06, 0x00040000, 0xbef60080,
0x8b7bc17b, 0xbfa1000c, 0xbef700ff, 0x10807fac,
0x847b837b, 0x807b7d7b, 0xb8f202dc, 0x84729972,
0xbefe00c1, 0xbeff0080, 0x8b6eff7f, 0x04000000,
0x7e008700, 0xe0685000, 0xbfa10039, 0xbefe00c1,
0x701d0000, 0x807d817d, 0x857d9972, 0x8b7d817d,
0x8070ff70, 0x00000080, 0xbf06817d, 0xbfa20002,
0xbf0a7b7d, 0xbfa2fff8, 0xbeff0080, 0xbfa00001,
0xbfa00140, 0xbef4007e, 0xbeff00c1, 0xb8ef4306,
0x8b75ff7f, 0x0000ffff, 0x8b6fc16f, 0xbfa1002e,
0x8c75ff75, 0x00040000, 0x846f886f, 0xbef6006f,
0xbef60080, 0xbef700ff,
0x10807fac, 0xb8f202dc,
0x84729972, 0x8b6eff7f,
0x04000000, 0xbfa1003a,
0xbefe00c1, 0x857d9972,
0x8b7d817d, 0xbf06817d,
0xbfa20002, 0xbeff0080,
0xbfa00001, 0xbeff00c1,
0xb8ef4306, 0x8b6fc16f,
0xbfa1002f, 0x846f866f,
0x846f826f, 0xbef6006f,
0xb8f83b05, 0x80788178, 0xb8f83b05, 0x80788178,
0xbf0d9972, 0xbfa20002, 0xbf0d9972, 0xbfa20002,
0x84788978, 0xbfa00001, 0x84788978, 0xbfa00001,
...@@ -3638,14 +3635,14 @@ static const uint32_t cwsr_trap_gfx9_4_3_hex[] = { ...@@ -3638,14 +3635,14 @@ static const uint32_t cwsr_trap_gfx9_4_3_hex[] = {
}; };
static const uint32_t cwsr_trap_gfx12_hex[] = { static const uint32_t cwsr_trap_gfx12_hex[] = {
0xbfa00001, 0xbfa00243, 0xbfa00001, 0xbfa00247,
0xb0804009, 0xb8f8f804, 0xb0804009, 0xb8f8f804,
0x9178ff78, 0x00008c00, 0x9178ff78, 0x00008c00,
0xb8fbf811, 0x8b6eff78, 0xb8fbf811, 0x8b6eff78,
0x00004000, 0xbfa10008, 0x00004000, 0xbfa10008,
0x8b6eff7b, 0x00000080, 0x8b6eff7b, 0x00000080,
0xbfa20018, 0x8b6ea07b, 0xbfa20018, 0x8b6ea07b,
0xbfa20041, 0xbf830010, 0xbfa20042, 0xbf830010,
0xb8fbf811, 0xbfa0fffb, 0xb8fbf811, 0xbfa0fffb,
0x8b6eff7b, 0x00000bd0, 0x8b6eff7b, 0x00000bd0,
0xbfa20010, 0xb8eef812, 0xbfa20010, 0xb8eef812,
...@@ -3656,7 +3653,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = { ...@@ -3656,7 +3653,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
0xf0000000, 0xbfa20005, 0xf0000000, 0xbfa20005,
0x8b6fff6f, 0x00000200, 0x8b6fff6f, 0x00000200,
0xbfa20002, 0x8b6ea07b, 0xbfa20002, 0x8b6ea07b,
0xbfa2002b, 0xbefa4d82, 0xbfa2002c, 0xbefa4d82,
0xbf8a0000, 0x84fa887a, 0xbf8a0000, 0x84fa887a,
0xbf0d8f7b, 0xbfa10002, 0xbf0d8f7b, 0xbfa10002,
0x8c7bff7b, 0xffff0000, 0x8c7bff7b, 0xffff0000,
...@@ -3677,120 +3674,156 @@ static const uint32_t cwsr_trap_gfx12_hex[] = { ...@@ -3677,120 +3674,156 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
0x806c846c, 0x826d806d, 0x806c846c, 0x826d806d,
0x8b6dff6d, 0x0000ffff, 0x8b6dff6d, 0x0000ffff,
0x8bfe7e7e, 0x8bea6a6a, 0x8bfe7e7e, 0x8bea6a6a,
0xb978f804, 0xbe804a6c, 0x85788978, 0xb9783244,
0x8b6dff6d, 0x0000ffff, 0xbe804a6c, 0x8b6dff6d,
0xbefa0080, 0xb97a0151, 0x0000ffff, 0xbefa0080,
0xbeee007e, 0xbeef007f, 0xb97a0151, 0xbeee007e,
0xbefe0180, 0xbefe4d84, 0xbeef007f, 0xbefe0180,
0xbf8a0000, 0x8b7aff7f, 0xbefe4d84, 0xbf8a0000,
0x04000000, 0x847a857a, 0x8b7aff7f, 0x04000000,
0x8c6d7a6d, 0xbefa007e, 0x847a857a, 0x8c6d7a6d,
0x8b7bff7f, 0x0000ffff, 0xbefa007e, 0x8b7bff7f,
0xbefe00c1, 0xbeff00c1, 0x0000ffff, 0xbefe00c1,
0xbeff00c1, 0xee0a407a,
0x000c0000, 0x00000000,
0x7e000280, 0xbefe007a,
0xbeff007b, 0xb8fb0742,
0x847b997b, 0xb8fa3b05,
0x807a817a, 0xbf0d997b,
0xbfa20002, 0x847a897a,
0xbfa00001, 0x847a8a7a,
0xb8fb1e06, 0x847b8a7b,
0x807a7b7a, 0x8b7bff7f,
0x0000ffff, 0x807aff7a,
0x00000200, 0x807a7e7a,
0x827b807b, 0xd7610000,
0x00010870, 0xd7610000,
0x00010a71, 0xd7610000,
0x00010c72, 0xd7610000,
0x00010e73, 0xd7610000,
0x00011074, 0xd7610000,
0x00011275, 0xd7610000,
0x00011476, 0xd7610000,
0x00011677, 0xd7610000,
0x00011a79, 0xd7610000,
0x00011c7e, 0xd7610000,
0x00011e7f, 0xbefe00ff,
0x00003fff, 0xbeff0080,
0xee0a407a, 0x000c0000, 0xee0a407a, 0x000c0000,
0x00000000, 0x7e000280, 0x00004000, 0xd760007a,
0xbefe007a, 0xbeff007b, 0x00011d00, 0xd760007b,
0xb8fb0742, 0x847b997b, 0x00011f00, 0xbefe007a,
0xb8fa3b05, 0x807a817a, 0xbeff007b, 0xbef4007e,
0xbf0d997b, 0xbfa20002, 0x8b75ff7f, 0x0000ffff,
0x847a897a, 0xbfa00001, 0x8c75ff75, 0x00040000,
0x847a8a7a, 0xb8fb1e06, 0xbef60080, 0xbef700ff,
0x847b8a7b, 0x807a7b7a, 0x10807fac, 0xbef1007d,
0x8b7bff7f, 0x0000ffff, 0xbef00080, 0xb8f30742,
0x807aff7a, 0x00000200, 0x84739973, 0xbefe00c1,
0x807a7e7a, 0x827b807b, 0x857d9973, 0x8b7d817d,
0xd7610000, 0x00010870, 0xbf06817d, 0xbfa20002,
0xd7610000, 0x00010a71, 0xbeff0080, 0xbfa00002,
0xd7610000, 0x00010c72, 0xbeff00c1, 0xbfa0000c,
0xd7610000, 0x00010e73, 0xbef600ff, 0x01000000,
0xd7610000, 0x00011074, 0xc4068070, 0x008ce801,
0xd7610000, 0x00011275, 0x00008000, 0xc4068070,
0xd7610000, 0x00011476, 0x008ce802, 0x00010000,
0xd7610000, 0x00011677, 0xc4068070, 0x008ce803,
0xd7610000, 0x00011a79, 0x00018000, 0xbfa0000b,
0xd7610000, 0x00011c7e, 0xbef600ff, 0x01000000,
0xd7610000, 0x00011e7f, 0xc4068070, 0x008ce801,
0xbefe00ff, 0x00003fff,
0xbeff0080, 0xee0a407a,
0x000c0000, 0x00004000,
0xd760007a, 0x00011d00,
0xd760007b, 0x00011f00,
0xbefe007a, 0xbeff007b,
0xbef4007e, 0x8b75ff7f,
0x0000ffff, 0x8c75ff75,
0x00040000, 0xbef60080,
0xbef700ff, 0x10807fac,
0xbef1007d, 0xbef00080,
0xb8f30742, 0x84739973,
0xbefe00c1, 0x857d9973,
0x8b7d817d, 0xbf06817d,
0xbfa20002, 0xbeff0080,
0xbfa00002, 0xbeff00c1,
0xbfa0000c, 0xbef600ff,
0x01000000, 0xc4068070,
0x008ce801, 0x00008000,
0xc4068070, 0x008ce802,
0x00010000, 0xc4068070, 0x00010000, 0xc4068070,
0x008ce803, 0x00018000, 0x008ce802, 0x00020000,
0xbfa0000b, 0xbef600ff, 0xc4068070, 0x008ce803,
0x01000000, 0xc4068070, 0x00030000, 0xb8f03b05,
0x008ce801, 0x00010000, 0x80708170, 0xbf0d9973,
0xbfa20002, 0x84708970,
0xbfa00001, 0x84708a70,
0xb8fa1e06, 0x847a8a7a,
0x80707a70, 0x8070ff70,
0x00000200, 0xbef600ff,
0x01000000, 0x7e000280,
0x7e020280, 0x7e040280,
0xbefd0080, 0xbe804ec2,
0xbf94fffe, 0xb8faf804,
0x8b7a847a, 0x91788478,
0x8c787a78, 0xd7610002,
0x0000fa71, 0x807d817d,
0xd7610002, 0x0000fa6c,
0x807d817d, 0x917aff6d,
0x80000000, 0xd7610002,
0x0000fa7a, 0x807d817d,
0xd7610002, 0x0000fa6e,
0x807d817d, 0xd7610002,
0x0000fa6f, 0x807d817d,
0xd7610002, 0x0000fa78,
0x807d817d, 0xb8faf811,
0xd7610002, 0x0000fa7a,
0x807d817d, 0xd7610002,
0x0000fa7b, 0x807d817d,
0xb8f1f801, 0xd7610002,
0x0000fa71, 0x807d817d,
0xb8f1f814, 0xd7610002,
0x0000fa71, 0x807d817d,
0xb8f1f815, 0xd7610002,
0x0000fa71, 0x807d817d,
0xb8f1f812, 0xd7610002,
0x0000fa71, 0x807d817d,
0xb8f1f813, 0xd7610002,
0x0000fa71, 0x807d817d,
0xb8faf802, 0xd7610002,
0x0000fa7a, 0x807d817d,
0xbefa50c1, 0xbfc70000,
0xd7610002, 0x0000fa7a,
0x807d817d, 0xbefe00ff,
0x0000ffff, 0xbeff0080,
0xc4068070, 0x008ce802, 0xc4068070, 0x008ce802,
0x00020000, 0xc4068070, 0x00000000, 0xbefe00c1,
0x008ce803, 0x00030000,
0xb8f03b05, 0x80708170, 0xb8f03b05, 0x80708170,
0xbf0d9973, 0xbfa20002, 0xbf0d9973, 0xbfa20002,
0x84708970, 0xbfa00001, 0x84708970, 0xbfa00001,
0x84708a70, 0xb8fa1e06, 0x84708a70, 0xb8fa1e06,
0x847a8a7a, 0x80707a70, 0x847a8a7a, 0x80707a70,
0x8070ff70, 0x00000200,
0xbef600ff, 0x01000000, 0xbef600ff, 0x01000000,
0x7e000280, 0x7e020280, 0xbef90080, 0xbefd0080,
0x7e040280, 0xbefd0080, 0xbf800000, 0xbe804100,
0xbe804ec2, 0xbf94fffe, 0xbe824102, 0xbe844104,
0xd7610002, 0x0000fa71, 0xbe864106, 0xbe884108,
0x807d817d, 0xd7610002, 0xbe8a410a, 0xbe8c410c,
0x0000fa6c, 0x807d817d, 0xbe8e410e, 0xd7610002,
0x917aff6d, 0x80000000, 0x0000f200, 0x80798179,
0xd7610002, 0x0000fa7a, 0xd7610002, 0x0000f201,
0x807d817d, 0xd7610002, 0x80798179, 0xd7610002,
0x0000fa6e, 0x807d817d, 0x0000f202, 0x80798179,
0xd7610002, 0x0000fa6f, 0xd7610002, 0x0000f203,
0x807d817d, 0xd7610002, 0x80798179, 0xd7610002,
0x0000fa78, 0x807d817d, 0x0000f204, 0x80798179,
0xb8faf811, 0xd7610002, 0xd7610002, 0x0000f205,
0x0000fa7a, 0x807d817d, 0x80798179, 0xd7610002,
0xd7610002, 0x0000fa7b, 0x0000f206, 0x80798179,
0x807d817d, 0xb8f1f801, 0xd7610002, 0x0000f207,
0xd7610002, 0x0000fa71, 0x80798179, 0xd7610002,
0x807d817d, 0xb8f1f814, 0x0000f208, 0x80798179,
0xd7610002, 0x0000fa71, 0xd7610002, 0x0000f209,
0x807d817d, 0xb8f1f815, 0x80798179, 0xd7610002,
0xd7610002, 0x0000fa71, 0x0000f20a, 0x80798179,
0x807d817d, 0xb8f1f812, 0xd7610002, 0x0000f20b,
0xd7610002, 0x0000fa71, 0x80798179, 0xd7610002,
0x807d817d, 0xb8f1f813, 0x0000f20c, 0x80798179,
0xd7610002, 0x0000fa71, 0xd7610002, 0x0000f20d,
0x807d817d, 0xb8faf802, 0x80798179, 0xd7610002,
0xd7610002, 0x0000fa7a, 0x0000f20e, 0x80798179,
0x807d817d, 0xbefa50c1, 0xd7610002, 0x0000f20f,
0xbfc70000, 0xd7610002, 0x80798179, 0xbf06a079,
0x0000fa7a, 0x807d817d, 0xbfa10007, 0xc4068070,
0xbefe00ff, 0x0000ffff,
0xbeff0080, 0xc4068070,
0x008ce802, 0x00000000, 0x008ce802, 0x00000000,
0xbefe00c1, 0xb8f03b05, 0x8070ff70, 0x00000080,
0x80708170, 0xbf0d9973, 0xbef90080, 0x7e040280,
0xbfa20002, 0x84708970, 0x807d907d, 0xbf0aff7d,
0xbfa00001, 0x84708a70, 0x00000060, 0xbfa2ffbb,
0xb8fa1e06, 0x847a8a7a,
0x80707a70, 0xbef600ff,
0x01000000, 0xbef90080,
0xbefd0080, 0xbf800000,
0xbe804100, 0xbe824102, 0xbe804100, 0xbe824102,
0xbe844104, 0xbe864106, 0xbe844104, 0xbe864106,
0xbe884108, 0xbe8a410a, 0xbe884108, 0xbe8a410a,
0xbe8c410c, 0xbe8e410e,
0xd7610002, 0x0000f200, 0xd7610002, 0x0000f200,
0x80798179, 0xd7610002, 0x80798179, 0xd7610002,
0x0000f201, 0x80798179, 0x0000f201, 0x80798179,
...@@ -3809,49 +3842,15 @@ static const uint32_t cwsr_trap_gfx12_hex[] = { ...@@ -3809,49 +3842,15 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
0xd7610002, 0x0000f20a, 0xd7610002, 0x0000f20a,
0x80798179, 0xd7610002, 0x80798179, 0xd7610002,
0x0000f20b, 0x80798179, 0x0000f20b, 0x80798179,
0xd7610002, 0x0000f20c,
0x80798179, 0xd7610002,
0x0000f20d, 0x80798179,
0xd7610002, 0x0000f20e,
0x80798179, 0xd7610002,
0x0000f20f, 0x80798179,
0xbf06a079, 0xbfa10007,
0xc4068070, 0x008ce802, 0xc4068070, 0x008ce802,
0x00000000, 0x8070ff70, 0x00000000, 0xbefe00c1,
0x00000080, 0xbef90080, 0x857d9973, 0x8b7d817d,
0x7e040280, 0x807d907d, 0xbf06817d, 0xbfa20002,
0xbf0aff7d, 0x00000060, 0xbeff0080, 0xbfa00001,
0xbfa2ffbb, 0xbe804100, 0xbeff00c1, 0xb8fb4306,
0xbe824102, 0xbe844104, 0x8b7bc17b, 0xbfa10044,
0xbe864106, 0xbe884108, 0x8b7aff6d, 0x80000000,
0xbe8a410a, 0xd7610002, 0xbfa10041, 0x847b897b,
0x0000f200, 0x80798179,
0xd7610002, 0x0000f201,
0x80798179, 0xd7610002,
0x0000f202, 0x80798179,
0xd7610002, 0x0000f203,
0x80798179, 0xd7610002,
0x0000f204, 0x80798179,
0xd7610002, 0x0000f205,
0x80798179, 0xd7610002,
0x0000f206, 0x80798179,
0xd7610002, 0x0000f207,
0x80798179, 0xd7610002,
0x0000f208, 0x80798179,
0xd7610002, 0x0000f209,
0x80798179, 0xd7610002,
0x0000f20a, 0x80798179,
0xd7610002, 0x0000f20b,
0x80798179, 0xc4068070,
0x008ce802, 0x00000000,
0xbefe00c1, 0x857d9973,
0x8b7d817d, 0xbf06817d,
0xbfa20002, 0xbeff0080,
0xbfa00001, 0xbeff00c1,
0xb8fb4306, 0x8b7bc17b,
0xbfa10045, 0x8b7aff6d,
0x80000000, 0xbfa10042,
0x847b867b, 0x847b827b,
0xbef6007b, 0xb8f03b05, 0xbef6007b, 0xb8f03b05,
0x80708170, 0xbf0d9973, 0x80708170, 0xbf0d9973,
0xbfa20002, 0x84708970, 0xbfa20002, 0x84708970,
...@@ -3928,189 +3927,191 @@ static const uint32_t cwsr_trap_gfx12_hex[] = { ...@@ -3928,189 +3927,191 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
0x00000000, 0x807d817d, 0x00000000, 0x807d817d,
0x8070ff70, 0x00000080, 0x8070ff70, 0x00000080,
0xbf0a7b7d, 0xbfa2fff7, 0xbf0a7b7d, 0xbfa2fff7,
0xbfa0016b, 0xbef4007e, 0xbfa0016e, 0xbef4007e,
0x8b75ff7f, 0x0000ffff, 0x8b75ff7f, 0x0000ffff,
0x8c75ff75, 0x00040000, 0x8c75ff75, 0x00040000,
0xbef60080, 0xbef700ff, 0xbef60080, 0xbef700ff,
0x10807fac, 0xbef1007f, 0x10807fac, 0xbef1007f,
0xb8f20742, 0x84729972, 0xb8f20742, 0x84729972,
0x8b6eff7f, 0x04000000, 0x8b6eff7f, 0x04000000,
0xbfa1003c, 0xbefe00c1, 0xbfa1003b, 0xbefe00c1,
0x857d9972, 0x8b7d817d, 0x857d9972, 0x8b7d817d,
0xbf06817d, 0xbfa20002, 0xbf06817d, 0xbfa20002,
0xbeff0080, 0xbfa00001, 0xbeff0080, 0xbfa00001,
0xbeff00c1, 0xb8ef4306, 0xbeff00c1, 0xb8ef4306,
0x8b6fc16f, 0xbfa10031, 0x8b6fc16f, 0xbfa10030,
0x846f866f, 0x846f826f, 0x846f896f, 0xbef6006f,
0xbef6006f, 0xb8f83b05,
0x80788178, 0xbf0d9972,
0xbfa20002, 0x84788978,
0xbfa00001, 0x84788a78,
0xb8ee1e06, 0x846e8a6e,
0x80786e78, 0x8078ff78,
0x00000200, 0x8078ff78,
0x00000080, 0xbef600ff,
0x01000000, 0x857d9972,
0x8b7d817d, 0xbf06817d,
0xbefd0080, 0xbfa2000d,
0xc4050078, 0x0080e800,
0x00000000, 0xbf8a0000,
0xdac00000, 0x00000000,
0x807dff7d, 0x00000080,
0x8078ff78, 0x00000080,
0xbf0a6f7d, 0xbfa2fff4,
0xbfa0000c, 0xc4050078,
0x0080e800, 0x00000000,
0xbf8a0000, 0xdac00000,
0x00000000, 0x807dff7d,
0x00000100, 0x8078ff78,
0x00000100, 0xbf0a6f7d,
0xbfa2fff4, 0xbef80080,
0xbefe00c1, 0x857d9972,
0x8b7d817d, 0xbf06817d,
0xbfa20002, 0xbeff0080,
0xbfa00001, 0xbeff00c1,
0xb8ef3b05, 0x806f816f,
0x846f826f, 0x857d9972,
0x8b7d817d, 0xbf06817d,
0xbfa2002c, 0xbef600ff,
0x01000000, 0xbeee0078,
0x8078ff78, 0x00000200,
0xbefd0084, 0xbf0a6f7d,
0xbfa10061, 0xc4050078,
0x008ce800, 0x00000000,
0xc4050078, 0x008ce801,
0x00008000, 0xc4050078,
0x008ce802, 0x00010000,
0xc4050078, 0x008ce803,
0x00018000, 0xbf8a0000,
0x7e008500, 0x7e028501,
0x7e048502, 0x7e068503,
0x807d847d, 0x8078ff78,
0x00000200, 0xbf0a6f7d,
0xbfa2ffea, 0xc405006e,
0x008ce800, 0x00000000,
0xc405006e, 0x008ce801,
0x00008000, 0xc405006e,
0x008ce802, 0x00010000,
0xc405006e, 0x008ce803,
0x00018000, 0xbf8a0000,
0xbfa0003d, 0xbef600ff,
0x01000000, 0xbeee0078,
0x8078ff78, 0x00000400,
0xbefd0084, 0xbf0a6f7d,
0xbfa10016, 0xc4050078,
0x008ce800, 0x00000000,
0xc4050078, 0x008ce801,
0x00010000, 0xc4050078,
0x008ce802, 0x00020000,
0xc4050078, 0x008ce803,
0x00030000, 0xbf8a0000,
0x7e008500, 0x7e028501,
0x7e048502, 0x7e068503,
0x807d847d, 0x8078ff78,
0x00000400, 0xbf0a6f7d,
0xbfa2ffea, 0xb8ef1e06,
0x8b6fc16f, 0xbfa1000f,
0x846f836f, 0x806f7d6f,
0xbefe00c1, 0xbeff0080,
0xc4050078, 0x008ce800,
0x00000000, 0xbf8a0000,
0x7e008500, 0x807d817d,
0x8078ff78, 0x00000080,
0xbf0a6f7d, 0xbfa2fff6,
0xbeff00c1, 0xc405006e,
0x008ce800, 0x00000000,
0xc405006e, 0x008ce801,
0x00010000, 0xc405006e,
0x008ce802, 0x00020000,
0xc405006e, 0x008ce803,
0x00030000, 0xbf8a0000,
0xb8f83b05, 0x80788178, 0xb8f83b05, 0x80788178,
0xbf0d9972, 0xbfa20002, 0xbf0d9972, 0xbfa20002,
0x84788978, 0xbfa00001, 0x84788978, 0xbfa00001,
0x84788a78, 0xb8ee1e06, 0x84788a78, 0xb8ee1e06,
0x846e8a6e, 0x80786e78, 0x846e8a6e, 0x80786e78,
0x8078ff78, 0x00000200, 0x8078ff78, 0x00000200,
0x80f8ff78, 0x00000050, 0x8078ff78, 0x00000080,
0xbef600ff, 0x01000000, 0xbef600ff, 0x01000000,
0xbefd00ff, 0x0000006c, 0x857d9972, 0x8b7d817d,
0x80f89078, 0xf462403a, 0xbf06817d, 0xbefd0080,
0xf0000000, 0xbf8a0000, 0xbfa2000d, 0xc4050078,
0x80fd847d, 0xbf800000, 0x0080e800, 0x00000000,
0xbe804300, 0xbe824302, 0xbf8a0000, 0xdac00000,
0x80f8a078, 0xf462603a, 0x00000000, 0x807dff7d,
0xf0000000, 0xbf8a0000, 0x00000080, 0x8078ff78,
0x80fd887d, 0xbf800000, 0x00000080, 0xbf0a6f7d,
0xbe804300, 0xbe824302, 0xbfa2fff4, 0xbfa0000c,
0xbe844304, 0xbe864306, 0xc4050078, 0x0080e800,
0x80f8c078, 0xf462803a, 0x00000000, 0xbf8a0000,
0xf0000000, 0xbf8a0000, 0xdac00000, 0x00000000,
0x80fd907d, 0xbf800000, 0x807dff7d, 0x00000100,
0xbe804300, 0xbe824302, 0x8078ff78, 0x00000100,
0xbe844304, 0xbe864306, 0xbf0a6f7d, 0xbfa2fff4,
0xbe884308, 0xbe8a430a, 0xbef80080, 0xbefe00c1,
0xbe8c430c, 0xbe8e430e, 0x857d9972, 0x8b7d817d,
0xbf06807d, 0xbfa1fff0, 0xbf06817d, 0xbfa20002,
0xb980f801, 0x00000000, 0xbeff0080, 0xbfa00001,
0xb8f83b05, 0x80788178, 0xbeff00c1, 0xb8ef3b05,
0xbf0d9972, 0xbfa20002, 0x806f816f, 0x846f826f,
0x84788978, 0xbfa00001, 0x857d9972, 0x8b7d817d,
0x84788a78, 0xb8ee1e06, 0xbf06817d, 0xbfa2002c,
0x846e8a6e, 0x80786e78, 0xbef600ff, 0x01000000,
0xbeee0078, 0x8078ff78,
0x00000200, 0xbefd0084,
0xbf0a6f7d, 0xbfa10061,
0xc4050078, 0x008ce800,
0x00000000, 0xc4050078,
0x008ce801, 0x00008000,
0xc4050078, 0x008ce802,
0x00010000, 0xc4050078,
0x008ce803, 0x00018000,
0xbf8a0000, 0x7e008500,
0x7e028501, 0x7e048502,
0x7e068503, 0x807d847d,
0x8078ff78, 0x00000200, 0x8078ff78, 0x00000200,
0xbf0a6f7d, 0xbfa2ffea,
0xc405006e, 0x008ce800,
0x00000000, 0xc405006e,
0x008ce801, 0x00008000,
0xc405006e, 0x008ce802,
0x00010000, 0xc405006e,
0x008ce803, 0x00018000,
0xbf8a0000, 0xbfa0003d,
0xbef600ff, 0x01000000, 0xbef600ff, 0x01000000,
0xbeff0071, 0xf4621bfa, 0xbeee0078, 0x8078ff78,
0x00000400, 0xbefd0084,
0xbf0a6f7d, 0xbfa10016,
0xc4050078, 0x008ce800,
0x00000000, 0xc4050078,
0x008ce801, 0x00010000,
0xc4050078, 0x008ce802,
0x00020000, 0xc4050078,
0x008ce803, 0x00030000,
0xbf8a0000, 0x7e008500,
0x7e028501, 0x7e048502,
0x7e068503, 0x807d847d,
0x8078ff78, 0x00000400,
0xbf0a6f7d, 0xbfa2ffea,
0xb8ef1e06, 0x8b6fc16f,
0xbfa1000f, 0x846f836f,
0x806f7d6f, 0xbefe00c1,
0xbeff0080, 0xc4050078,
0x008ce800, 0x00000000,
0xbf8a0000, 0x7e008500,
0x807d817d, 0x8078ff78,
0x00000080, 0xbf0a6f7d,
0xbfa2fff6, 0xbeff00c1,
0xc405006e, 0x008ce800,
0x00000000, 0xc405006e,
0x008ce801, 0x00010000,
0xc405006e, 0x008ce802,
0x00020000, 0xc405006e,
0x008ce803, 0x00030000,
0xbf8a0000, 0xb8f83b05,
0x80788178, 0xbf0d9972,
0xbfa20002, 0x84788978,
0xbfa00001, 0x84788a78,
0xb8ee1e06, 0x846e8a6e,
0x80786e78, 0x8078ff78,
0x00000200, 0x80f8ff78,
0x00000050, 0xbef600ff,
0x01000000, 0xbefd00ff,
0x0000006c, 0x80f89078,
0xf462403a, 0xf0000000,
0xbf8a0000, 0x80fd847d,
0xbf800000, 0xbe804300,
0xbe824302, 0x80f8a078,
0xf462603a, 0xf0000000,
0xbf8a0000, 0x80fd887d,
0xbf800000, 0xbe804300,
0xbe824302, 0xbe844304,
0xbe864306, 0x80f8c078,
0xf462803a, 0xf0000000,
0xbf8a0000, 0x80fd907d,
0xbf800000, 0xbe804300,
0xbe824302, 0xbe844304,
0xbe864306, 0xbe884308,
0xbe8a430a, 0xbe8c430c,
0xbe8e430e, 0xbf06807d,
0xbfa1fff0, 0xb980f801,
0x00000000, 0xb8f83b05,
0x80788178, 0xbf0d9972,
0xbfa20002, 0x84788978,
0xbfa00001, 0x84788a78,
0xb8ee1e06, 0x846e8a6e,
0x80786e78, 0x8078ff78,
0x00000200, 0xbef600ff,
0x01000000, 0xbeff0071,
0xf4621bfa, 0xf0000000,
0x80788478, 0xf4621b3a,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xf4621b3a, 0xf0000000, 0xf4621b7a, 0xf0000000,
0x80788478, 0xf4621b7a, 0x80788478, 0xf4621c3a,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xf4621c3a, 0xf0000000, 0xf4621c7a, 0xf0000000,
0x80788478, 0xf4621c7a, 0x80788478, 0xf4621eba,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xf4621eba, 0xf0000000, 0xf4621efa, 0xf0000000,
0x80788478, 0xf4621efa, 0x80788478, 0xf4621e7a,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xf4621e7a, 0xf0000000, 0xf4621cfa, 0xf0000000,
0x80788478, 0xf4621cfa, 0x80788478, 0xf4621bba,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xbf8a0000, 0xb96ef814,
0xf4621bba, 0xf0000000, 0xf4621bba, 0xf0000000,
0x80788478, 0xbf8a0000, 0x80788478, 0xbf8a0000,
0xb96ef814, 0xf4621bba, 0xb96ef815, 0xf4621bba,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xbf8a0000, 0xb96ef815, 0xbf8a0000, 0xb96ef812,
0xf4621bba, 0xf0000000, 0xf4621bba, 0xf0000000,
0x80788478, 0xbf8a0000, 0x80788478, 0xbf8a0000,
0xb96ef812, 0xf4621bba, 0xb96ef813, 0x8b6eff7f,
0x04000000, 0xbfa1000d,
0x80788478, 0xf4621bba,
0xf0000000, 0x80788478, 0xf0000000, 0x80788478,
0xbf8a0000, 0xb96ef813, 0xbf8a0000, 0xbf0d806e,
0x8b6eff7f, 0x04000000, 0xbfa10006, 0x856e906e,
0xbfa1000d, 0x80788478, 0x8b6e6e6e, 0xbfa10003,
0xf4621bba, 0xf0000000, 0xbe804ec1, 0x816ec16e,
0x80788478, 0xbf8a0000, 0xbfa0fffb, 0xbefd006f,
0xbf0d806e, 0xbfa10006, 0xbefe0070, 0xbeff0071,
0x856e906e, 0x8b6e6e6e, 0xb97b2011, 0x857b867b,
0xbfa10003, 0xbe804ec1, 0xb97b0191, 0x857b827b,
0x816ec16e, 0xbfa0fffb, 0xb97bba11, 0xb973f801,
0xb8ee3b05, 0x806e816e,
0xbf0d9972, 0xbfa20002,
0x846e896e, 0xbfa00001,
0x846e8a6e, 0xb8ef1e06,
0x846f8a6f, 0x806e6f6e,
0x806eff6e, 0x00000200,
0x806e746e, 0x826f8075,
0x8b6fff6f, 0x0000ffff,
0xf4605c37, 0xf8000050,
0xf4605d37, 0xf8000060,
0xf4601e77, 0xf8000074,
0xbf8a0000, 0x8b6dff6d,
0x0000ffff, 0x8bfe7e7e,
0x8bea6a6a, 0xb97af804,
0xbe804ec2, 0xbf94fffe, 0xbe804ec2, 0xbf94fffe,
0xbefd006f, 0xbefe0070, 0xbe804a6c, 0xbfb10000,
0xbeff0071, 0xb97bf811,
0xb973f801, 0xb8ee3b05,
0x806e816e, 0xbf0d9972,
0xbfa20002, 0x846e896e,
0xbfa00001, 0x846e8a6e,
0xb8ef1e06, 0x846f8a6f,
0x806e6f6e, 0x806eff6e,
0x00000200, 0x806e746e,
0x826f8075, 0x8b6fff6f,
0x0000ffff, 0xf4605c37,
0xf8000050, 0xf4605d37,
0xf8000060, 0xf4601e77,
0xf8000074, 0xbf8a0000,
0x8b6dff6d, 0x0000ffff,
0x8bfe7e7e, 0x8bea6a6a,
0xb97af804, 0xbe804a6c,
0xbfb10000, 0xbf9f0000,
0xbf9f0000, 0xbf9f0000, 0xbf9f0000, 0xbf9f0000,
0xbf9f0000, 0xbf9f0000, 0xbf9f0000, 0xbf9f0000,
0xbf9f0000, 0x00000000,
}; };
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
View file @ fda812eb
...@@ -75,17 +75,22 @@ var SQ_WAVE_STATUS_ECC_ERR_MASK = 0x20000 ...@@ -75,17 +75,22 @@ var SQ_WAVE_STATUS_ECC_ERR_MASK = 0x20000
var SQ_WAVE_STATUS_TRAP_EN_SHIFT = 6 var SQ_WAVE_STATUS_TRAP_EN_SHIFT = 6
var SQ_WAVE_IB_STS2_WAVE64_SHIFT = 11 var SQ_WAVE_IB_STS2_WAVE64_SHIFT = 11
var SQ_WAVE_IB_STS2_WAVE64_SIZE = 1 var SQ_WAVE_IB_STS2_WAVE64_SIZE = 1
var SQ_WAVE_LDS_ALLOC_GRANULARITY = 8
var S_STATUS_HWREG = HW_REG_STATUS var S_STATUS_HWREG = HW_REG_STATUS
var S_STATUS_ALWAYS_CLEAR_MASK = SQ_WAVE_STATUS_SPI_PRIO_MASK|SQ_WAVE_STATUS_ECC_ERR_MASK var S_STATUS_ALWAYS_CLEAR_MASK = SQ_WAVE_STATUS_SPI_PRIO_MASK|SQ_WAVE_STATUS_ECC_ERR_MASK
var S_STATUS_HALT_MASK = SQ_WAVE_STATUS_HALT_MASK var S_STATUS_HALT_MASK = SQ_WAVE_STATUS_HALT_MASK
var S_SAVE_PC_HI_TRAP_ID_MASK = 0x00FF0000 var S_SAVE_PC_HI_TRAP_ID_MASK = 0x00FF0000
var S_SAVE_PC_HI_HT_MASK = 0x01000000 var S_SAVE_PC_HI_HT_MASK = 0x01000000
#else #else
var SQ_WAVE_STATE_PRIV_BARRIER_COMPLETE_MASK = 0x4
var SQ_WAVE_STATE_PRIV_SCC_SHIFT = 9
var SQ_WAVE_STATE_PRIV_SYS_PRIO_MASK = 0xC00 var SQ_WAVE_STATE_PRIV_SYS_PRIO_MASK = 0xC00
var SQ_WAVE_STATE_PRIV_HALT_MASK = 0x4000 var SQ_WAVE_STATE_PRIV_HALT_MASK = 0x4000
var SQ_WAVE_STATE_PRIV_POISON_ERR_MASK = 0x8000 var SQ_WAVE_STATE_PRIV_POISON_ERR_MASK = 0x8000
var SQ_WAVE_STATE_PRIV_POISON_ERR_SHIFT = 15
var SQ_WAVE_STATUS_WAVE64_SHIFT = 29 var SQ_WAVE_STATUS_WAVE64_SHIFT = 29
var SQ_WAVE_STATUS_WAVE64_SIZE = 1 var SQ_WAVE_STATUS_WAVE64_SIZE = 1
var SQ_WAVE_LDS_ALLOC_GRANULARITY = 9
var S_STATUS_HWREG = HW_REG_WAVE_STATE_PRIV var S_STATUS_HWREG = HW_REG_WAVE_STATE_PRIV
var S_STATUS_ALWAYS_CLEAR_MASK = SQ_WAVE_STATE_PRIV_SYS_PRIO_MASK|SQ_WAVE_STATE_PRIV_POISON_ERR_MASK var S_STATUS_ALWAYS_CLEAR_MASK = SQ_WAVE_STATE_PRIV_SYS_PRIO_MASK|SQ_WAVE_STATE_PRIV_POISON_ERR_MASK
var S_STATUS_HALT_MASK = SQ_WAVE_STATE_PRIV_HALT_MASK var S_STATUS_HALT_MASK = SQ_WAVE_STATE_PRIV_HALT_MASK
...@@ -149,8 +154,10 @@ var SQ_WAVE_EXCP_FLAG_PRIV_MEM_VIOL_MASK = 0x10 ...@@ -149,8 +154,10 @@ var SQ_WAVE_EXCP_FLAG_PRIV_MEM_VIOL_MASK = 0x10
var SQ_WAVE_EXCP_FLAG_PRIV_SAVE_CONTEXT_SHIFT = 5 var SQ_WAVE_EXCP_FLAG_PRIV_SAVE_CONTEXT_SHIFT = 5
var SQ_WAVE_EXCP_FLAG_PRIV_SAVE_CONTEXT_MASK = 0x20 var SQ_WAVE_EXCP_FLAG_PRIV_SAVE_CONTEXT_MASK = 0x20
var SQ_WAVE_EXCP_FLAG_PRIV_ILLEGAL_INST_MASK = 0x40 var SQ_WAVE_EXCP_FLAG_PRIV_ILLEGAL_INST_MASK = 0x40
var SQ_WAVE_EXCP_FLAG_PRIV_ILLEGAL_INST_SHIFT = 6
var SQ_WAVE_EXCP_FLAG_PRIV_HOST_TRAP_MASK = 0x80 var SQ_WAVE_EXCP_FLAG_PRIV_HOST_TRAP_MASK = 0x80
var SQ_WAVE_EXCP_FLAG_PRIV_WAVE_START_MASK = 0x100 var SQ_WAVE_EXCP_FLAG_PRIV_WAVE_START_MASK = 0x100
var SQ_WAVE_EXCP_FLAG_PRIV_WAVE_START_SHIFT = 8
var SQ_WAVE_EXCP_FLAG_PRIV_WAVE_END_MASK = 0x200 var SQ_WAVE_EXCP_FLAG_PRIV_WAVE_END_MASK = 0x200
var SQ_WAVE_EXCP_FLAG_PRIV_TRAP_AFTER_INST_MASK = 0x800 var SQ_WAVE_EXCP_FLAG_PRIV_TRAP_AFTER_INST_MASK = 0x800
var SQ_WAVE_TRAP_CTRL_ADDR_WATCH_MASK = 0x80 var SQ_WAVE_TRAP_CTRL_ADDR_WATCH_MASK = 0x80
...@@ -430,7 +437,16 @@ L_EXIT_TRAP: ...@@ -430,7 +437,16 @@ L_EXIT_TRAP:
// Restore SQ_WAVE_STATUS. // Restore SQ_WAVE_STATUS.
s_and_b64 exec, exec, exec // Restore STATUS.EXECZ, not writable by s_setreg_b32 s_and_b64 exec, exec, exec // Restore STATUS.EXECZ, not writable by s_setreg_b32
s_and_b64 vcc, vcc, vcc // Restore STATUS.VCCZ, not writable by s_setreg_b32 s_and_b64 vcc, vcc, vcc // Restore STATUS.VCCZ, not writable by s_setreg_b32
#if ASIC_FAMILY < CHIP_GFX12
s_setreg_b32 hwreg(S_STATUS_HWREG), s_save_status s_setreg_b32 hwreg(S_STATUS_HWREG), s_save_status
#else
// STATE_PRIV.BARRIER_COMPLETE may have changed since we read it.
// Only restore fields which the trap handler changes.
s_lshr_b32 s_save_status, s_save_status, SQ_WAVE_STATE_PRIV_SCC_SHIFT
s_setreg_b32 hwreg(S_STATUS_HWREG, SQ_WAVE_STATE_PRIV_SCC_SHIFT, \
SQ_WAVE_STATE_PRIV_POISON_ERR_SHIFT - SQ_WAVE_STATE_PRIV_SCC_SHIFT + 1), s_save_status
#endif
s_rfe_b64 [ttmp0, ttmp1] s_rfe_b64 [ttmp0, ttmp1]
...@@ -622,8 +638,15 @@ L_SAVE_HWREG: ...@@ -622,8 +638,15 @@ L_SAVE_HWREG:
#if ASIC_FAMILY >= CHIP_GFX12 #if ASIC_FAMILY >= CHIP_GFX12
// Ensure no further changes to barrier or LDS state. // Ensure no further changes to barrier or LDS state.
// STATE_PRIV.BARRIER_COMPLETE may change up to this point.
s_barrier_signal -2 s_barrier_signal -2
s_barrier_wait -2 s_barrier_wait -2
// Re-read final state of BARRIER_COMPLETE field for save.
s_getreg_b32 s_save_tmp, hwreg(S_STATUS_HWREG)
s_and_b32 s_save_tmp, s_save_tmp, SQ_WAVE_STATE_PRIV_BARRIER_COMPLETE_MASK
s_andn2_b32 s_save_status, s_save_status, SQ_WAVE_STATE_PRIV_BARRIER_COMPLETE_MASK
s_or_b32 s_save_status, s_save_status, s_save_tmp
#endif #endif
write_hwreg_to_mem(s_save_m0, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_m0, s_save_buf_rsrc0, s_save_mem_offset)
...@@ -764,8 +787,7 @@ L_SAVE_LDS_NORMAL: ...@@ -764,8 +787,7 @@ L_SAVE_LDS_NORMAL:
// first wave do LDS save; // first wave do LDS save;
s_lshl_b32 s_save_alloc_size, s_save_alloc_size, 6 //LDS size in dwords = lds_size * 64dw s_lshl_b32 s_save_alloc_size, s_save_alloc_size, SQ_WAVE_LDS_ALLOC_GRANULARITY
s_lshl_b32 s_save_alloc_size, s_save_alloc_size, 2 //LDS size in bytes
s_mov_b32 s_save_buf_rsrc2, s_save_alloc_size //NUM_RECORDS in bytes s_mov_b32 s_save_buf_rsrc2, s_save_alloc_size //NUM_RECORDS in bytes
// LDS at offset: size(VGPR)+size(SVGPR)+SIZE(SGPR)+SIZE(HWREG) // LDS at offset: size(VGPR)+size(SVGPR)+SIZE(SGPR)+SIZE(HWREG)
...@@ -1050,8 +1072,7 @@ L_RESTORE_LDS_NORMAL: ...@@ -1050,8 +1072,7 @@ L_RESTORE_LDS_NORMAL:
s_getreg_b32 s_restore_alloc_size, hwreg(HW_REG_LDS_ALLOC,SQ_WAVE_LDS_ALLOC_LDS_SIZE_SHIFT,SQ_WAVE_LDS_ALLOC_LDS_SIZE_SIZE) s_getreg_b32 s_restore_alloc_size, hwreg(HW_REG_LDS_ALLOC,SQ_WAVE_LDS_ALLOC_LDS_SIZE_SHIFT,SQ_WAVE_LDS_ALLOC_LDS_SIZE_SIZE)
s_and_b32 s_restore_alloc_size, s_restore_alloc_size, 0xFFFFFFFF //lds_size is zero? s_and_b32 s_restore_alloc_size, s_restore_alloc_size, 0xFFFFFFFF //lds_size is zero?
s_cbranch_scc0 L_RESTORE_VGPR //no lds used? jump to L_RESTORE_VGPR s_cbranch_scc0 L_RESTORE_VGPR //no lds used? jump to L_RESTORE_VGPR
s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, 6 //LDS size in dwords = lds_size * 64dw s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, SQ_WAVE_LDS_ALLOC_GRANULARITY
s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, 2 //LDS size in bytes
s_mov_b32 s_restore_buf_rsrc2, s_restore_alloc_size //NUM_RECORDS in bytes s_mov_b32 s_restore_buf_rsrc2, s_restore_alloc_size //NUM_RECORDS in bytes
// LDS at offset: size(VGPR)+size(SVGPR)+SIZE(SGPR)+SIZE(HWREG) // LDS at offset: size(VGPR)+size(SVGPR)+SIZE(SGPR)+SIZE(HWREG)
...@@ -1338,9 +1359,6 @@ L_BARRIER_RESTORE_LOOP: ...@@ -1338,9 +1359,6 @@ L_BARRIER_RESTORE_LOOP:
s_branch L_BARRIER_RESTORE_LOOP s_branch L_BARRIER_RESTORE_LOOP
L_SKIP_BARRIER_RESTORE: L_SKIP_BARRIER_RESTORE:
// Make barrier and LDS state visible to all waves in the group.
s_barrier_signal -2
s_barrier_wait -2
#endif #endif
s_mov_b32 m0, s_restore_m0 s_mov_b32 m0, s_restore_m0
...@@ -1351,7 +1369,17 @@ L_SKIP_BARRIER_RESTORE: ...@@ -1351,7 +1369,17 @@ L_SKIP_BARRIER_RESTORE:
s_setreg_b32 hwreg(HW_REG_SHADER_XNACK_MASK), s_restore_xnack_mask s_setreg_b32 hwreg(HW_REG_SHADER_XNACK_MASK), s_restore_xnack_mask
#endif #endif
#if ASIC_FAMILY < CHIP_GFX12
s_setreg_b32 hwreg(S_TRAPSTS_HWREG), s_restore_trapsts s_setreg_b32 hwreg(S_TRAPSTS_HWREG), s_restore_trapsts
#else
// EXCP_FLAG_PRIV.SAVE_CONTEXT and HOST_TRAP may have changed.
// Only restore the other fields to avoid clobbering them.
s_setreg_b32 hwreg(S_TRAPSTS_HWREG, 0, SQ_WAVE_EXCP_FLAG_PRIV_SAVE_CONTEXT_SHIFT), s_restore_trapsts
s_lshr_b32 s_restore_trapsts, s_restore_trapsts, SQ_WAVE_EXCP_FLAG_PRIV_ILLEGAL_INST_SHIFT
s_setreg_b32 hwreg(S_TRAPSTS_HWREG, SQ_WAVE_EXCP_FLAG_PRIV_ILLEGAL_INST_SHIFT, 1), s_restore_trapsts
s_lshr_b32 s_restore_trapsts, s_restore_trapsts, SQ_WAVE_EXCP_FLAG_PRIV_WAVE_START_SHIFT - SQ_WAVE_EXCP_FLAG_PRIV_ILLEGAL_INST_SHIFT
s_setreg_b32 hwreg(S_TRAPSTS_HWREG, SQ_WAVE_EXCP_FLAG_PRIV_WAVE_START_SHIFT, 32 - SQ_WAVE_EXCP_FLAG_PRIV_WAVE_START_SHIFT), s_restore_trapsts
#endif
s_setreg_b32 hwreg(HW_REG_MODE), s_restore_mode s_setreg_b32 hwreg(HW_REG_MODE), s_restore_mode
// Restore trap temporaries 4-11, 13 initialized by SPI debug dispatch logic // Restore trap temporaries 4-11, 13 initialized by SPI debug dispatch logic
...@@ -1389,6 +1417,14 @@ L_RETURN_WITHOUT_PRIV: ...@@ -1389,6 +1417,14 @@ L_RETURN_WITHOUT_PRIV:
#endif #endif
s_setreg_b32 hwreg(S_STATUS_HWREG), s_restore_status // SCC is included, which is changed by previous salu s_setreg_b32 hwreg(S_STATUS_HWREG), s_restore_status // SCC is included, which is changed by previous salu
#if ASIC_FAMILY >= CHIP_GFX12
// Make barrier and LDS state visible to all waves in the group.
// STATE_PRIV.BARRIER_COMPLETE may change after this point.
s_barrier_signal -2
s_barrier_wait -2
#endif
s_rfe_b64 s_restore_pc_lo //Return to the main shader program and resume execution s_rfe_b64 s_restore_pc_lo //Return to the main shader program and resume execution
L_END_PGM: L_END_PGM:
...@@ -1501,11 +1537,6 @@ function write_vgprs_to_mem_with_sqc_w64(vgpr0, n_vgprs, s_rsrc, s_mem_offset) ...@@ -1501,11 +1537,6 @@ function write_vgprs_to_mem_with_sqc_w64(vgpr0, n_vgprs, s_rsrc, s_mem_offset)
end end
#endif #endif
function get_lds_size_bytes(s_lds_size_byte)
s_getreg_b32 s_lds_size_byte, hwreg(HW_REG_LDS_ALLOC, SQ_WAVE_LDS_ALLOC_LDS_SIZE_SHIFT, SQ_WAVE_LDS_ALLOC_LDS_SIZE_SIZE)
s_lshl_b32 s_lds_size_byte, s_lds_size_byte, 8 //LDS size in dwords = lds_size * 64 *4Bytes // granularity 64DW
end
function get_vgpr_size_bytes(s_vgpr_size_byte, s_size) function get_vgpr_size_bytes(s_vgpr_size_byte, s_size)
s_getreg_b32 s_vgpr_size_byte, hwreg(HW_REG_GPR_ALLOC,SQ_WAVE_GPR_ALLOC_VGPR_SIZE_SHIFT,SQ_WAVE_GPR_ALLOC_VGPR_SIZE_SIZE) s_getreg_b32 s_vgpr_size_byte, hwreg(HW_REG_GPR_ALLOC,SQ_WAVE_GPR_ALLOC_VGPR_SIZE_SHIFT,SQ_WAVE_GPR_ALLOC_VGPR_SIZE_SIZE)
s_add_u32 s_vgpr_size_byte, s_vgpr_size_byte, 1 s_add_u32 s_vgpr_size_byte, s_vgpr_size_byte, 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7