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 9F73AC5AD49 for ; Fri, 6 Jun 2025 17:54:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5FF3310E0D6; Fri, 6 Jun 2025 17:54:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="C7Flw0FP"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F6EF10E044; Fri, 6 Jun 2025 17:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1749232440; x=1780768440; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HErM+pgYq7oE+5SJ66D3+w1ZoMTwPYi+/9zmOVg/MNY=; b=C7Flw0FPcoRx48sNMiX1ZupIEmUQDg6xQeh7LJVV8QXJwIQ3Z3IrNaTP 88qMEiqfK6RJR+QFn7ARZdFBa2O6ZEBCmnFCxpGaEUm26flJ4QqSHlcO0 wKbaYqBIr9Jf/VC2hOAJICrP+9DXLsDQP8KjbFIFl37daSYrLemPvRxCy B8oc2h40EOSW6d4bv+LZ2Wu1NDuAH8keX57N3TplY3sC64ro+NIxyftgw eLsaZHzYt/OdUDgNmSe/dZTp6maJoEIlX3phrx4Om/DxsoFmn7PM1jpa7 ey7PjdhiNXxy8BBN3caxZ0OhR1DwRvifgP7AuTLB98V1D/SVmTjPkTjT+ Q==; X-CSE-ConnectionGUID: b24hy3cbSUugRQ0yvYg1dQ== X-CSE-MsgGUID: 05OY0poLSfuUEd/igovOHQ== X-IronPort-AV: E=McAfee;i="6800,10657,11456"; a="51486793" X-IronPort-AV: E=Sophos;i="6.16,215,1744095600"; d="scan'208";a="51486793" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2025 10:54:00 -0700 X-CSE-ConnectionGUID: 67H1Yg9FQQaXsfus5yTxKA== X-CSE-MsgGUID: f0F04V+STHysqj9APytc8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,215,1744095600"; d="scan'208";a="145787124" Received: from unknown (HELO bnilawar-desk2.iind.intel.com) ([10.190.239.41]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2025 10:53:58 -0700 From: Badal Nilawar To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: anshuman.gupta@intel.com, rodrigo.vivi@intel.com, alexander.usyskin@intel.com, gregkh@linuxfoundation.org, daniele.ceraolospurio@intel.com, jgg@nvidia.com Subject: [PATCH v2 08/10] drm/xe/xe_late_bind_fw: Introduce debug fs node to disable late binding Date: Fri, 6 Jun 2025 23:27:05 +0530 Message-Id: <20250606175707.1403384-9-badal.nilawar@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250606175707.1403384-1-badal.nilawar@intel.com> References: <20250606175707.1403384-1-badal.nilawar@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" Introduce a debug filesystem node to disable late binding fw reload during the system or runtime resume. This is intended for situations where the late binding fw needs to be loaded from user mode. Signed-off-by: Badal Nilawar --- drivers/gpu/drm/xe/xe_debugfs.c | 42 ++++++++++++++++++++++ drivers/gpu/drm/xe/xe_late_bind_fw.c | 5 ++- drivers/gpu/drm/xe/xe_late_bind_fw_types.h | 3 ++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c index d83cd6ed3fa8..1c145089d177 100644 --- a/drivers/gpu/drm/xe/xe_debugfs.c +++ b/drivers/gpu/drm/xe/xe_debugfs.c @@ -226,6 +226,45 @@ static const struct file_operations atomic_svm_timeslice_ms_fops = { .write = atomic_svm_timeslice_ms_set, }; +static ssize_t disable_late_binding_show(struct file *f, char __user *ubuf, + size_t size, loff_t *pos) +{ + struct xe_device *xe = file_inode(f)->i_private; + struct xe_late_bind *late_bind = &xe->late_bind; + char buf[32]; + int len; + + len = scnprintf(buf, sizeof(buf), "%d\n", late_bind->disable); + + return simple_read_from_buffer(ubuf, size, pos, buf, len); +} + +static ssize_t disable_late_binding_set(struct file *f, const char __user *ubuf, + size_t size, loff_t *pos) +{ + struct xe_device *xe = file_inode(f)->i_private; + struct xe_late_bind *late_bind = &xe->late_bind; + u32 uval; + ssize_t ret; + + ret = kstrtouint_from_user(ubuf, size, sizeof(uval), &uval); + if (ret) + return ret; + + if (uval > 1) + return -EINVAL; + + late_bind->disable = (uval == 1) ? true : false; + + return size; +} + +static const struct file_operations disable_late_binding_fops = { + .owner = THIS_MODULE, + .read = disable_late_binding_show, + .write = disable_late_binding_set, +}; + void xe_debugfs_register(struct xe_device *xe) { struct ttm_device *bdev = &xe->ttm; @@ -249,6 +288,9 @@ void xe_debugfs_register(struct xe_device *xe) debugfs_create_file("atomic_svm_timeslice_ms", 0600, root, xe, &atomic_svm_timeslice_ms_fops); + debugfs_create_file("disable_late_binding", 0600, root, xe, + &disable_late_binding_fops); + for (mem_type = XE_PL_VRAM0; mem_type <= XE_PL_VRAM1; ++mem_type) { man = ttm_manager_type(bdev, mem_type); diff --git a/drivers/gpu/drm/xe/xe_late_bind_fw.c b/drivers/gpu/drm/xe/xe_late_bind_fw.c index d69f950bddd2..f9d3d0f341f2 100644 --- a/drivers/gpu/drm/xe/xe_late_bind_fw.c +++ b/drivers/gpu/drm/xe/xe_late_bind_fw.c @@ -123,11 +123,14 @@ int xe_late_bind_fw_load(struct xe_late_bind *late_bind) if (!late_bind->component_added) return -EINVAL; + if (late_bind->disable) + return 0; + lbfw = &late_bind->late_bind_fw; if (lbfw->valid) { drm_dbg(&xe->drm, "Queue work: to load %s firmware\n", fw_type_to_name[lbfw->type]); - queue_work(late_bind->wq, &lbfw->work); + queue_work(late_bind->wq, &lbfw->work); } return 0; diff --git a/drivers/gpu/drm/xe/xe_late_bind_fw_types.h b/drivers/gpu/drm/xe/xe_late_bind_fw_types.h index 690680e8ff22..6f4a945ca236 100644 --- a/drivers/gpu/drm/xe/xe_late_bind_fw_types.h +++ b/drivers/gpu/drm/xe/xe_late_bind_fw_types.h @@ -76,6 +76,9 @@ struct xe_late_bind { struct xe_late_bind_fw late_bind_fw; /** @late_bind.wq: workqueue to submit request to download late bind blob */ struct workqueue_struct *wq; + + /** @late_bind.disable to block late binding reload during pm resume flow*/ + bool disable; }; #endif -- 2.34.1