Patch "drm/xe: Ensure caller uses sole domain for xe_force_wake_assert_held" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/xe: Ensure caller uses sole domain for xe_force_wake_assert_held

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-xe-ensure-caller-uses-sole-domain-for-xe_force_w.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 1c9d45ffc8c3bcc04d66763f6459db51301777d1
Author: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>
Date:   Fri Jun 7 18:27:40 2024 +0530

    drm/xe: Ensure caller uses sole domain for xe_force_wake_assert_held
    
    [ Upstream commit 3541e19d0d3b30ad099c0c26ba87561aedfbd652 ]
    
    xe_force_wake_assert_held() is designed to confirm a particular
    forcewake domain's wakefulness; it doesn't verify the wakefulness of
    multiple domains. Make sure the caller doesn't input multiple
    domains(XE_FORCEWAKE_ALL) as a parameter.
    
    v2
    - use domain != XE_FORCEWAKE_ALL (Michal)
    
    v3
    - Add kernel-doc
    
    Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
    Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
    Cc: Badal Nilawar <badal.nilawar@xxxxxxxxx>
    Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>
    Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240607125741.1407331-1-himal.prasad.ghimiray@xxxxxxxxx
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/xe/xe_force_wake.h b/drivers/gpu/drm/xe/xe_force_wake.h
index 83cb157da7cc..8cbb04fe0ed9 100644
--- a/drivers/gpu/drm/xe/xe_force_wake.h
+++ b/drivers/gpu/drm/xe/xe_force_wake.h
@@ -28,10 +28,21 @@ xe_force_wake_ref(struct xe_force_wake *fw,
 	return fw->domains[ffs(domain) - 1].ref;
 }
 
+/**
+ * xe_force_wake_assert_held - asserts domain is awake
+ * @fw : xe_force_wake structure
+ * @domain: xe_force_wake_domains apart from XE_FORCEWAKE_ALL
+ *
+ * xe_force_wake_assert_held() is designed to confirm a particular
+ * forcewake domain's wakefulness; it doesn't verify the wakefulness of
+ * multiple domains. Make sure the caller doesn't input multiple
+ * domains(XE_FORCEWAKE_ALL) as a parameter.
+ */
 static inline void
 xe_force_wake_assert_held(struct xe_force_wake *fw,
 			  enum xe_force_wake_domains domain)
 {
+	xe_gt_assert(fw->gt, domain != XE_FORCEWAKE_ALL);
 	xe_gt_assert(fw->gt, fw->awake_domains & domain);
 }