From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D31EE606A887 for ; Mon, 16 Nov 2026 15:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=TTzGJBo0 Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72F8610EA43; Mon, 16 Nov 2026 15:07:38 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C9CC10F274 for ; Mon, 16 Nov 2026 15:07: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=1794841642; x=1826377642; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=iNlw2SAyHVPw1S5tp14g1rPzveWT7UF4bgjSCq2D2gk=; b=TTzGJBo0flUWBFETuI3NUceLnThqAmyEkAimYAdZK2EGpn8G9q3quG1g 36dmkBoJyVHYQ1EcxerE15UdteCXaE1RcfJujk9CCXAAUzKpYEsIdcADh HL8utxh7zHUu+0PL5t796YBDksAsCFlcI+dPZpX5KP9dwZ+X51keH7yfq d/L3BawlYu6uhSd4atB2sFVpFLF+jvwsQlHfb2WbTdetXLP21quB6pqHN 7OywIVgknOHveGby0rmqarX48mWJpI2GmOtbIVpTC3V/aFVxvN1XBDC3G oudEhXCltfGvjZh5aISlkW2tw+DXxueG59pylkhosCPiSycyTgQ9Bhh4j g==; X-CSE-ConnectionGUID: wFFXuD/eQfe/SBbYhD+ksg== X-CSE-MsgGUID: wvxoN6T/SqudD88j5nnhLg== X-IronPort-AV: E=McAfee;i="6800,10657,11968"; a="3611845" X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="3611845" Received: from fmviesa011.fm.intel.com ([10.60.135.151]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2026 07:07:01 -0800 X-CSE-ConnectionGUID: l0/vQJ1ySvuP1HnHmM1tSw== X-CSE-MsgGUID: qH1bPmT9Tn2aopceeh/+1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="11359440" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2026 07:07:02 -0800 From: "Michael J. Ruhl" To: intel-xe@lists.freedesktop.org, matthew.brost@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com, airlied@gmail.com, simona@ffwll.ch, david.e.box@linux.intel.com, anoop.c.vijay@intel.com, badal.nilawar@intel.com, matthew.d.roper@intel.com, james.ausmus@intel.com Subject: [PATCH v16 13/17] drm/xe/vsec: Support late bind fw information Date: Mon, 16 Nov 2026 07:07:02 -0800 Message-ID: <20261116150649.368686-32-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261116150649.368686-19-michael.j.ruhl@intel.com> References: <20261116150649.368686-19-michael.j.ruhl@intel.com> X-Archived-By: 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-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Intel-xe" X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 CRI FW is loaded on power on. Because of this, access to the FW cannot be done until it is running. Update the XE PMT probe and access to check for late bind devices, verify, and wait for the appropriate FW state before probe or access. Reviewed-by: Rodrigo Vivi Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_device.c | 3 + drivers/gpu/drm/xe/xe_device_types.h | 5 ++ drivers/gpu/drm/xe/xe_vsec.c | 126 ++++++++++++++++++++++++++- drivers/gpu/drm/xe/xe_vsec.h | 1 + 4 files changed, 134 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index c3cd98244d4c..76e401ae5878 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -1111,6 +1111,7 @@ int xe_device_probe(struct xe_device *xe) return 0; err_unregister_display: + xe_vsec_remove(xe); xe_display_unregister(xe); drm_dev_unregister(&xe->drm); @@ -1119,6 +1120,8 @@ int xe_device_probe(struct xe_device *xe) void xe_device_remove(struct xe_device *xe) { + xe_vsec_remove(xe); + xe_display_unregister(xe); drm_dev_unplug(&xe->drm); diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 28b1669a14d8..d1bdd3a872a8 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -7,6 +7,7 @@ #define _XE_DEVICE_TYPES_H_ #include +#include #include #include @@ -487,6 +488,10 @@ struct xe_device { struct mutex lock; /** @pmt.base_offset: device specific base offset */ u64 base_offset; + /** @pmt.work: support late-bind probe */ + struct delayed_work work; + /** @pmt.retry_count: late-bind probe retry */ + u32 retry_count; } pmt; /** @soc_remapper: SoC remapper object */ diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 4ca41a5ef502..fe3d8338cfc9 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -18,6 +19,7 @@ #include "xe_mmio.h" #include "xe_platform_types.h" #include "xe_pm.h" +#include "xe_sysctrl.h" #include "xe_vsec.h" #include "regs/xe_pmt.h" @@ -173,6 +175,14 @@ enum capability { WATCHER, }; +/* + * Late bind will delay 100msec for up to 20 seconds + */ +#define VSEC_LATE_BIND_DELAY_MSEC 100 +#define VSEC_LATE_BIND_RETRY 200 + +static void cri_late_bind_probe(struct xe_device *xe); + static int bmg_guid_decode(u32 guid, int *index, u32 *offset) { u32 record_id = FIELD_GET(GUID_RECORD_ID, guid); @@ -281,6 +291,53 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset) return -ENODEV; } +static void cri_late_bind_probe_work(struct work_struct *work) +{ + struct xe_device *xe = container_of(work, struct xe_device, pmt.work.work); + + if (xe_sysctrl_is_oobmsm_fw_ready(xe)) { + cri_late_bind_probe(xe); + xe_pm_runtime_put(xe); + return; + } + + xe->pmt.retry_count++; + + /* wait up to 20 seconds */ + if (xe->pmt.retry_count == VSEC_LATE_BIND_RETRY) { + drm_warn(&xe->drm, "PMT probe: Late Binding failed to complete\n"); + xe_pm_runtime_put(xe); + return; + } + + if (!queue_delayed_work(system_freezable_wq, &xe->pmt.work, + msecs_to_jiffies(VSEC_LATE_BIND_DELAY_MSEC))) + xe_pm_runtime_put(xe); +} + +static bool wait_for_fw(struct xe_device *xe) +{ + int retries = VSEC_LATE_BIND_RETRY; /* wait up to 20 secs */ + + if (xe->info.platform != XE_CRESCENTISLAND) + return true; + + while (retries--) { + if (xe_sysctrl_is_oobmsm_fw_ready(xe)) + return true; + + msleep(VSEC_LATE_BIND_DELAY_MSEC); + if (signal_pending(current)) { + drm_warn(&xe->drm, "Late Binding interrupted\n"); + return false; + } + } + + drm_warn(&xe->drm, "Late Binding failed to complete\n"); + + return false; +} + /** * xe_pmt_telem_read - Given a device and a PMT GUID, read data into a buffer * @dev: valid Xe device @@ -343,6 +400,11 @@ int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offse goto dev_exit; } + if (!wait_for_fw(xe)) { + ret = -ENODATA; + goto runtime_exit; + } + scoped_guard(mutex, &xe->pmt.lock) { u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid); @@ -355,6 +417,7 @@ int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offse xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY); } +runtime_exit: xe_pm_runtime_put(xe); dev_exit: @@ -400,6 +463,10 @@ static int xe_pmt_read_reg(struct device *dev, u32 guid, u32 *reg, u32 offset) disc_addr += inst + offset; xe_pm_runtime_get(xe); + if (!wait_for_fw(xe)) { + ret = -ENODATA; + goto runtime_exit; + } scoped_guard(mutex, &xe->pmt.lock) { xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY); @@ -407,6 +474,7 @@ static int xe_pmt_read_reg(struct device *dev, u32 guid, u32 *reg, u32 offset) *reg = readl(disc_addr); } +runtime_exit: xe_pm_runtime_put(xe); drm_dev_exit(idx); @@ -434,6 +502,10 @@ static int xe_pmt_write_reg(struct device *dev, u32 guid, u32 reg, u32 offset) disc_addr += inst + offset; xe_pm_runtime_get(xe); + if (!wait_for_fw(xe)) { + ret = -ENODATA; + goto runtime_exit; + } scoped_guard(mutex, &xe->pmt.lock) { xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY); @@ -441,6 +513,7 @@ static int xe_pmt_write_reg(struct device *dev, u32 guid, u32 reg, u32 offset) writel(reg, disc_addr); } +runtime_exit: xe_pm_runtime_put(xe); drm_dev_exit(idx); @@ -476,6 +549,28 @@ static enum xe_vsec get_platform_info(struct xe_device *xe) return vsec_platforms[xe->info.platform]; } +static void cri_late_bind_probe(struct xe_device *xe) +{ + struct intel_vsec_platform_info *info; + struct device *dev = xe->drm.dev; + enum xe_vsec platform; + + platform = get_platform_info(xe); + if (platform != XE_VSEC_CRI) + return; + + info = &xe_vsec_info[platform]; + if (!info->headers) + return; + + guard(mutex)(&xe->pmt.lock); + + info->priv_data = &xe_cri_pmt_cb; + xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY); + + intel_vsec_register(dev, info); +} + /** * xe_vsec_init - Initialize resources and add intel_vsec auxiliary * interface @@ -503,12 +598,24 @@ void xe_vsec_init(struct xe_device *xe) case XE_VSEC_CRI: xe->pmt.base_offset = CRI_PMT_OFFSET; + + xe->pmt.retry_count = 0; + INIT_DELAYED_WORK(&xe->pmt.work, cri_late_bind_probe_work); + + xe_pm_runtime_get_noresume(xe); + if (!xe_sysctrl_is_oobmsm_fw_ready(xe)) { + queue_delayed_work(system_freezable_wq, &xe->pmt.work, + msecs_to_jiffies(VSEC_LATE_BIND_DELAY_MSEC)); + return; + } + info->priv_data = &xe_cri_pmt_cb; xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY); break; default: - break; + drm_err(&xe->drm, "Unsupported platform: %u\n", platform); + return; } /* @@ -516,5 +623,22 @@ void xe_vsec_init(struct xe_device *xe) * resources. */ intel_vsec_register(dev, info); + + if (platform == XE_VSEC_CRI) + xe_pm_runtime_put(xe); +} + +/** + * xe_vsec_remove - cleanup any outstanding resources + * @xe: valid xe instance + */ +void xe_vsec_remove(struct xe_device *xe) +{ + /* Cleanup on Crescent Isle */ + if (xe->info.platform == XE_CRESCENTISLAND && + xe->pmt.base_offset == CRI_PMT_OFFSET && + disable_delayed_work_sync(&xe->pmt.work)) + xe_pm_runtime_put(xe); + } MODULE_IMPORT_NS("INTEL_VSEC"); diff --git a/drivers/gpu/drm/xe/xe_vsec.h b/drivers/gpu/drm/xe/xe_vsec.h index a25b4e6e681b..e925dba4158b 100644 --- a/drivers/gpu/drm/xe/xe_vsec.h +++ b/drivers/gpu/drm/xe/xe_vsec.h @@ -10,6 +10,7 @@ struct device; struct xe_device; void xe_vsec_init(struct xe_device *xe); +void xe_vsec_remove(struct xe_device *xe); int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offset, u32 count); #endif -- 2.43.0