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 CCE57C9831A for ; Wed, 23 Sep 2026 18:11:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0E2510F145; Wed, 23 Sep 2026 18:11:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="b/YkMH1L"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id A740810E961 for ; Wed, 23 Sep 2026 18:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790187086; x=1821723086; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=rayEZ0+oT/Iyk+FY8Hj0Rn8qFu76Ec9MdIYQCC7fDsI=; b=b/YkMH1L4s+OL6F7bNNAdHA2DIc8GOo+EqDKficpIhO+57yMqF/lLJ28 hIyxbbo0PXDLBW88K0Hmwfr8h04G75rweqGdC/tRmQ5ecIoILn43rqnFw 1tcXJBSjtQGbR8s2WO5Hz1m5iAHqkFDiCrLaBQHQSuxkvOGmCJJ+GVzgM Qvo5MD3DwXUs5EFwakn9lP9EDQklTMkk2ALhcAtG2+8RD0lfGqNK8ukIu GUXD8fOmRGgmYnPn4SKxw+HULseSU0TvnEZgXX7KKK/RIHLl5nJPnGAyj fr089j0glo4v/rVOJf9E+8iLzAm9IHWa0/I86ecccaayZIJqjoJ0K2z84 A==; X-CSE-ConnectionGUID: i3ccB30YTuqXrZxRrfX5BQ== X-CSE-MsgGUID: 03FzaLNvSHqS44tXwOr1zQ== X-IronPort-AV: E=McAfee;i="6800,10657,11914"; a="93416010" X-IronPort-AV: E=Sophos;i="6.27,119,1787036400"; d="scan'208";a="93416010" Received: from fmviesa013.fm.intel.com ([10.60.135.153]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2026 11:11:25 -0700 X-CSE-ConnectionGUID: S8DO2VCWQ3iIvrhW7xeEKQ== X-CSE-MsgGUID: Wfe9vnjQRP2rmL9EZnWlqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,119,1787036400"; d="scan'208";a="4980694" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2026 11:11:25 -0700 From: "Michael J. Ruhl" To: platform-driver-x86@vger.kernel.org, intel-xe@lists.freedesktop.org, hansg@kernel.org, ilpo.jarvinen@linux.intel.com, 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, karthik.poosa@intel.com Subject: [PATCH v11 07/20] drm/xe/vsec: Correct locking order Date: Wed, 23 Sep 2026 11:11:22 -0700 Message-ID: <20260923181115.2514193-29-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260923181115.2514193-22-michael.j.ruhl@intel.com> References: <20260923181115.2514193-22-michael.j.ruhl@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" Xe locking order is power state first, and then local locks. Reorder locking for correct usage. Reviewed-by: Rodrigo Vivi Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_vsec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 178f22db4046..d93c042cf25b 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -157,16 +157,17 @@ int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offse telem_addr += offset + user_offset; - guard(mutex)(&xe->pmt.lock); - /* indicate that we are not at an appropriate power level */ if (!xe_pm_runtime_get_if_active(xe)) return -ENODATA; - /* set SoC re-mapper index register based on GUID memory region */ - xe->soc_remapper.set_telem_region(xe, mem_region); + scoped_guard(mutex, &xe->pmt.lock) { + /* set SoC re-mapper index register based on GUID memory region */ + xe->soc_remapper.set_telem_region(xe, mem_region); + + memcpy_fromio(data, telem_addr, count); + } - memcpy_fromio(data, telem_addr, count); xe_pm_runtime_put(xe); return count; -- 2.43.0