From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> To: intel-gfx@lists.freedesktop.org Cc: John Harrison <John.C.Harrison@Intel.com>, Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>, Alan Previn <alan.previn.teres.alexis@intel.com>, dri-devel@lists.freedesktop.org Subject: [PATCH 2/6] drm/i915/gsc: Skip the version check when fetching the GSC FW Date: Mon, 21 Nov 2022 15:16:13 -0800 [thread overview] Message-ID: <20221121231617.1110329-3-daniele.ceraolospurio@intel.com> (raw) In-Reply-To: <20221121231617.1110329-1-daniele.ceraolospurio@intel.com> The current exectation from the FW side is that the driver will query the GSC FW version after the FW is loaded, similarly to what the mei driver does on DG2. However, we're discussing with the FW team if there is a way to extract the version from the bin file before loading, so we can keep the code the same as for older FWs. Since the GSC FW version is not currently required for functionality and is only needed for debug purposes, we can skip the FW version for now at fetch time and add it later on when we've agreed on the approach. Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Alan Previn <alan.previn.teres.alexis@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 29 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 5b2e4503aee7..3df52fd59edc 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -564,6 +564,26 @@ static int check_ccs_header(struct intel_gt *gt, return 0; } +static int check_fw_header(struct intel_gt *gt, + const struct firmware *fw, + struct intel_uc_fw *uc_fw) +{ + int err = 0; + + /* GSC FW version is queried after the FW is loaded */ + if (uc_fw->type == INTEL_UC_FW_TYPE_GSC) + return 0; + + if (uc_fw->loaded_via_gsc) + err = check_gsc_manifest(fw, uc_fw); + else + err = check_ccs_header(gt, fw, uc_fw); + if (err) + return err; + + return 0; +} + /** * intel_uc_fw_fetch - fetch uC firmware * @uc_fw: uC firmware @@ -633,14 +653,11 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) if (err) goto fail; - if (uc_fw->loaded_via_gsc) - err = check_gsc_manifest(fw, uc_fw); - else - err = check_ccs_header(gt, fw, uc_fw); + err = check_fw_header(gt, fw, uc_fw); if (err) goto fail; - if (uc_fw->file_wanted.major_ver) { + if (uc_fw->file_wanted.major_ver && uc_fw->file_selected.major_ver) { /* Check the file's major version was as it claimed */ if (uc_fw->file_selected.major_ver != uc_fw->file_wanted.major_ver) { drm_notice(&i915->drm, "%s firmware %s: unexpected version: %u.%u != %u.%u\n", @@ -657,7 +674,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) } } - if (old_ver) { + if (old_ver && uc_fw->file_selected.major_ver) { /* Preserve the version that was really wanted */ memcpy(&uc_fw->file_wanted, &file_ideal, sizeof(uc_fw->file_wanted)); -- 2.37.3
WARNING: multiple messages have this Message-ID (diff)
From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Alan Previn <alan.previn.teres.alexis@intel.com>, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/6] drm/i915/gsc: Skip the version check when fetching the GSC FW Date: Mon, 21 Nov 2022 15:16:13 -0800 [thread overview] Message-ID: <20221121231617.1110329-3-daniele.ceraolospurio@intel.com> (raw) In-Reply-To: <20221121231617.1110329-1-daniele.ceraolospurio@intel.com> The current exectation from the FW side is that the driver will query the GSC FW version after the FW is loaded, similarly to what the mei driver does on DG2. However, we're discussing with the FW team if there is a way to extract the version from the bin file before loading, so we can keep the code the same as for older FWs. Since the GSC FW version is not currently required for functionality and is only needed for debug purposes, we can skip the FW version for now at fetch time and add it later on when we've agreed on the approach. Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Alan Previn <alan.previn.teres.alexis@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 29 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 5b2e4503aee7..3df52fd59edc 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -564,6 +564,26 @@ static int check_ccs_header(struct intel_gt *gt, return 0; } +static int check_fw_header(struct intel_gt *gt, + const struct firmware *fw, + struct intel_uc_fw *uc_fw) +{ + int err = 0; + + /* GSC FW version is queried after the FW is loaded */ + if (uc_fw->type == INTEL_UC_FW_TYPE_GSC) + return 0; + + if (uc_fw->loaded_via_gsc) + err = check_gsc_manifest(fw, uc_fw); + else + err = check_ccs_header(gt, fw, uc_fw); + if (err) + return err; + + return 0; +} + /** * intel_uc_fw_fetch - fetch uC firmware * @uc_fw: uC firmware @@ -633,14 +653,11 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) if (err) goto fail; - if (uc_fw->loaded_via_gsc) - err = check_gsc_manifest(fw, uc_fw); - else - err = check_ccs_header(gt, fw, uc_fw); + err = check_fw_header(gt, fw, uc_fw); if (err) goto fail; - if (uc_fw->file_wanted.major_ver) { + if (uc_fw->file_wanted.major_ver && uc_fw->file_selected.major_ver) { /* Check the file's major version was as it claimed */ if (uc_fw->file_selected.major_ver != uc_fw->file_wanted.major_ver) { drm_notice(&i915->drm, "%s firmware %s: unexpected version: %u.%u != %u.%u\n", @@ -657,7 +674,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) } } - if (old_ver) { + if (old_ver && uc_fw->file_selected.major_ver) { /* Preserve the version that was really wanted */ memcpy(&uc_fw->file_wanted, &file_ideal, sizeof(uc_fw->file_wanted)); -- 2.37.3
next prev parent reply other threads:[~2022-11-21 23:13 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-21 23:16 [PATCH 0/6] drm/i915: Add support for GSC FW loading Daniele Ceraolo Spurio 2022-11-21 23:16 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-11-21 23:16 ` [PATCH 1/6] drm/i915/uc: Introduce GSC FW Daniele Ceraolo Spurio 2022-11-21 23:16 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-11-22 9:03 ` Jani Nikula 2022-11-22 19:42 ` Ceraolo Spurio, Daniele 2022-11-22 20:11 ` Jani Nikula 2022-11-29 23:48 ` Teres Alexis, Alan Previn 2022-11-29 23:48 ` [Intel-gfx] " Teres Alexis, Alan Previn 2022-11-30 17:08 ` Ceraolo Spurio, Daniele 2022-11-30 17:08 ` [Intel-gfx] " Ceraolo Spurio, Daniele 2022-11-21 23:16 ` Daniele Ceraolo Spurio [this message] 2022-11-21 23:16 ` [Intel-gfx] [PATCH 2/6] drm/i915/gsc: Skip the version check when fetching the " Daniele Ceraolo Spurio 2022-11-22 18:53 ` Rodrigo Vivi 2022-11-21 23:16 ` [PATCH 3/6] drm/i915/gsc: GSC firmware loading Daniele Ceraolo Spurio 2022-11-21 23:16 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-11-22 19:01 ` Rodrigo Vivi 2022-11-22 19:39 ` Ceraolo Spurio, Daniele 2022-11-22 20:58 ` Rodrigo Vivi 2022-12-01 22:00 ` Teres Alexis, Alan Previn 2022-12-01 22:00 ` [Intel-gfx] " Teres Alexis, Alan Previn 2022-11-21 23:16 ` [PATCH 4/6] drm/i915/gsc: Do a driver-FLR on unload if GSC was loaded Daniele Ceraolo Spurio 2022-11-21 23:16 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-11-22 0:17 ` Ceraolo Spurio, Daniele 2022-11-22 0:17 ` [Intel-gfx] " Ceraolo Spurio, Daniele 2022-11-22 20:46 ` Rodrigo Vivi 2022-11-22 22:50 ` Ceraolo Spurio, Daniele 2022-11-23 18:32 ` Rodrigo Vivi 2022-12-01 22:40 ` Teres Alexis, Alan Previn 2022-12-01 22:40 ` [Intel-gfx] " Teres Alexis, Alan Previn 2022-12-01 22:52 ` Ceraolo Spurio, Daniele 2022-12-01 22:52 ` [Intel-gfx] " Ceraolo Spurio, Daniele 2022-11-21 23:16 ` [PATCH 5/6] drm/i915/gsc: Disable GSC engine and power well if FW is not selected Daniele Ceraolo Spurio 2022-11-21 23:16 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-11-22 20:52 ` Rodrigo Vivi 2022-11-22 22:58 ` Ceraolo Spurio, Daniele 2022-11-23 18:34 ` Rodrigo Vivi 2022-11-21 23:16 ` [PATCH 6/6] drm/i915/mtl: MTL has one GSC CS on the media GT Daniele Ceraolo Spurio 2022-11-21 23:16 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-11-22 20:52 ` Rodrigo Vivi 2022-11-21 23:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add support for GSC FW loading Patchwork 2022-11-21 23:42 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-11-22 0:08 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221121231617.1110329-3-daniele.ceraolospurio@intel.com \ --to=daniele.ceraolospurio@intel.com \ --cc=John.C.Harrison@Intel.com \ --cc=alan.previn.teres.alexis@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.