From nobody Sat Oct 4 14:14:57 2025 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 857521E5B72 for ; Fri, 15 Aug 2025 06:36:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755239801; cv=none; b=PZwvuGeAYZgduT0Ngfp1oyW5h85w2vHsAypGLQpi8gTyotk/1RB8DHo4cAN4iATgwBVtbHUNu9zpL69d4LWCFUU259OBf7sXH0R4fbeowtkcyeZl8OC+eRKrQw3K5+QWu7rnqslqLtzFTRUeaIN8pOQxsjxR+VmgxWQ9Vj4N9J4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755239801; c=relaxed/simple; bh=6Rtu/CdUq/Hx2zMuHV1h5Xi6nfiGUJnVVRJ2IT9KMnA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HZIpexYoWrIaiqpQvb5lrsmDiPrF1YpqzESucTasXuvUUDt9OlP3adF17dcxnHogdSv0aQ1oz695XeRXkprZI6YdqJD+DvLkuzxfCNtjPFnIdH9manDp3jO9OfBGD+Jpv9bBdfQGoQbH6+UvcrMaBFDxxcXzcwyxfBHKQ5escvk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 2d30b4c679a211f0b29709d653e92f7d-20250815 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:34147249-89f6-4dd7-b116-f0a979552ea8,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6493067,CLOUDID:19bee8621f5915e0662f88090b96b99a,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0|50,EDM:-3,IP:nil,UR L:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,S PR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2d30b4c679a211f0b29709d653e92f7d-20250815 Received: from node2.com.cn [(10.44.16.197)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA) with ESMTP id 1605522595; Fri, 15 Aug 2025 14:36:29 +0800 Received: from node2.com.cn (localhost [127.0.0.1]) by node2.com.cn (NSMail) with SMTP id C9514B8258E7; Fri, 15 Aug 2025 14:36:28 +0800 (CST) X-ns-mid: postfix-689ED56C-618075172 Received: from localhost.localdomain (unknown [10.42.12.87]) by node2.com.cn (NSMail) with ESMTPA id 20BFAB812916; Fri, 15 Aug 2025 06:36:25 +0000 (UTC) From: zhaoguohan@kylinos.cn To: lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, airlied@gmail.com, simona@ffwll.ch Cc: badal.nilawar@intel.com, karthik.poosa@intel.com, riana.tauro@intel.com, intel-xe@lists.freedesktop.org (open list:INTEL DRM XE DRIVER (Lunar Lake and newer)), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list), GuoHan Zhao Subject: [PATCH v2] drm/xe/hwmon: Return early on power limit read failure Date: Fri, 15 Aug 2025 14:36:23 +0800 Message-ID: <20250815063623.18162-1-zhaoguohan@kylinos.cn> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: GuoHan Zhao In xe_hwmon_pcode_rmw_power_limit(), when xe_pcode_read() fails, the function logs the error but continues to execute the subsequent logic. This can result in undefined behavior as the values val0 and val1 may contain invalid data. Fix this by adding an early return after logging the read failure, ensuring that we don't proceed with potentially corrupted data. Fixes: 8aa7306631f0 ("drm/xe/hwmon: Fix xe_hwmon_power_max_write") V2: - Change 'drm_dbg' to 'drm_err' - Added the Fixes tag in commit message Signed-off-by: GuoHan Zhao --- drivers/gpu/drm/xe/xe_hwmon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c index f08fc4377d25..8e29fa155d7e 100644 --- a/drivers/gpu/drm/xe/xe_hwmon.c +++ b/drivers/gpu/drm/xe/xe_hwmon.c @@ -190,9 +190,11 @@ static int xe_hwmon_pcode_rmw_power_limit(const struct= xe_hwmon *hwmon, u32 attr READ_PL_FROM_PCODE : READ_PL_FROM_FW), &val0, &val1); =20 - if (ret) - drm_dbg(&hwmon->xe->drm, "read failed ch %d val0 0x%08x, val1 0x%08x, re= t %d\n", + if (ret) { + drm_err(&hwmon->xe->drm, "read failed ch %d val0 0x%08x, val1 0x%08x, re= t %d\n", channel, val0, val1, ret); + return ret; + } =20 if (attr =3D=3D PL1_HWMON_ATTR) val0 =3D (val0 & ~clr) | set; --=20 2.43.0