From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0F1A12EAB71; Wed, 18 Feb 2026 03:04:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771383850; cv=none; b=EF+8krHxlOwCbjI2p/epCrQJcQ8qa/U+jEfyh32WES4RS2TW/+sA6zBC6XSleGHdy1lHKjUMOV7vSUNrA51tpiUjk33R3LdIpuu86Yyep80/8Z5BbKWrdgBd4Y6I1whWeNCGoTNWg8MkZGfTKbIA4gfXkzJJCJSBKFvsOwHwQeE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771383850; c=relaxed/simple; bh=o0+QiTejn6k3fu90Xt8/p7feziwL1cwx8n3N62q/etc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qS+DxuPnOzbbs33m8BhUVYwbw6yXPhLJI+j/qyHQClAe4MD/WbDBl//lQZz5JEgUI1N1BsZdxjTEOIlsToewsDjeyv5kT8OxqgOAwcNxLWzMCD1p+O6yxSRKKsACnotHj6ZApk+mfgrOAXnrDpoThN/EPFxOmKrPL2dEvICwEmM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KfOl0tjt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KfOl0tjt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E77FC4CEF7; Wed, 18 Feb 2026 03:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771383849; bh=o0+QiTejn6k3fu90Xt8/p7feziwL1cwx8n3N62q/etc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To:From; b=KfOl0tjtoJ564TahKnkK+V43Mc35Flo0CsZuH1pr7MdkfaRiNUnzcQMLOPw0sh4K5 Uh25ShR+W1l0z8vCfv+wX7w+Hr0jgnuZFBJ/NS0kLPxpfqh2sWBB43kLVLEIx3wv4Y GHg6zVMqbfYqcEfrgU7FLarR4QW+Cze0nqdC2MfrouyShtDdPNPaMEcu0qYZfkEdds woO0dQPkm/1kYWKMP4t5hK/E0qElrqR0eUzlGZzgvbbvUCnJppT68eYEXNm/A94Oyj S96cHXF4mJ91UBwX+QGKfO7cRkr7nqDH+a2YjoKS0U2HH737cbYdm3MiRiQuvdeRaf dU6OkN3br0CPQ== From: Len Brown To: torvalds@linux-foundation.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 1/1] tools/power turbostat: Fix AMD RAPL regression Date: Tue, 17 Feb 2026 21:02:04 -0600 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260218030402.694540-1-lenb@kernel.org> References: <20260218030402.694540-1-lenb@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reply-To: Len Brown Organization: Intel Open Source Technology Center Content-Transfer-Encoding: 8bit From: Len Brown turbostat.c:8688: rapl_perf_init: Assertion `next_domain < num_domains' failed. Revert a hunk from a cleanup patch that was not supposed to change anything... And once again, AMD RAPL is "special". Fixes: ddf60e38ca04 ("tools/power turbostat: Simplify global core_id calculation") Reported-by: Linus Torvalds Signed-off-by: Len Brown --- tools/power/x86/turbostat/turbostat.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 1aace9b3269e..606f3dead084 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -5161,10 +5161,17 @@ static inline int get_rapl_num_domains(void) static inline int get_rapl_domain_id(int cpu) { + int nr_cores_per_package = topo.max_core_id + 1; + int rapl_core_id; + if (!platform->has_per_core_rapl) return cpus[cpu].package_id; - return GLOBAL_CORE_ID(cpu, cpus[cpu].package_id); + /* Compute the system-wide unique core-id for @cpu */ + rapl_core_id = cpus[cpu].core_id; + rapl_core_id += cpus[cpu].package_id * nr_cores_per_package; + + return rapl_core_id; } /* -- 2.45.2