FAILED: patch "[PATCH] drm/xe/rtp: Maintain OA whitelists separately" failed to apply to 7.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 7.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-7.1.y
git checkout FETCH_HEAD
git cherry-pick -x 31e2437561621b4867c08efc890bf629d017df03
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072958-unmasked-acting-7c2a@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 31e2437561621b4867c08efc890bf629d017df03 Mon Sep 17 00:00:00 2001
From: Ashutosh Dixit <[email protected]>
Date: Mon, 15 Jun 2026 15:42:20 -0700
Subject: [PATCH] drm/xe/rtp: Maintain OA whitelists separately
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
OA registers are dynamically whitelisted (and again dewhitelisted) on OA stream open/close. Maintaining OA whitelists separately from non-OA register whitlists simplifies this management of OA register whitelisting/dewhitelisting.
drivers/gpu/drm/xe/xe_gt_debugfs.c +3 -1
@@ -149,8 +149,10 @@ static int register_save_restore(struct xe_gt *gt, struct drm_printer *p)drm_printf (p,"\n" );drm_printf (p,"Whitelist\n" ); -for_each_hw_engine (hwe, gt, id) +for_each_hw_engine (hwe, gt, id) {xe_reg_whitelist_dump (&hwe->reg_whitelist, p); +xe_reg_whitelist_dump (&hwe->oa_whitelist, p); + }return 0 ; }
drivers/gpu/drm/xe/xe_hw_engine.c +2 -0
@@ -572,6 +572,8 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe,hw_engine_setup_default_state (hwe);xe_reg_sr_init (&hwe->reg_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_sr, hwe->name,gt_to_xe (gt));xe_reg_whitelist_process_engine (hwe); }
drivers/gpu/drm/xe/xe_hw_engine_types.h +8 -0
@@ -130,6 +130,14 @@ struct xe_hw_engine {* @reg_whitelist: table with registers to be whitelisted */ struct xe_reg_sr reg_whitelist; +/** +* @oa_whitelist: oa registers to be whitelisted +*/ +struct xe_reg_sr oa_whitelist; +/** +* @oa_sr: oa nonpriv whitelist registers, changed on oa stream open/close +*/ +struct xe_reg_sr oa_sr;/** * @reg_lrc: LRC workaround registers */
drivers/gpu/drm/xe/xe_reg_whitelist.c +5 -0
@@ -103,6 +103,9 @@ static const struct xe_rtp_table_sr register_whitelist = XE_RTP_TABLE_SR(WHITELIST (VFLSKPD , RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, +); + +static const struct xe_rtp_table_sr oa_whitelist =XE_RTP_TABLE_SR ( #define WHITELIST_DENY(r, f) WHITELIST(r, (f) | RING_FORCE_TO_NONPRIV_DENY)
@@ -206,6 +209,8 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe)xe_rtp_process_to_sr (&ctx, ®ister_whitelist, &hwe->reg_whitelist, false);whitelist_apply_to_hwe (hwe); + +xe_rtp_process_to_sr (&ctx, &oa_whitelist, &hwe->oa_whitelist, false); }/**
Sasha Levin
maintainerPATCH 1/1 drm/xe/rtp: Maintain OA whitelists separately
From: Ashutosh Dixit <[email protected]>
[ Upstream commit 31e2437561621b4867c08efc890bf629d017df03 ]
OA registers are dynamically whitelisted (and again dewhitelisted) on OA stream open/close. Maintaining OA whitelists separately from non-OA register whitlists simplifies this management of OA register whitelisting/dewhitelisting.
--- drivers/gpu/drm/xe/xe_gt_debugfs.c | 4 +++- drivers/gpu/drm/xe/xe_hw_engine.c | 2 ++ drivers/gpu/drm/xe/xe_hw_engine_types.h | 8 ++++++++ drivers/gpu/drm/xe/xe_reg_whitelist.c | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_gt_debugfs.c +3 -1
@@ -149,8 +149,10 @@ static int register_save_restore(struct xe_gt *gt, struct drm_printer *p)drm_printf (p,"\n" );drm_printf (p,"Whitelist\n" ); -for_each_hw_engine (hwe, gt, id) +for_each_hw_engine (hwe, gt, id) {xe_reg_whitelist_dump (&hwe->reg_whitelist, p); +xe_reg_whitelist_dump (&hwe->oa_whitelist, p); + }return 0 ; }
drivers/gpu/drm/xe/xe_hw_engine.c +2 -0
@@ -575,6 +575,8 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe,hw_engine_setup_default_state (hwe);xe_reg_sr_init (&hwe->reg_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_sr, hwe->name,gt_to_xe (gt));xe_reg_whitelist_process_engine (hwe); }
drivers/gpu/drm/xe/xe_hw_engine_types.h +8 -0
@@ -128,6 +128,14 @@ struct xe_hw_engine {* @reg_whitelist: table with registers to be whitelisted */ struct xe_reg_sr reg_whitelist; +/** +* @oa_whitelist: oa registers to be whitelisted +*/ +struct xe_reg_sr oa_whitelist; +/** +* @oa_sr: oa nonpriv whitelist registers, changed on oa stream open/close +*/ +struct xe_reg_sr oa_sr;/** * @reg_lrc: LRC workaround registers */
drivers/gpu/drm/xe/xe_reg_whitelist.c +6 -0
@@ -89,6 +89,9 @@ static const struct xe_rtp_entry_sr register_whitelist[] = {WHITELIST (VFLSKPD , RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, +}; + +static const struct xe_rtp_entry_sr oa_whitelist[] = { #define WHITELIST_OA_MMIO_TRG(trg, status, head) \WHITELIST (trg,RING_FORCE_TO_NONPRIV_ACCESS_RW ), \
@@ -191,6 +194,9 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe)xe_rtp_process_to_sr (&ctx, register_whitelist,ARRAY_SIZE (register_whitelist), &hwe->reg_whitelist, false);whitelist_apply_to_hwe (hwe); + +xe_rtp_process_to_sr (&ctx, oa_whitelist,ARRAY_SIZE (oa_whitelist), + &hwe->oa_whitelist, false); }/**
Signature · 1 line
2.53.0
Re: [PATCH 7.1.y] drm/xe/rtp: Maintain OA whitelists separately
Quoted 1 line · Sasha Levin
Hi Sasha/Greg,
The patch below is correct. However, because you will encounter conflicts in other patches of this series too, I have backported the entire series for linux-7.1.y here:
https://lore.kernel.org/stable/[email protected]/
Will it be possible to apply the patches from the above link instead? Since it will save us some work.
I will also send backports of this series to linux-6.12.y and linux-6.18.y.
Sorry, I am not too sure of the process to follow here. So if it needs to be done differently please let me know.
Thanks.
--
Ashutosh
Quoted 100 lines
From: Ashutosh Dixit <[email protected]>
[ Upstream commit
31e2437561621b4867c08efc890bf629d017df03]OA registers are dynamically whitelisted (and again dewhitelisted) on OA stream open/close. Maintaining OA whitelists separately from non-OA register whitlists simplifies this management of OA register whitelisting/dewhitelisting.
Fixes 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support")Cc [email protected] # v6.12+Signed-off-by Ashutosh Dixit <[email protected]>Reviewed-by Umesh Nerlige Ramappa <[email protected]>(cherry picked from commit c478244a9e2d14b3f1f92e8bd293919e554622a5)Signed-off-by Thomas Hellström <[email protected]>[ adapted RTP table from struct wrapper macro `XE_RTP_TABLE_SR()` back to plain `struct xe_rtp_entry_sr[]` array and restored the 5-arg `xe_rtp_process_to_sr()` call with `ARRAY_SIZE()` ]Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/xe/xe_gt_debugfs.c | 4 +++- drivers/gpu/drm/xe/xe_hw_engine.c | 2 ++ drivers/gpu/drm/xe/xe_hw_engine_types.h | 8 ++++++++ drivers/gpu/drm/xe/xe_reg_whitelist.c | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-)drivers/gpu/drm/xe/xe_gt_debugfs.c +3
-1@@ -149,8 +149,10 @@ static int register_save_restore(struct xe_gt *gt, struct drm_printer *p)drm_printf (p,"\n" );drm_printf (p,"Whitelist\n" ); -for_each_hw_engine (hwe, gt, id) +for_each_hw_engine (hwe, gt, id) {xe_reg_whitelist_dump (&hwe->reg_whitelist, p); +xe_reg_whitelist_dump (&hwe->oa_whitelist, p); + }return 0 ; }drivers/gpu/drm/xe/xe_hw_engine.c +2
-0@@ -575,6 +575,8 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe,hw_engine_setup_default_state (hwe);xe_reg_sr_init (&hwe->reg_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_sr, hwe->name,gt_to_xe (gt));xe_reg_whitelist_process_engine (hwe); }drivers/gpu/drm/xe/xe_hw_engine_types.h +8
-0@@ -128,6 +128,14 @@ struct xe_hw_engine {* @reg_whitelist: table with registers to be whitelisted */ struct xe_reg_sr reg_whitelist; +/** +* @oa_whitelist: oa registers to be whitelisted +*/ +struct xe_reg_sr oa_whitelist; +/** +* @oa_sr: oa nonpriv whitelist registers, changed on oa stream open/close +*/ +struct xe_reg_sr oa_sr;/** * @reg_lrc: LRC workaround registers */ drivers/gpu/drm/xe/xe_reg_whitelist.c +6
-1@@ -89,6 +89,9 @@ static const struct xe_rtp_entry_sr register_whitelist[] = {WHITELIST (VFLSKPD , RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, +}; + +static const struct xe_rtp_entry_sr oa_whitelist[] = { #define WHITELIST_OA_MMIO_TRG(trg, status, head) \WHITELIST (trg,RING_FORCE_TO_NONPRIV_ACCESS_RW ), \@@ -191,6 +194,9 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe)xe_rtp_process_to_sr (&ctx, register_whitelist,ARRAY_SIZE (register_whitelist), &hwe->reg_whitelist, false);whitelist_apply_to_hwe (hwe); + +xe_rtp_process_to_sr (&ctx, oa_whitelist,ARRAY_SIZE (oa_whitelist), + &hwe->oa_whitelist, false); }/** -- 2.53.0
Re: [PATCH 7.1.y] drm/xe/rtp: Maintain OA whitelists separately
Quoted 10 lines · Ashutosh
Quoted 1 line · Sasha Levin
Hi Sasha/Greg,
The patch below is correct. However, because you will encounter conflicts in other patches of this series too, I have backported the entire series for linux-7.1.y here:
Quoted 6 lines
https://lore.kernel.org/stable/[email protected]/
Will it be possible to apply the patches from the above link instead? Since it will save us some work.
I will also send backports of this series to linux-6.12.y and linux-6.18.y.
Ports to linux-6.12.y and linux-6.18.y are here:
https://lore.kernel.org/stable/[email protected]/
https://lore.kernel.org/stable/[email protected]/
Quoted 107 lines
Sorry, I am not too sure of the process to follow here. So if it needs to be done differently please let me know.
Thanks.
--
AshutoshQuoted 100 lines
From: Ashutosh Dixit <[email protected]>
[ Upstream commit
31e2437561621b4867c08efc890bf629d017df03]OA registers are dynamically whitelisted (and again dewhitelisted) on OA stream open/close. Maintaining OA whitelists separately from non-OA register whitlists simplifies this management of OA register whitelisting/dewhitelisting.
Fixes 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support")Cc [email protected] # v6.12+Signed-off-by Ashutosh Dixit <[email protected]>Reviewed-by Umesh Nerlige Ramappa <[email protected]>(cherry picked from commit c478244a9e2d14b3f1f92e8bd293919e554622a5)Signed-off-by Thomas Hellström <[email protected]>[ adapted RTP table from struct wrapper macro `XE_RTP_TABLE_SR()` back to plain `struct xe_rtp_entry_sr[]` array and restored the 5-arg `xe_rtp_process_to_sr()` call with `ARRAY_SIZE()` ]Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/xe/xe_gt_debugfs.c | 4 +++- drivers/gpu/drm/xe/xe_hw_engine.c | 2 ++ drivers/gpu/drm/xe/xe_hw_engine_types.h | 8 ++++++++ drivers/gpu/drm/xe/xe_reg_whitelist.c | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-)drivers/gpu/drm/xe/xe_gt_debugfs.c +3
-1@@ -149,8 +149,10 @@ static int register_save_restore(struct xe_gt *gt, struct drm_printer *p)drm_printf (p,"\n" );drm_printf (p,"Whitelist\n" ); -for_each_hw_engine (hwe, gt, id) +for_each_hw_engine (hwe, gt, id) {xe_reg_whitelist_dump (&hwe->reg_whitelist, p); +xe_reg_whitelist_dump (&hwe->oa_whitelist, p); + }return 0 ; }drivers/gpu/drm/xe/xe_hw_engine.c +2
-0@@ -575,6 +575,8 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe,hw_engine_setup_default_state (hwe);xe_reg_sr_init (&hwe->reg_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_whitelist, hwe->name,gt_to_xe (gt)); +xe_reg_sr_init (&hwe->oa_sr, hwe->name,gt_to_xe (gt));xe_reg_whitelist_process_engine (hwe); }drivers/gpu/drm/xe/xe_hw_engine_types.h +8
-0@@ -128,6 +128,14 @@ struct xe_hw_engine {* @reg_whitelist: table with registers to be whitelisted */ struct xe_reg_sr reg_whitelist; +/** +* @oa_whitelist: oa registers to be whitelisted +*/ +struct xe_reg_sr oa_whitelist; +/** +* @oa_sr: oa nonpriv whitelist registers, changed on oa stream open/close +*/ +struct xe_reg_sr oa_sr;/** * @reg_lrc: LRC workaround registers */ drivers/gpu/drm/xe/xe_reg_whitelist.c +6
-1@@ -89,6 +89,9 @@ static const struct xe_rtp_entry_sr register_whitelist[] = {WHITELIST (VFLSKPD , RING_FORCE_TO_NONPRIV_ACCESS_RW)) }, +}; + +static const struct xe_rtp_entry_sr oa_whitelist[] = { #define WHITELIST_OA_MMIO_TRG(trg, status, head) \WHITELIST (trg,RING_FORCE_TO_NONPRIV_ACCESS_RW ), \@@ -191,6 +194,9 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe)xe_rtp_process_to_sr (&ctx, register_whitelist,ARRAY_SIZE (register_whitelist), &hwe->reg_whitelist, false);whitelist_apply_to_hwe (hwe); + +xe_rtp_process_to_sr (&ctx, oa_whitelist,ARRAY_SIZE (oa_whitelist), + &hwe->oa_whitelist, false); }/** -- 2.53.0