[PATCH v2 07/14] drm/xe: Cleanup unwind of gt initialization
Lucas De Marchi
lucas.demarchi at intel.com
Fri Feb 7 00:45:48 UTC 2025
On Thu, Feb 06, 2025 at 04:21:26PM -0800, Daniele Ceraolo Spurio wrote:
>
>
>On 2/6/2025 3:23 PM, Lucas De Marchi wrote:
>>The only thing in xe_gt_remove() that really needs to happen on the
>>device remove callback is the xe_uc_remove(). That's because of the
>>following call chain:
>>
>> xe_gt_remove()
>> xe_uc_remove()
>> xe_gsc_remove()
>> xe_gsc_proxy_remove()
>>
>>Move xe_gsc_proxy_remove() to be handled as a xe_device_remove_action,
>>so it's recorded when it should run during device removal. The rest can
>>be handled normally by devm infra.
>>
>>Besides removing the deep call chain above, xe_device_probe() doesn't
>>have to unwind the gt loop and it's also more in line with the
>>xe_device_probe() style.
>>
>>Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
>>Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>>Cc: Thomas Hellström <thomas.hellstrom at linux.intel.com>
>>Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>>---
>> drivers/gpu/drm/xe/xe_device.c | 21 +----------
>> drivers/gpu/drm/xe/xe_gsc.c | 9 -----
>> drivers/gpu/drm/xe/xe_gsc.h | 1 -
>> drivers/gpu/drm/xe/xe_gsc_proxy.c | 63 +++++++++++++++----------------
>> drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 -
>> drivers/gpu/drm/xe/xe_gsc_types.h | 3 ++
>> drivers/gpu/drm/xe/xe_gt.c | 35 ++++++++---------
>> drivers/gpu/drm/xe/xe_gt.h | 1 -
>> drivers/gpu/drm/xe/xe_uc.c | 13 -------
>> drivers/gpu/drm/xe/xe_uc.h | 1 -
>> 10 files changed, 50 insertions(+), 98 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
>>index 5fc4e696262f9..09288558e4e44 100644
>>--- a/drivers/gpu/drm/xe/xe_device.c
>>+++ b/drivers/gpu/drm/xe/xe_device.c
>>@@ -744,7 +744,6 @@ int xe_device_probe(struct xe_device *xe)
>> struct xe_tile *tile;
>> struct xe_gt *gt;
>> int err;
>>- u8 last_gt;
>> u8 id;
>> xe->probing = true;
>>@@ -855,18 +854,16 @@ int xe_device_probe(struct xe_device *xe)
>> return err;
>> for_each_gt(gt, xe, id) {
>>- last_gt = id;
>>-
>> err = xe_gt_init(gt);
>> if (err)
>>- goto err_fini_gt;
>>+ return err;
>> }
>> xe_heci_gsc_init(xe);
>
>unrelated to this patch, but still tied to probe failures: AFAICS we
>don't call xe_heci_gsc_fini when the probe fails after this point.
yep...
>I'm not 100% sure, but it doesn't look like this is intentional for
>survivability mode (because that one has its own xe_heci_gsc_init/fini
>calls), so maybe xe_heci_gsc_fini is another candidate for using a
>remove_action callback? I don't think we can leave the child device
>cleanup to a devm call.
I started adding it, moving the xe->probing to be set on
xe_device_probe_early() to account for the survivability... but then
when reviewing the survivability enabling I got into a "coding
deadlock" -- I need to split the changes I have in xe_heci_ to be able
to do something like. Right now it's not very well integrated:
if something in xe_heci_ fails, we may have the situation that we enter
survivability mode but don't have it really working and no error
messages. Since this problem is already there, I decided to postpone
further refactors.
>
>> err = xe_oa_init(xe);
>> if (err)
>>- goto err_fini_gt;
>>+ return err;
>> err = xe_display_init(xe);
>> if (err)
>>@@ -905,14 +902,6 @@ int xe_device_probe(struct xe_device *xe)
>> err_fini_oa:
>> xe_oa_fini(xe);
>>-err_fini_gt:
>>- for_each_gt(gt, xe, id) {
>>- if (id < last_gt)
>>- xe_gt_remove(gt);
>>- else
>>- break;
>>- }
>>-
>> return err;
>> }
>>@@ -978,9 +967,6 @@ static void xe_device_remove_display(struct xe_device *xe)
>> void xe_device_remove(struct xe_device *xe)
>> {
>>- struct xe_gt *gt;
>>- u8 id;
>>-
>> xe_oa_unregister(xe);
>> xe_device_remove_display(xe);
>>@@ -989,9 +975,6 @@ void xe_device_remove(struct xe_device *xe)
>> xe_heci_gsc_fini(xe);
>>- for_each_gt(gt, xe, id)
>>- xe_gt_remove(gt);
>>-
>> xe_device_call_remove_actions(xe);
>> }
>>diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c
>>index 1eb791ddc375c..fd41113f85725 100644
>>--- a/drivers/gpu/drm/xe/xe_gsc.c
>>+++ b/drivers/gpu/drm/xe/xe_gsc.c
>>@@ -555,15 +555,6 @@ void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc)
>> flush_work(&gsc->work);
>> }
>>-/**
>>- * xe_gsc_remove() - Clean up the GSC structures before driver removal
>>- * @gsc: the GSC uC
>>- */
>>-void xe_gsc_remove(struct xe_gsc *gsc)
>>-{
>>- xe_gsc_proxy_remove(gsc);
>>-}
>>-
>> /*
>> * wa_14015076503: if the GSC FW is loaded, we need to alert it before doing a
>> * GSC engine reset by writing a notification bit in the GS1 register and then
>>diff --git a/drivers/gpu/drm/xe/xe_gsc.h b/drivers/gpu/drm/xe/xe_gsc.h
>>index e282b9ef6ec4d..d99f66c38075c 100644
>>--- a/drivers/gpu/drm/xe/xe_gsc.h
>>+++ b/drivers/gpu/drm/xe/xe_gsc.h
>>@@ -17,7 +17,6 @@ int xe_gsc_init(struct xe_gsc *gsc);
>> int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc);
>> void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc);
>> void xe_gsc_load_start(struct xe_gsc *gsc);
>>-void xe_gsc_remove(struct xe_gsc *gsc);
>> void xe_gsc_hwe_irq_handler(struct xe_hw_engine *hwe, u16 intr_vec);
>> void xe_gsc_wa_14015076503(struct xe_gt *gt, bool prep);
>>diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c
>>index 24cc6a4f9a96a..0da33d5e9b1c0 100644
>>--- a/drivers/gpu/drm/xe/xe_gsc_proxy.c
>>+++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c
>>@@ -423,6 +423,34 @@ static int proxy_channel_alloc(struct xe_gsc *gsc)
>> return 0;
>> }
>>+static void xe_gsc_proxy_remove(struct xe_device_remove_action *ra)
>>+{
>>+ struct xe_gsc *gsc = container_of(ra, struct xe_gsc, proxy.remove_action);
>>+ struct xe_gt *gt = gsc_to_gt(gsc);
>>+ struct xe_device *xe = gt_to_xe(gt);
>>+ unsigned int fw_ref = 0;
>>+
>>+ if (!gsc->proxy.component_added)
>>+ return;
>>+
>>+ /* disable HECI2 IRQs */
>>+ xe_pm_runtime_get(xe);
>>+ fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC);
>>+ if (!fw_ref)
>>+ xe_gt_err(gt, "failed to get forcewake to disable GSC interrupts\n");
>>+
>>+ /* try do disable irq even if forcewake failed */
>>+ gsc_proxy_irq_toggle(gsc, false);
>>+
>>+ xe_force_wake_put(gt_to_fw(gt), fw_ref);
>>+ xe_pm_runtime_put(xe);
>>+
>>+ xe_gsc_wait_for_worker_completion(gsc);
>>+
>>+ component_del(xe->drm.dev, &xe_gsc_proxy_component_ops);
>>+ gsc->proxy.component_added = false;
>>+}
>>+
>> /**
>> * xe_gsc_proxy_init() - init objects and MEI component required by GSC proxy
>> * @gsc: the GSC uC
>>@@ -461,43 +489,12 @@ int xe_gsc_proxy_init(struct xe_gsc *gsc)
>> }
>> gsc->proxy.component_added = true;
>>-
>>- /* the component must be removed before unload, so can't use drmm for cleanup */
>>+ xe_device_add_remove_action(xe, &gsc->proxy.remove_action,
>>+ xe_gsc_proxy_remove);
>> return 0;
>> }
>>-/**
>>- * xe_gsc_proxy_remove() - remove the GSC proxy MEI component
>>- * @gsc: the GSC uC
>>- */
>>-void xe_gsc_proxy_remove(struct xe_gsc *gsc)
>>-{
>>- struct xe_gt *gt = gsc_to_gt(gsc);
>>- struct xe_device *xe = gt_to_xe(gt);
>>- unsigned int fw_ref = 0;
>>-
>>- if (!gsc->proxy.component_added)
>>- return;
>>-
>>- /* disable HECI2 IRQs */
>>- xe_pm_runtime_get(xe);
>>- fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC);
>>- if (!fw_ref)
>>- xe_gt_err(gt, "failed to get forcewake to disable GSC interrupts\n");
>>-
>>- /* try do disable irq even if forcewake failed */
>>- gsc_proxy_irq_toggle(gsc, false);
>>-
>>- xe_force_wake_put(gt_to_fw(gt), fw_ref);
>>- xe_pm_runtime_put(xe);
>>-
>>- xe_gsc_wait_for_worker_completion(gsc);
>>-
>>- component_del(xe->drm.dev, &xe_gsc_proxy_component_ops);
>>- gsc->proxy.component_added = false;
>>-}
>>-
>> /**
>> * xe_gsc_proxy_start() - start the proxy by submitting the first request
>> * @gsc: the GSC uC
>>diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.h b/drivers/gpu/drm/xe/xe_gsc_proxy.h
>>index c511ade6b8637..fdef56995cd43 100644
>>--- a/drivers/gpu/drm/xe/xe_gsc_proxy.h
>>+++ b/drivers/gpu/drm/xe/xe_gsc_proxy.h
>>@@ -12,7 +12,6 @@ struct xe_gsc;
>> int xe_gsc_proxy_init(struct xe_gsc *gsc);
>> bool xe_gsc_proxy_init_done(struct xe_gsc *gsc);
>>-void xe_gsc_proxy_remove(struct xe_gsc *gsc);
>> int xe_gsc_proxy_start(struct xe_gsc *gsc);
>> int xe_gsc_proxy_request_handler(struct xe_gsc *gsc);
>>diff --git a/drivers/gpu/drm/xe/xe_gsc_types.h b/drivers/gpu/drm/xe/xe_gsc_types.h
>>index 5926de20214c8..3649239f19622 100644
>>--- a/drivers/gpu/drm/xe/xe_gsc_types.h
>>+++ b/drivers/gpu/drm/xe/xe_gsc_types.h
>>@@ -13,6 +13,7 @@
>> #include <linux/workqueue.h>
>> #include "xe_uc_fw_types.h"
>>+#include "xe_device_types.h"
>> struct xe_bo;
>> struct xe_exec_queue;
>>@@ -57,6 +58,8 @@ struct xe_gsc {
>> struct mutex mutex;
>> /** @proxy.component_added: whether the component has been added */
>> bool component_added;
>>+ /** @proxy.remove_action */
>
>nit: should this have a description?
yep..
>
>Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
thanks
Lucas De Marchi
>
>Daniele
>
>>+ struct xe_device_remove_action remove_action;
>> /** @proxy.bo: object to store message to and from the GSC */
>> struct xe_bo *bo;
>> /** @proxy.to_gsc: map of the memory used to send messages to the GSC */
>>diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>>index 9fb8f1e678dc8..c33040278e1aa 100644
>>--- a/drivers/gpu/drm/xe/xe_gt.c
>>+++ b/drivers/gpu/drm/xe/xe_gt.c
>>@@ -141,26 +141,6 @@ static void xe_gt_disable_host_l2_vram(struct xe_gt *gt)
>> xe_force_wake_put(gt_to_fw(gt), fw_ref);
>> }
>>-/**
>>- * xe_gt_remove() - Clean up the GT structures before driver removal
>>- * @gt: the GT object
>>- *
>>- * This function should only act on objects/structures that must be cleaned
>>- * before the driver removal callback is complete and therefore can't be
>>- * deferred to a drmm action.
>>- */
>>-void xe_gt_remove(struct xe_gt *gt)
>>-{
>>- int i;
>>-
>>- xe_uc_remove(>->uc);
>>-
>>- for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i)
>>- xe_hw_fence_irq_finish(>->fence_irq[i]);
>>-
>>- xe_gt_disable_host_l2_vram(gt);
>>-}
>>-
>> static void gt_reset_worker(struct work_struct *w);
>> static int emit_nop_job(struct xe_gt *gt, struct xe_exec_queue *q)
>>@@ -583,6 +563,17 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)
>> return err;
>> }
>>+static void xe_gt_fini(void *arg)
>>+{
>>+ struct xe_gt *gt = arg;
>>+ int i;
>>+
>>+ for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i)
>>+ xe_hw_fence_irq_finish(>->fence_irq[i]);
>>+
>>+ xe_gt_disable_host_l2_vram(gt);
>>+}
>>+
>> int xe_gt_init(struct xe_gt *gt)
>> {
>> int err;
>>@@ -595,6 +586,10 @@ int xe_gt_init(struct xe_gt *gt)
>> xe_hw_fence_irq_init(>->fence_irq[i]);
>> }
>>+ err = devm_add_action_or_reset(gt_to_xe(gt)->drm.dev, xe_gt_fini, gt);
>>+ if (err)
>>+ return err;
>>+
>> err = xe_gt_pagefault_init(gt);
>> if (err)
>> return err;
>>diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
>>index e504cc33ade4f..187fa6490eafc 100644
>>--- a/drivers/gpu/drm/xe/xe_gt.h
>>+++ b/drivers/gpu/drm/xe/xe_gt.h
>>@@ -54,7 +54,6 @@ int xe_gt_resume(struct xe_gt *gt);
>> void xe_gt_reset_async(struct xe_gt *gt);
>> void xe_gt_sanitize(struct xe_gt *gt);
>> int xe_gt_sanitize_freq(struct xe_gt *gt);
>>-void xe_gt_remove(struct xe_gt *gt);
>> /**
>> * xe_gt_wait_for_reset - wait for gt's async reset to finalize.
>>diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
>>index 0d073a9987c2e..d8167e818280b 100644
>>--- a/drivers/gpu/drm/xe/xe_uc.c
>>+++ b/drivers/gpu/drm/xe/xe_uc.c
>>@@ -288,19 +288,6 @@ int xe_uc_suspend(struct xe_uc *uc)
>> return xe_guc_suspend(&uc->guc);
>> }
>>-/**
>>- * xe_uc_remove() - Clean up the UC structures before driver removal
>>- * @uc: the UC object
>>- *
>>- * This function should only act on objects/structures that must be cleaned
>>- * before the driver removal callback is complete and therefore can't be
>>- * deferred to a drmm action.
>>- */
>>-void xe_uc_remove(struct xe_uc *uc)
>>-{
>>- xe_gsc_remove(&uc->gsc);
>>-}
>>-
>> /**
>> * xe_uc_declare_wedged() - Declare UC wedged
>> * @uc: the UC object
>>diff --git a/drivers/gpu/drm/xe/xe_uc.h b/drivers/gpu/drm/xe/xe_uc.h
>>index 506517c113339..3813c1ede450e 100644
>>--- a/drivers/gpu/drm/xe/xe_uc.h
>>+++ b/drivers/gpu/drm/xe/xe_uc.h
>>@@ -20,7 +20,6 @@ void xe_uc_stop(struct xe_uc *uc);
>> int xe_uc_start(struct xe_uc *uc);
>> int xe_uc_suspend(struct xe_uc *uc);
>> int xe_uc_sanitize_reset(struct xe_uc *uc);
>>-void xe_uc_remove(struct xe_uc *uc);
>> void xe_uc_declare_wedged(struct xe_uc *uc);
>> #endif
>
More information about the Intel-xe
mailing list