[PATCH 1/4] drm/xe/rtp: Prepare RTP to define SR-IOV specific rules

[Michal Wajdeczko]

All currently defined workaround actions are dedicated for the
driver running in a privileged mode (native or SR-IOV PF) and
those actions should not be used when running in SR-IOV VF mode.

While we can easily skip any attempt to apply tile, engine or
LRC workarounds by doing early exit, it's not so easy with OOB
workarounds, as on exception basis, there could be some actions
expected to be done also by the VF driver.

Since we process OOB rules also in the SR-IOV VF mode, we had to
explicitly decline the ones that were not applicable for VF, by
using FUNC(xe_rtp_match_not_sriov_vf), however that may not
scale well, since most future workarounds will likely not be
needed in VF mode.

Instead of forcing us to append more and more FUNC(not_sriov_vf)
to potentially every new OOB workaround, change the RTP logic
and assume that RTP rules are not applicable to VFs by default,
unless there will be added a special SRIOV(VF_READY) rule.

For completeness define also SRIOV(ONLY) to require PF or VF mode,
SRIOV(PF_ONLY) to require PF mode and SRIOV(VF_ONLY) for VF mode.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Lucas De Marchi <lucas.demarchi at intel.com>
Cc: Matt Roper <matthew.d.roper at intel.com>
---
 drivers/gpu/drm/xe/xe_rtp.c       | 20 +++++++++++++++++++-
 drivers/gpu/drm/xe/xe_rtp.h       |  8 ++++++++
 drivers/gpu/drm/xe/xe_rtp_types.h |  4 ++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_rtp.c b/drivers/gpu/drm/xe/xe_rtp.c
index 7a1c78fdfc92..b607be981590 100644
--- a/drivers/gpu/drm/xe/xe_rtp.c
+++ b/drivers/gpu/drm/xe/xe_rtp.c
@@ -37,6 +37,7 @@ static bool rule_matches(const struct xe_device *xe,
 {
 	const struct xe_rtp_rule *r;
 	unsigned int i, rcount = 0;
+	bool vf_ready = false;
 	bool match;
 
 	for (r = rules, i = 0; i < n_rules; r = &rules[++i]) {
@@ -110,6 +111,22 @@ static bool rule_matches(const struct xe_device *xe,
 		case XE_RTP_MATCH_FUNC:
 			match = r->match_func(gt, hwe);
 			break;
+		case XE_RTP_MATCH_SRIOV_VF_READY:
+			match = true;
+			vf_ready = true;
+			break;
+		case XE_RTP_MATCH_SRIOV_VF_ONLY:
+			match = IS_SRIOV_VF(xe);
+			vf_ready = match;
+			break;
+		case XE_RTP_MATCH_SRIOV_PF_ONLY:
+			match = IS_SRIOV_PF(xe);
+			vf_ready = false;
+			break;
+		case XE_RTP_MATCH_SRIOV_ONLY:
+			match = IS_SRIOV(xe);
+			vf_ready = match;
+			break;
 		default:
 			drm_warn(&xe->drm, "Invalid RTP match %u\n",
 				 r->match_type);
@@ -128,6 +145,7 @@ static bool rule_matches(const struct xe_device *xe,
 				return false;
 
 			rcount = 0;
+			vf_ready = false;
 		} else {
 			rcount++;
 		}
@@ -137,7 +155,7 @@ static bool rule_matches(const struct xe_device *xe,
 	if (drm_WARN_ON(&xe->drm, !rcount))
 		return false;
 
-	return true;
+	return IS_SRIOV_VF(xe) ? vf_ready : true;
 }
 
 static void rtp_add_sr_entry(const struct xe_rtp_action *action,
diff --git a/drivers/gpu/drm/xe/xe_rtp.h b/drivers/gpu/drm/xe/xe_rtp.h
index 38b9f13bba5e..7874ea8588db 100644
--- a/drivers/gpu/drm/xe/xe_rtp.h
+++ b/drivers/gpu/drm/xe/xe_rtp.h
@@ -207,6 +207,14 @@ struct xe_reg_sr;
 #define XE_RTP_RULE_IS_DISCRETE							\
 	{ .match_type = XE_RTP_MATCH_DISCRETE }
 
+/**
+ * XE_RTP_RULE_SRIOV - Create a SR-IOV rule for Virtual Functions
+ *
+ * Refer to XE_RTP_RULES() for expected usage.
+ */
+#define XE_RTP_RULE_SRIOV(TAG)							\
+	{ .match_type = XE_RTP_MATCH_SRIOV_##TAG }
+
 /**
  * XE_RTP_RULE_OR - Create an OR condition for rtp rules
  *
diff --git a/drivers/gpu/drm/xe/xe_rtp_types.h b/drivers/gpu/drm/xe/xe_rtp_types.h
index 1b76b947c706..02c4e67906cc 100644
--- a/drivers/gpu/drm/xe/xe_rtp_types.h
+++ b/drivers/gpu/drm/xe/xe_rtp_types.h
@@ -53,6 +53,10 @@ enum {
 	XE_RTP_MATCH_ENGINE_CLASS,
 	XE_RTP_MATCH_NOT_ENGINE_CLASS,
 	XE_RTP_MATCH_FUNC,
+	XE_RTP_MATCH_SRIOV_VF_READY,
+	XE_RTP_MATCH_SRIOV_VF_ONLY,
+	XE_RTP_MATCH_SRIOV_PF_ONLY,
+	XE_RTP_MATCH_SRIOV_ONLY,
 	XE_RTP_MATCH_OR,
 };
 
-- 
2.47.1