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 C11C8C3DA64 for ; Fri, 2 Aug 2024 00:40:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A17689664; Fri, 2 Aug 2024 00:40:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ztpyg/vZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02DBC10E526 for ; Fri, 2 Aug 2024 00:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722559223; x=1754095223; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XMqbaU3ROElkTeNTx2cE1LWew9FEpw/t7TfGEwNRfeQ=; b=Ztpyg/vZsgS9bCO9Z5nMyiJah1WtGN8VrQTL3A8UohttX4pM48WVcvWt QRhuTM9Bua/jGQu/Ah7f9gaV1vAnbg7XMDwhjJif3S95bYlEMurJ1tTsd qGMyNbeWFgZ9oucaOgeUE0ndNP5PZ4in0rgLiiWR9fjWl/5i3Diu/HGT4 O1xcSAKmMzWJcS9GcZ5P2zm4Xf7uUdm5O5YPK1tQIoZgEi4eJBMFZ+zKF YBNI853d1W2mSWrq3kz8QlYyx8zn+DK0fQcwBnaZihKYmVAves5t10zN/ oXbDuOsWqYhK/Ora6ViXIU/Dk6w8LFO6L1CSO865k/+C1kwhW31t5osDh g==; X-CSE-ConnectionGUID: 5QL5vEqHQv2oxHE8C5HAJw== X-CSE-MsgGUID: mT2XTS3eTJa23wj+bxXSkg== X-IronPort-AV: E=McAfee;i="6700,10204,11151"; a="45963265" X-IronPort-AV: E=Sophos;i="6.09,256,1716274800"; d="scan'208";a="45963265" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2024 17:40:22 -0700 X-CSE-ConnectionGUID: 1yj+DR6PTSK6pUP0RYWsVQ== X-CSE-MsgGUID: OAgfltI1SFqISlvQ6OzBUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,256,1716274800"; d="scan'208";a="92767536" Received: from bfilipch-desk.jf.intel.com ([10.165.21.204]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2024 17:40:21 -0700 From: Julia Filipchuk To: intel-xe@lists.freedesktop.org Cc: Julia Filipchuk Subject: [PATCH 1/2] NOT_UPSTREAM/CI: drm/xe/guc: Release GuC v70.29.2 Date: Thu, 1 Aug 2024 17:40:15 -0700 Message-ID: <20240802004017.3057708-2-julia.filipchuk@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240802004017.3057708-1-julia.filipchuk@intel.com> References: <20240802004017.3057708-1-julia.filipchuk@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" CHANGES FOR TEST FROM OTHER PATCH SERIES. Released version is set as recommended and minimum. Add comparable version macro to xe_uc_fw. Signed-off-by: Julia Filipchuk --- drivers/gpu/drm/xe/xe_guc.h | 3 +++ drivers/gpu/drm/xe/xe_uc_fw.c | 30 ++++++++++++++++-------------- drivers/gpu/drm/xe/xe_uc_fw.h | 6 ++++++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h index e0bbf98f849d..9a0b9123dce0 100644 --- a/drivers/gpu/drm/xe/xe_guc.h +++ b/drivers/gpu/drm/xe/xe_guc.h @@ -11,6 +11,9 @@ #include "xe_hw_engine_types.h" #include "xe_macros.h" +#define GUC_SUBMIT_VER(guc) MAKE_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_COMPATIBILITY]) +#define GUC_FIRMWARE_VER(guc) MAKE_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_RELEASE]) + struct drm_printer; void xe_guc_comm_init_early(struct xe_guc *guc); diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index 6b92255a769d..9c639c6b8970 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -15,6 +15,7 @@ #include "xe_gsc.h" #include "xe_gt.h" #include "xe_gt_printk.h" +#include "xe_guc.h" #include "xe_map.h" #include "xe_mmio.h" #include "xe_module.h" @@ -105,17 +106,17 @@ struct fw_blobs_by_type { }; #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \ - fw_def(BATTLEMAGE, major_ver(intel-ci/xe, guc, bmg, 70, 24, 0)) \ - fw_def(LUNARLAKE, major_ver(intel-ci/xe, guc, lnl, 70, 24, 0)) \ - fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 19, 2)) \ - fw_def(PVC, mmp_ver(intel-ci/xe, guc, pvc, 70, 24, 0)) \ - fw_def(DG2, major_ver(i915, guc, dg2, 70, 19, 2)) \ - fw_def(DG1, major_ver(i915, guc, dg1, 70, 19, 2)) \ - fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 19, 2)) \ - fw_def(ALDERLAKE_P, major_ver(i915, guc, adlp, 70, 19, 2)) \ - fw_def(ALDERLAKE_S, major_ver(i915, guc, tgl, 70, 19, 2)) \ - fw_def(ROCKETLAKE, major_ver(i915, guc, tgl, 70, 19, 2)) \ - fw_def(TIGERLAKE, major_ver(i915, guc, tgl, 70, 19, 2)) + fw_def(BATTLEMAGE, major_ver(xe, guc, bmg, 70, 29, 2)) \ + fw_def(LUNARLAKE, major_ver(xe, guc, lnl, 70, 29, 2)) \ + fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 29, 2)) \ + fw_def(PVC, mmp_ver(intel-ci/xe, guc, pvc, 70, 29, 2)) \ + fw_def(DG2, major_ver(i915, guc, dg2, 70, 29, 2)) \ + fw_def(DG1, major_ver(i915, guc, dg1, 70, 29, 2)) \ + fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 29, 2)) \ + fw_def(ALDERLAKE_P, major_ver(i915, guc, adlp, 70, 29, 2)) \ + fw_def(ALDERLAKE_S, major_ver(i915, guc, tgl, 70, 29, 2)) \ + fw_def(ROCKETLAKE, major_ver(i915, guc, tgl, 70, 29, 2)) \ + fw_def(TIGERLAKE, major_ver(i915, guc, tgl, 70, 29, 2)) #define XE_HUC_FIRMWARE_DEFS(fw_def, mmp_ver, no_ver) \ fw_def(BATTLEMAGE, no_ver(xe, huc, bmg)) \ @@ -306,14 +307,15 @@ static void uc_fw_fini(struct drm_device *drm, void *arg) static int guc_read_css_info(struct xe_uc_fw *uc_fw, struct uc_css_header *css) { struct xe_gt *gt = uc_fw_to_gt(uc_fw); + struct xe_guc *guc = container_of(uc_fw, struct xe_guc, fw); struct xe_uc_fw_version *release = &uc_fw->versions.found[XE_UC_FW_VER_RELEASE]; struct xe_uc_fw_version *compatibility = &uc_fw->versions.found[XE_UC_FW_VER_COMPATIBILITY]; xe_gt_assert(gt, uc_fw->type == XE_UC_FW_TYPE_GUC); - /* We don't support GuC releases older than 70.19 */ - if (release->major < 70 || (release->major == 70 && release->minor < 19)) { - xe_gt_err(gt, "Unsupported GuC v%u.%u! v70.19 or newer is required\n", + /* We don't support GuC releases older than 70.29.2 */ + if (GUC_FIRMWARE_VER(guc) < MAKE_VER(70, 29, 2)) { + xe_gt_err(gt, "Unsupported GuC v%u.%u! v70.29.2 or newer is required\n", release->major, release->minor); return -EINVAL; } diff --git a/drivers/gpu/drm/xe/xe_uc_fw.h b/drivers/gpu/drm/xe/xe_uc_fw.h index c108e9d08e70..1b1fdd103b9c 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.h +++ b/drivers/gpu/drm/xe/xe_uc_fw.h @@ -12,6 +12,12 @@ #include "xe_uc_fw_abi.h" #include "xe_uc_fw_types.h" +/* Create a comparable u64 version number. Prevent truncation from smaller types. */ +#define MAKE_VER(maj, min, pat) \ + (((u64)(maj) << 32) | ((u64)(min) << 16) | (pat)) + +#define MAKE_VER_STRUCT(ver) MAKE_VER((ver).major, (ver).minor, (ver).patch) + struct drm_printer; int xe_uc_fw_init(struct xe_uc_fw *uc_fw); -- 2.45.2