Commit 9dc1c8b0 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jia, Yingbao
Browse files

platform/x86/intel/tpmi: Move TPMI ID definition 

mainline inclusion
from mainline-v6.8
commit 046d7be6210e7f870e53eb38fd410237e9d1d88f
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QCJ
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=046d7be6210e7f870e53eb38fd410237e9d1d88f



-------------------------------------------------

Intel-SIG: commit 046d7be6210e platform/x86/intel/tpmi: Move TPMI ID definition.
Backport intel tpmi base driver update for 6.6 from 6.10

Move TPMI ID definitions to common include file. In this way other
feature drivers don't have to redefine.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231204221740.3645130-4-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent ff34b321

drivers/platform/x86/intel/tpmi.c

+0 −13
Original line number Diff line number Diff line
@@ -170,19 +170,6 @@ struct tpmi_feature_state { 
	u32 locked: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.

include/linux/intel_tpmi.h

+13 −0
Original line number Diff line number Diff line
@@ -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