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 BC958C982E0 for ; Fri, 18 Sep 2026 13:18:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20E5E10F39A; Fri, 18 Sep 2026 13:18:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="SHC3p7Yp"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A5BE10F380 for ; Fri, 18 Sep 2026 13:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789737487; x=1821273487; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=gG1sQHPbPJ4Cq/dI19EwzOvsMB1T3EvHwtS3wkphv0A=; b=SHC3p7Yps7z8kxYTy6F68Nd/onYyoA+7So7wOuxmP3a35nw/al2Y/y/T RGpg03fL/rwtXpn9RTk08Ub1HO9GXKCkcLgazrJInVb2JMpDlaO0sQc2p 08vpe0Kl19RjXU61CU7wI+h0A8quk0PQ551TEjNKvOH2VcCOcVpZgd+Mp 6sWdJ2RRnFV497vcFy3yZE7BAjgDhLds+p2zub9QfOWkNb20Imc22YM/1 hAmjXv4qv5RrNdpLYMdKluBSWLkqo2HTEji0PbZBm0ThjNpnCwCaUVAxk KozvlbxiEOLsnd971/0USKn3hP/txwik3YLvTkZQi+nFwU5sJB1Qch9et w==; X-CSE-ConnectionGUID: e9asfZqvS+i1v7RHDrTDUA== X-CSE-MsgGUID: 3TZhoawSQMiW5BvqKs94Kw== X-IronPort-AV: E=McAfee;i="6800,10657,11908"; a="89378238" X-IronPort-AV: E=Sophos;i="6.27,109,1787036400"; d="scan'208";a="89378238" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2026 06:18:03 -0700 X-CSE-ConnectionGUID: yMhiHV7LTuubThzIasni3Q== X-CSE-MsgGUID: ehgY+pQlRbuN3SpYfMlkEg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,109,1787036400"; d="scan'208";a="270095325" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2026 06:18:02 -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 v10 07/20] drm/xe/vsec: Correct locking order Date: Fri, 18 Sep 2026 06:17:58 -0700 Message-ID: <20260918131751.2408883-29-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260918131751.2408883-22-michael.j.ruhl@intel.com> References: <20260918131751.2408883-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. 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 481bcbcc6372..1b88ac1d2448 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