drm/xe/vf: Custom uC initialization

VF drivers can't modify WOPCM registers nor upload firmwares to
GuC, HuC or GSC.  Modify xe_uc initialization functions to skip
those steps if running in the VF mode, or defer to a new custom
helper function that would not include those steps.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604212231.1416-3-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2024-06-04 23:22:29 +02:00
parent 05e49e0c7c
commit d9cf98e79e

View File

@ -11,9 +11,11 @@
#include "xe_gsc_proxy.h"
#include "xe_gt.h"
#include "xe_gt_printk.h"
#include "xe_gt_sriov_vf.h"
#include "xe_guc.h"
#include "xe_guc_pc.h"
#include "xe_huc.h"
#include "xe_sriov.h"
#include "xe_uc_fw.h"
#include "xe_wopcm.h"
@ -53,6 +55,9 @@ int xe_uc_init(struct xe_uc *uc)
if (!xe_device_uc_enabled(uc_to_xe(uc)))
return 0;
if (IS_SRIOV_VF(uc_to_xe(uc)))
return 0;
ret = xe_wopcm_init(&uc->wopcm);
if (ret)
goto err;
@ -141,6 +146,31 @@ int xe_uc_init_hwconfig(struct xe_uc *uc)
return 0;
}
static int vf_uc_init_hw(struct xe_uc *uc)
{
int err;
err = xe_uc_sanitize_reset(uc);
if (err)
return err;
err = xe_guc_enable_communication(&uc->guc);
if (err)
return err;
err = xe_gt_sriov_vf_connect(uc_to_gt(uc));
if (err)
return err;
uc->guc.submission_state.enabled = true;
err = xe_gt_record_default_lrcs(uc_to_gt(uc));
if (err)
return err;
return 0;
}
/*
* Should be called during driver load, after every GT reset, and after every
* suspend to reload / auth the firmwares.
@ -153,6 +183,9 @@ int xe_uc_init_hw(struct xe_uc *uc)
if (!xe_device_uc_enabled(uc_to_xe(uc)))
return 0;
if (IS_SRIOV_VF(uc_to_xe(uc)))
return vf_uc_init_hw(uc);
ret = xe_huc_upload(&uc->huc);
if (ret)
return ret;