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 849E8C88E53 for ; Fri, 11 Sep 2026 20:12:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 34AD810E09F; Fri, 11 Sep 2026 20:12:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="iTOzoqI7"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id A460210E1F5 for ; Fri, 11 Sep 2026 20:12: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=1789157520; x=1820693520; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=oLSU59ScGc4fReM/vHKENeNZ64rIz08b847IWNPXf7Y=; b=iTOzoqI7HNeigQOqZTLnX4m4wIwjrRGhNfm2qbR1n6vla6UpzhOq4cG2 yqumUzWFxuQ3TUoo/iCHjGB6TpmXNGMY9a0sNotP10hBnG/cDyKg2szJ/ XCS4tPYATOzh0lB8G/AVbD3nBsuV71Ypza33Xt179+M9j84SWrR6WgbyV oW+6szA1XZHaBfLvxzGCWRPB5WNhrvRBpcRTfZYRY1PDnm3BjzlFBnS2m 1NT2OxUuEr5mPy9vVWg/b4lv9Aqcc6CN2uJ7g+GsW/PxeRgdCYogaZgkX MxW0ayt7pa2pAda2igG97MNtT2UQHKPMKv80cR2l3aqxl3htNSLKrHd6S A==; X-CSE-ConnectionGUID: GNtZmmRHSTK3udV+r/zgUA== X-CSE-MsgGUID: 2qugxfCfQaGKJFo0oZEO3w== X-IronPort-AV: E=McAfee;i="6800,10657,11902"; a="115162388" X-IronPort-AV: E=Sophos;i="6.27,97,1787036400"; d="scan'208";a="115162388" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2026 13:11:59 -0700 X-CSE-ConnectionGUID: QX5ag0ZRQEOQLlStDnFytQ== X-CSE-MsgGUID: +i/+/hzfR1uJ72vOjzL9Cw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,97,1787036400"; d="scan'208";a="277272088" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2026 13:11:59 -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 v8 07/20] drm/xe/vsec: Correct locking order Date: Fri, 11 Sep 2026 13:11:55 -0700 Message-ID: <20260911201148.1610547-29-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260911201148.1610547-22-michael.j.ruhl@intel.com> References: <20260911201148.1610547-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 to correct usage. Use explicit functions because of multiple locks. Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_vsec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 71bc359b2ad1..dd7723ba6c1c 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -158,16 +158,19 @@ 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; + mutex_lock(&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); + + mutex_unlock(&xe->pmt.lock); + xe_pm_runtime_put(xe); return count; -- 2.43.0