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 EE350606A32C for ; Mon, 16 Nov 2026 15:07:15 +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=emFouCOD Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E82C89B99; Mon, 16 Nov 2026 15:07:10 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id C936089B99 for ; Mon, 16 Nov 2026 15:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1794841625; x=1826377625; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=rayEZ0+oT/Iyk+FY8Hj0Rn8qFu76Ec9MdIYQCC7fDsI=; b=emFouCODg13fsdw5eO4BbqDHb9dpMqMmI20eHnvS1SMpI4dWuVQwrTm2 iWI1hw1mohjG08YQUEOU+vuJZF+qnne8sasL+Q3049paf4kWs0FooY8E4 cg21aXE5BkZ5Qxw0JTPHV7YuSFB8AJEKQWd5FJjgOouAu0jP/g2oRlEQV 8Ay43eScOyuAQSoec9epe8VhS2gx0DCdDfUG8DZE5F+RMbQsvzMyciJmn RVHgVXNkBfWgBEsS4191/w1Rxk5OVconpW+Pvc0l+s18H6EbSWConhHgH x94P1Jn6d14igLDMynXGolUZt21/QqR17fCrf1/3Ou+CE/zbSTjO3MWc7 w==; X-CSE-ConnectionGUID: m42rRSuwQGSM0NUYFmOz0g== X-CSE-MsgGUID: TmkXNLrIQuSBMkzYXi5YJQ== X-IronPort-AV: E=McAfee;i="6800,10657,11968"; a="3611817" X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="3611817" 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: woib2ImWS1mla2ypCNxO0w== X-CSE-MsgGUID: hBol0vHGThadJTWE2hFwyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="11359410" 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 03/17] drm/xe/vsec: Correct locking order Date: Mon, 16 Nov 2026 07:06:52 -0800 Message-ID: <20261116150649.368686-22-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 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