tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/pf: Reset GuC VF config when unprovisioning critical resource

Browse Source 
[ Upstream commit 33f17e2cbd930a2a00eb007d9b241b6db010a880 ]

GuC firmware counts received VF configuration KLVs and may start
validation of the complete VF config even if some resources where
unprovisioned in the meantime, leading to unexpected errors like:

 $ echo 1 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/contexts_quota
 $ echo 0 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/contexts_quota
 $ echo 1 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/doorbells_quota
 $ echo 0 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/doorbells_quota
 $ echo 1 | sudo tee /sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/ggtt_quota
 tee: '/sys/kernel/debug/dri/0000:00:02.0/gt0/vf1/ggtt_quota': Input/output error

To mitigate this problem trigger explicit VF config reset after
unprovisioning any of the critical resources (GGTT, context or
doorbell IDs) that GuC is monitoring.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250129195947.764-3-michal.wajdeczko@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michal Wajdeczko
2025-01-29 20:59:47 +01:00
committed by Greg Kroah-Hartman
parent 63780d7352
commit 331c0af96c
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+33 -4
View File
@@ -323,6 +323,26 @@ static int pf_push_full_vf_config(struct xe_gt *gt, unsigned int vfid)
return err; return err;
} }
static int pf_push_vf_cfg(struct xe_gt *gt, unsigned int vfid, bool reset)
{
int err = 0;
xe_gt_assert(gt, vfid);
lockdep_assert_held(xe_gt_sriov_pf_master_mutex(gt));
if (reset)
err = pf_send_vf_cfg_reset(gt, vfid);
if (!err)
err = pf_push_full_vf_config(gt, vfid);
return err;
}
static int pf_refresh_vf_cfg(struct xe_gt *gt, unsigned int vfid)
{
return pf_push_vf_cfg(gt, vfid, true);
}
static u64 pf_get_ggtt_alignment(struct xe_gt *gt) static u64 pf_get_ggtt_alignment(struct xe_gt *gt)
{ {
struct xe_device *xe = gt_to_xe(gt); struct xe_device *xe = gt_to_xe(gt);
@@ -419,6 +439,10 @@ static int pf_provision_vf_ggtt(struct xe_gt *gt, unsigned int vfid, u64 size)
return err; return err;
pf_release_vf_config_ggtt(gt, config); pf_release_vf_config_ggtt(gt, config);
err = pf_refresh_vf_cfg(gt, vfid);
if (unlikely(err))
return err;
} }
xe_gt_assert(gt, !xe_ggtt_node_allocated(config->ggtt_region)); xe_gt_assert(gt, !xe_ggtt_node_allocated(config->ggtt_region));
@@ -744,6 +768,10 @@ static int pf_provision_vf_ctxs(struct xe_gt *gt, unsigned int vfid, u32 num_ctx
return ret; return ret;
pf_release_config_ctxs(gt, config); pf_release_config_ctxs(gt, config);
ret = pf_refresh_vf_cfg(gt, vfid);
if (unlikely(ret))
return ret;
} }
if (!num_ctxs) if (!num_ctxs)
@@ -1041,6 +1069,10 @@ static int pf_provision_vf_dbs(struct xe_gt *gt, unsigned int vfid, u32 num_dbs)
return ret; return ret;
pf_release_config_dbs(gt, config); pf_release_config_dbs(gt, config);
ret = pf_refresh_vf_cfg(gt, vfid);
if (unlikely(ret))
return ret;
} }
if (!num_dbs) if (!num_dbs)
@@ -2003,10 +2035,7 @@ int xe_gt_sriov_pf_config_push(struct xe_gt *gt, unsigned int vfid, bool refresh
xe_gt_assert(gt, vfid); xe_gt_assert(gt, vfid);
mutex_lock(xe_gt_sriov_pf_master_mutex(gt)); mutex_lock(xe_gt_sriov_pf_master_mutex(gt));
if (refresh) err = pf_push_vf_cfg(gt, vfid, refresh);
err = pf_send_vf_cfg_reset(gt, vfid);
if (!err)
err = pf_push_full_vf_config(gt, vfid);
mutex_unlock(xe_gt_sriov_pf_master_mutex(gt)); mutex_unlock(xe_gt_sriov_pf_master_mutex(gt));
if (unlikely(err)) { if (unlikely(err)) {