From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C84510F2870 for ; Fri, 27 Mar 2026 20:39:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D655710E492; Fri, 27 Mar 2026 20:39:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="P6cZqYtH"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id A85F210E492 for ; Fri, 27 Mar 2026 20:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1774643984; x=1806179984; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4DrgNc/l3wx1lmdMxYsbeJ4aWIgmL5raac7YwL3aCfE=; b=P6cZqYtHSZ/VJdSZxNWkwcF70WmDefnkhVz0vDwQZNSSRvbz7UvLNbvH /HDRCxHmitvn0pBpsWSe3x0JmELK7Kx9fqSZLfsEeyK6gkSQaS9WtLU5k e+6qFXGvDj5xAVWwQYaktqQQjLyO3Vx5vN30YDw8BUYx4feGCuFc1iU2v Y+eKyfhEVjqR3SwMl8Bt0fsYd6mCJaSuEJujfZwk71Y84DY5lFg+7c+3C ZukD/m2NqpY4vQc0nBwrYtbDfY6NegNsSfMtPmKWgShJjWSDRI7CgL6Fq sEVy1R+oGU1la11t8o7XXxz/wkmzWouNq7v4wwbSLeoPzHdHsBTTSbZCt w==; X-CSE-ConnectionGUID: /Fu9f9IwQKyfNdQMCG2+fQ== X-CSE-MsgGUID: X1q30hYIS/6jjkVd99IEzA== X-IronPort-AV: E=McAfee;i="6800,10657,11742"; a="93110319" X-IronPort-AV: E=Sophos;i="6.23,144,1770624000"; d="scan'208";a="93110319" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2026 13:39:44 -0700 X-CSE-ConnectionGUID: 2/BT0kJjSVyz+bNomZOhjQ== X-CSE-MsgGUID: +P05S5jqTfiJzqX2DC4yFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,144,1770624000"; d="scan'208";a="218794295" Received: from jraag-z790m-itx-wifi.iind.intel.com ([10.190.239.23]) by fmviesa009.fm.intel.com with ESMTP; 27 Mar 2026 13:39:40 -0700 From: Raag Jadav To: intel-xe@lists.freedesktop.org Cc: matthew.brost@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com, riana.tauro@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com, michal.winiarski@intel.com, matthew.auld@intel.com, maarten@lankhorst.se, jani.nikula@intel.com, lukasz.laguna@intel.com, zhanjun.dong@intel.com, Raag Jadav Subject: [PATCH v4 1/9] drm/xe/uc_fw: Allow re-initializing firmware Date: Sat, 28 Mar 2026 02:06:12 +0530 Message-ID: <20260327203620.809353-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260327203620.809353-1-raag.jadav@intel.com> References: <20260327203620.809353-1-raag.jadav@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" In preparation of usecases which require re-initializing firmware without reloading the driver, introduce xe_uc_fw_reinit(). The uC firmware bo already exists but since it's contents are on VRAM, they are lost on PCIe FLR. Copy the firmware back to it's bo and mark it as loadable as part of re-initialization. Signed-off-by: Raag Jadav --- v2: Add kernel doc (Matthew Brost) --- drivers/gpu/drm/xe/xe_uc_fw.c | 39 +++++++++++++++++++++++++++++------ drivers/gpu/drm/xe/xe_uc_fw.h | 1 + 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index 9cebb2490245..57701c6d18e0 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -704,13 +704,7 @@ static int uc_fw_request(struct xe_uc_fw *uc_fw, const struct firmware **firmwar const struct firmware *fw = NULL; int err; - /* - * we use FIRMWARE_UNINITIALIZED to detect checks against uc_fw->status - * before we're looked at the HW caps to see if we have uc support - */ BUILD_BUG_ON(XE_UC_FIRMWARE_UNINITIALIZED); - xe_gt_assert(gt, !uc_fw->status); - xe_gt_assert(gt, !uc_fw->path); uc_fw_auto_select(xe, uc_fw); @@ -823,6 +817,14 @@ static int uc_fw_copy(struct xe_uc_fw *uc_fw, const void *data, size_t size, u32 return err; } +static void uc_fw_reinit(struct xe_uc_fw *uc_fw, const void *data) +{ + struct xe_device *xe = uc_fw_to_xe(uc_fw); + + xe_map_memcpy_to(xe, &uc_fw->bo->vmap, 0, data, uc_fw->size); + xe_uc_fw_change_status(uc_fw, XE_UC_FIRMWARE_LOADABLE); +} + int xe_uc_fw_init(struct xe_uc_fw *uc_fw) { const struct firmware *fw = NULL; @@ -846,6 +848,31 @@ int xe_uc_fw_init(struct xe_uc_fw *uc_fw) } ALLOW_ERROR_INJECTION(xe_uc_fw_init, ERRNO); /* See xe_pci_probe() */ +/** + * xe_uc_fw_reinit() - Re-initialize uC firmware into its bo + * @uc_fw: uC firmware + * + * Returns: 0 on success, negative error code otherwise. + */ +int xe_uc_fw_reinit(struct xe_uc_fw *uc_fw) +{ + const struct firmware *fw = NULL; + int err; + + err = uc_fw_request(uc_fw, &fw); + if (err) + return err; + + /* no error and no firmware means nothing to copy */ + if (!fw) + return 0; + + uc_fw_reinit(uc_fw, fw->data); + uc_fw_release(fw); + + return err; +} + static u32 uc_fw_ggtt_offset(struct xe_uc_fw *uc_fw) { return xe_bo_ggtt_addr(uc_fw->bo); diff --git a/drivers/gpu/drm/xe/xe_uc_fw.h b/drivers/gpu/drm/xe/xe_uc_fw.h index 6195e353f269..a73935b976d5 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.h +++ b/drivers/gpu/drm/xe/xe_uc_fw.h @@ -15,6 +15,7 @@ struct drm_printer; int xe_uc_fw_init(struct xe_uc_fw *uc_fw); +int xe_uc_fw_reinit(struct xe_uc_fw *uc_fw); size_t xe_uc_fw_copy_rsa(struct xe_uc_fw *uc_fw, void *dst, u32 max_len); int xe_uc_fw_upload(struct xe_uc_fw *uc_fw, u32 offset, u32 dma_flags); int xe_uc_fw_check_version_requirements(struct xe_uc_fw *uc_fw); -- 2.43.0