drm/xe: move memirq out of VF

Up until now only VF used Memory Based Interrupts (memirq).
Moving it out of VF to cater for other usages, specifically MSI-X.

Signed-off-by: Ilia Levi <ilia.levi@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918053942.1331811-4-illevi@habana.ai

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index dee25309f2392222359dfaa52849bdbf2f19d69c..cb5a9fd820cf541144753c96a90524d31832c333 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -676,7 +676,7 @@ int xe_device_probe(struct xe_device *xe)
                err = xe_ggtt_init_early(tile->mem.ggtt);
                if (err)
                        return err;
-               err = xe_memirq_init(&tile->sriov.vf.memirq);
+               err = xe_memirq_init(&tile->memirq);
                if (err)
                        return err;
        }

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 4507a5756a05f765a4176a2c6ab740bf31613a04..5ad96d283a7161ab4473017af180f8711c688493 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -226,14 +226,14 @@ struct xe_tile {
                        struct xe_lmtt lmtt;
                } pf;
                struct {
-                       /** @sriov.vf.memirq: Memory Based Interrupts. */
-                       struct xe_memirq memirq;
-
                        /** @sriov.vf.ggtt_balloon: GGTT regions excluded from use. */
                        struct xe_ggtt_node *ggtt_balloon[2];
                } vf;
        } sriov;
 
