From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 BBF7F56853A for ; Wed, 9 Sep 2026 14:58:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788965907; cv=none; b=LMq6HmldXckC2AMDa+ow8sTHzkwCne98z1B6j8Kt5M7rhW1CbIUgbYjr5LjkUSMfBDGfBHFggZtm82tqc3dDctf/GKsoFjgBgJpU666dOIcfsiEQQzgePhf9lA0B00NaPhBxWGKSOlezpAJyvgl4GhDniwaTpfxwz8VS42txIMQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788965907; c=relaxed/simple; bh=6nBbkbnDu8xRFbE5KqTld6bkAEeENlTUtc6ebPWRFOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tmupffzsK2b439sVrVFYsiQiN+4LfzDOSJWa3MDPnxGHcSiWTVAzbkaNRekAtoJJ1w8V87KSjrE20NirzzLXqWVRxUCbN5Wmg3w+USel8QW7y42D0T5ekUWkPBPhEGf53zyBHWpdHkR0aHorkmSYL68AM0TrXbP/XfQPSSyZUJk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KMswlqgY; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KMswlqgY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB0771F00A3D; Wed, 9 Sep 2026 14:58:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788965905; bh=47cuowGKwhZLjYzzH2m9iLNlyZkIfs4a9qyeWT67yMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KMswlqgYUoGyJ1Iu1rtf1OmiaZV+ge2GGW/MmZTcwzOIWxOdjSMIVJQDp0hlxY2Ze QIc1K6FpiKqHrYTcmiXRU2ZQQI/dR6LurMvkXQ/SJgQIBWOPZ4GMvKyUPL1EcDcH1Z lmxnzCh9/09BekqWYAoiRtnXtsvK/M18+Yxp6kxHVs9Jb+1UmNRWBYccH1TbVKpszd T+t8C7S0GgdUG8kCxorzJ83sZrFc581dOgkftSLE5a2ntn4eOinEN2afSDDgLfVjDW zcbsQP89cpNi1K4LRAQGejNjPw/itsV+R8e/aTVTNrOCxCHXyplOXasYdpvkHpUfKW FSMnZqtBHHgbQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Srinivas Pandruvada , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede , Sasha Levin Subject: [PATCH 6.6.y 2/7] platform/x86/intel/tpmi: Move TPMI ID definition Date: Wed, 9 Sep 2026 10:58:17 -0400 Message-ID: <20260909145822.2742457-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909145822.2742457-1-sashal@kernel.org> References: <2026090339-boxcar-confused-152e@gregkh> <20260909145822.2742457-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Srinivas Pandruvada [ Upstream commit 046d7be6210e7f870e53eb38fd410237e9d1d88f ] Move TPMI ID definitions to common include file. In this way other feature drivers don't have to redefine. Signed-off-by: Srinivas Pandruvada Reviewed-by: Ilpo Järvinen Link: https://lore.kernel.org/r/20231204221740.3645130-4-srinivas.pandruvada@linux.intel.com Signed-off-by: Hans de Goede Stable-dep-of: f9a647cb8d90 ("platform/x86: ISST: Return error during profile addition") Signed-off-by: Sasha Levin --- drivers/platform/x86/intel/tpmi.c | 13 ------------- include/linux/intel_tpmi.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c index 4c42c28bdd3d4..021e56f52ac12 100644 --- a/drivers/platform/x86/intel/tpmi.c +++ b/drivers/platform/x86/intel/tpmi.c @@ -143,19 +143,6 @@ struct tpmi_info_header { u64 lock:1; } __packed; -/* - * List of supported TMPI IDs. - * Some TMPI IDs are not used by Linux, so the numbers are not consecutive. - */ -enum intel_tpmi_id { - TPMI_ID_RAPL = 0, /* Running Average Power Limit */ - TPMI_ID_PEM = 1, /* Power and Perf excursion Monitor */ - TPMI_ID_UNCORE = 2, /* Uncore Frequency Scaling */ - TPMI_ID_SST = 5, /* Speed Select Technology */ - TPMI_CONTROL_ID = 0x80, /* Special ID for getting feature status */ - TPMI_INFO_ID = 0x81, /* Special ID for PCI BDF and Package ID information */ -}; - /* * The size from hardware is in u32 units. This size is from a trusted hardware, * but better to verify for pre silicon platforms. Set size to 0, when invalid. diff --git a/include/linux/intel_tpmi.h b/include/linux/intel_tpmi.h index ee07393445f9f..fdcebb8c30e98 100644 --- a/include/linux/intel_tpmi.h +++ b/include/linux/intel_tpmi.h @@ -12,6 +12,19 @@ #define TPMI_MINOR_VERSION(val) FIELD_GET(GENMASK(4, 0), val) #define TPMI_MAJOR_VERSION(val) FIELD_GET(GENMASK(7, 5), val) +/* + * List of supported TMPI IDs. + * Some TMPI IDs are not used by Linux, so the numbers are not consecutive. + */ +enum intel_tpmi_id { + TPMI_ID_RAPL = 0, /* Running Average Power Limit */ + TPMI_ID_PEM = 1, /* Power and Perf excursion Monitor */ + TPMI_ID_UNCORE = 2, /* Uncore Frequency Scaling */ + TPMI_ID_SST = 5, /* Speed Select Technology */ + TPMI_CONTROL_ID = 0x80, /* Special ID for getting feature status */ + TPMI_INFO_ID = 0x81, /* Special ID for PCI BDF and Package ID information */ +}; + /** * struct intel_tpmi_plat_info - Platform information for a TPMI device instance * @package_id: CPU Package id -- 2.53.0