From patchwork Mon Dec 4 14:48:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthik Poosa X-Patchwork-Id: 13478575 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 CA00AC4167B for ; Mon, 4 Dec 2023 14:41:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5721610E204; Mon, 4 Dec 2023 14:41:15 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA8A110E1DF for ; Mon, 4 Dec 2023 14:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701700852; x=1733236852; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=NqOwto72tAT0WLCznkkKoBkMBaP5089PehxO7L88jo8=; b=iMuO87buLL7i5MhcrnkHmv/ju03niC0vVbDxfRacGgHcQhwummP9SR12 xBClRtP7K5tTWqazTBeDEl5u5Y/ACp3LuxkjRY+wNGPZ69S+dOnq7TOVB bO5TTNbZQH94TH1BVZ8qhgfz1mI3s+fws9OUWwAsLqE7g3b7jfjh+t3mi O/Dbz27Lnk7S0fLsbAbXHvkzQHZsF2F1e8xshIdl0M02B5VFtPRT+z5gb 3bP1A83yQRAxNsHjL2RGM1kjOpVN1xrH0AD8xm2RNUbPxnSCcPWQEziS2 C3VDCNZCueHJsOnex2LSlg4Si+qPKuLphZYqcVtZI6MOqYVDDnhOv4J/X w==; X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="590031" X-IronPort-AV: E=Sophos;i="6.04,249,1695711600"; d="scan'208";a="590031" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 06:40:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,249,1695711600"; d="scan'208";a="11988796" Received: from sinjan-super-server.iind.intel.com ([10.145.169.153]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 06:40:50 -0800 From: Karthik Poosa To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Dec 2023 20:18:09 +0530 Message-Id: <20231204144809.1518704-1-karthik.poosa@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/hwmon: Fix analysis tool reported issues X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karthik Poosa Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Updated i915 hwmon with fixes for issues reported by static analysis tool. Fixed integer overflow with upcasting. v2: - Added Fixes tag (Badal). - Updated commit message as per review comments (Anshuman). Fixes: 4c2572fe0ae7 ("drm/i915/hwmon: Expose power1_max_interval") Reviewed-by: Badal Nilawar Reviewed-by: Anshuman Gupta Signed-off-by: Karthik Poosa --- drivers/gpu/drm/i915/i915_hwmon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c index 975da8e7f2a9..8c3f443c8347 100644 --- a/drivers/gpu/drm/i915/i915_hwmon.c +++ b/drivers/gpu/drm/i915/i915_hwmon.c @@ -175,7 +175,7 @@ hwm_power1_max_interval_show(struct device *dev, struct device_attribute *attr, * tau4 = (4 | x) << y * but add 2 when doing the final right shift to account for units */ - tau4 = ((1 << x_w) | x) << y; + tau4 = (u64)((1 << x_w) | x) << y; /* val in hwmon interface units (millisec) */ out = mul_u64_u32_shr(tau4, SF_TIME, hwmon->scl_shift_time + x_w); @@ -211,7 +211,7 @@ hwm_power1_max_interval_store(struct device *dev, r = FIELD_PREP(PKG_MAX_WIN, PKG_MAX_WIN_DEFAULT); x = REG_FIELD_GET(PKG_MAX_WIN_X, r); y = REG_FIELD_GET(PKG_MAX_WIN_Y, r); - tau4 = ((1 << x_w) | x) << y; + tau4 = (u64)((1 << x_w) | x) << y; max_win = mul_u64_u32_shr(tau4, SF_TIME, hwmon->scl_shift_time + x_w); if (val > max_win)