+       /** @memirq: Memory Based Interrupts. */
+       struct xe_memirq memirq;
+
        /** @pcode: tile's PCODE */
        struct {
                /** @pcode.lock: protecting tile's PCODE mailbox data */

diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index 1eb5bb7e877164b74d45ce0f43d9aa87c00fa5f2..b6cd5e941f1971b0fae9279b3c9248b7a4f9deff 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -866,7 +866,7 @@ int xe_guc_enable_communication(struct xe_guc *guc)
                struct xe_gt *gt = guc_to_gt(guc);
                struct xe_tile *tile = gt_to_tile(gt);
 
-               err = xe_memirq_init_guc(&tile->sriov.vf.memirq, guc);
+               err = xe_memirq_init_guc(&tile->memirq, guc);
                if (err)
                        return err;
        } else {

diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c
index 250036abec52bbd1adbbe6a8a25d4f9985bbd6f9..5eb7775c0fd20f4d4b1c78b80602f8bb310d00b3 100644 (file)
--- a/drivers/gpu/drm/xe/xe_irq.c
+++ b/drivers/gpu/drm/xe/xe_irq.c
@@ -567,7 +567,7 @@ static void vf_irq_reset(struct xe_device *xe)
 
        for_each_tile(tile, xe, id) {
                if (xe_device_has_memirq(xe))
-                       xe_memirq_reset(&tile->sriov.vf.memirq);
+                       xe_memirq_reset(&tile->memirq);
                else
                        gt_irq_reset(tile);
        }
@@ -610,7 +610,7 @@ static void vf_irq_postinstall(struct xe_device *xe)
 
        for_each_tile(tile, xe, id)
                if (xe_device_has_memirq(xe))
-                       xe_memirq_postinstall(&tile->sriov.vf.memirq);
+                       xe_memirq_postinstall(&tile->memirq);
 
        if (GRAPHICS_VERx100(xe) < 1210)
                xelp_intr_enable(xe, true);
@@ -653,7 +653,7 @@ static irqreturn_t vf_mem_irq_handler(int irq, void *arg)
        spin_unlock(&xe->irq.lock);
 
        for_each_tile(tile, xe, id)
-               xe_memirq_handler(&tile->sriov.vf.memirq);
+               xe_memirq_handler(&tile->memirq);
 
        return IRQ_HANDLED;
 }

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 50d9521ba9f56583d7dec9c6c1bd9e0dc04e350d..e40f48f4240f5b1aef63fb4db7e5a5bcc5188caa 100644 (file)
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -599,7 +599,7 @@ static void set_context_control(u32 *regs, struct xe_hw_engine *hwe)
 
 static void set_memory_based_intr(u32 *regs, struct xe_hw_engine *hwe)
 {
-       struct xe_memirq *memirq = &gt_to_tile(hwe->gt)->sriov.vf.memirq;
+       struct xe_memirq *memirq = &gt_to_tile(hwe->gt)->memirq;
        struct xe_device *xe = gt_to_xe(hwe->gt);
 
        if (!xe_device_uses_memirq(xe))

diff --git a/drivers/gpu/drm/xe/xe_memirq.c b/drivers/gpu/drm/xe/xe_memirq.c
index b48be52bf684b7288b289816b8ff7f54c919d116..8b12209d995a864eaec49f5c0ac0e3f9871fb598 100644 (file)
--- a/drivers/gpu/drm/xe/xe_memirq.c
+++ b/drivers/gpu/drm/xe/xe_memirq.c
@@ -19,7 +19,6 @@
 #include "xe_hw_engine.h"
 #include "xe_map.h"
 #include "xe_memirq.h"
-#include "xe_sriov.h"
 
 #define memirq_assert(m, condition)    xe_tile_assert(memirq_to_tile(m), condition)
 #define memirq_printk(m, _level, _fmt, ...)                    \
@@ -38,7 +37,7 @@
 
 static struct xe_tile *memirq_to_tile(struct xe_memirq *memirq)
 {
-       return container_of(memirq, struct xe_tile, sriov.vf.memirq);
+       return container_of(memirq, struct xe_tile, memirq);
 }
 
 static struct xe_device *memirq_to_xe(struct xe_memirq *memirq)
@@ -188,9 +187,7 @@ static void memirq_set_enable(struct xe_memirq *memirq, bool enable)
  *
  * These allocations are managed and will be implicitly released on unload.
  *
- * Note: This function shall be called only by the VF driver.
- *
- * If this function fails then VF driver won't be able to operate correctly.
+ * If this function fails then the driver won't be able to operate correctly.
  * If `Memory Based Interrupts`_ are not used this function will return 0.
  *
  * Return: 0 on success or a negative error code on failure.
@@ -217,7 +214,7 @@ int xe_memirq_init(struct xe_memirq *memirq)
  * xe_memirq_source_ptr - Get GGTT's offset of the `Interrupt Source Report Page`_.
  * @memirq: the &xe_memirq to query
  *
- * Shall be called only on VF driver when `Memory Based Interrupts`_ are used
+ * Shall be called when `Memory Based Interrupts`_ are used
  * and xe_memirq_init() didn't fail.
  *
  * Return: GGTT's offset of the `Interrupt Source Report Page`_.
@@ -234,7 +231,7 @@ u32 xe_memirq_source_ptr(struct xe_memirq *memirq)
  * xe_memirq_status_ptr - Get GGTT's offset of the `Interrupt Status Report Page`_.
  * @memirq: the &xe_memirq to query
  *
- * Shall be called only on VF driver when `Memory Based Interrupts`_ are used
+ * Shall be called when `Memory Based Interrupts`_ are used
  * and xe_memirq_init() didn't fail.
  *
  * Return: GGTT's offset of the `Interrupt Status Report Page`_.
@@ -251,7 +248,7 @@ u32 xe_memirq_status_ptr(struct xe_memirq *memirq)
  * xe_memirq_enable_ptr - Get GGTT's offset of the Interrupt Enable Mask.
  * @memirq: the &xe_memirq to query
  *
- * Shall be called only on VF driver when `Memory Based Interrupts`_ are used
+ * Shall be called when `Memory Based Interrupts`_ are used
  * and xe_memirq_init() didn't fail.
  *
  * Return: GGTT's offset of the Interrupt Enable Mask.
@@ -272,7 +269,7 @@ u32 xe_memirq_enable_ptr(struct xe_memirq *memirq)
  * Register `Interrupt Source Report Page`_ and `Interrupt Status Report Page`_
  * to be used by the GuC when `Memory Based Interrupts`_ are required.
  *
- * Shall be called only on VF driver when `Memory Based Interrupts`_ are used
+ * Shall be called when `Memory Based Interrupts`_ are used
  * and xe_memirq_init() didn't fail.
  *
  * Return: 0 on success or a negative error code on failure.
@@ -314,7 +311,7 @@ failed:
  *
  * This is part of the driver IRQ setup flow.
  *
- * This function shall only be used by the VF driver on platforms that use
+ * This function shall only be used on platforms that use
  * `Memory Based Interrupts`_.
  */
 void xe_memirq_reset(struct xe_memirq *memirq)
@@ -331,7 +328,7 @@ void xe_memirq_reset(struct xe_memirq *memirq)
  *
  * This is part of the driver IRQ setup flow.
  *
- * This function shall only be used by the VF driver on platforms that use
+ * This function shall only be used on platforms that use
  * `Memory Based Interrupts`_.
  */
 void xe_memirq_postinstall(struct xe_memirq *memirq)