Unverified Commit 934954df authored by David E. Box's avatar David E. Box Committed by Ilpo Järvinen
Browse files

platform/x86/intel/tpmi: Relocate platform info to intel_vsec.h 



The TPMI platform information provides a mapping of OOBMSM PCI devices to
logical CPUs. Since this mapping is consistent across all OOBMSM features
(e.g., TPMI, PMT, SDSi), it can be leveraged by multiple drivers. To
facilitate reuse, relocate the struct intel_tpmi_plat_info to intel_vsec.h,
renaming it to struct oobmsm_plat_info, making it accessible to other
features. While modifying headers, place them in alphabetical order.

Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20250703022832.1302928-11-david.e.box@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 2e7ba521

drivers/platform/x86/intel/plr_tpmi.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/err.h>

#include <linux/gfp_types.h>

#include <linux/intel_tpmi.h>

#include <linux/intel_vsec.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/kstrtox.h>
@@ -256,7 +257,7 @@ DEFINE_SHOW_STORE_ATTRIBUTE(plr_status); 


static int intel_plr_probe(struct auxiliary_device *auxdev, const struct auxiliary_device_id *id)

{

	struct intel_tpmi_plat_info *plat_info;

	struct oobmsm_plat_info *plat_info;

	struct dentry *dentry;

	int i, num_resources;

	struct resource *res;

drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c

+5 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/auxiliary_bus.h>

#include <linux/delay.h>

#include <linux/intel_tpmi.h>

#include <linux/intel_vsec.h>

#include <linux/fs.h>

#include <linux/io.h>

#include <linux/kernel.h>
@@ -1546,7 +1547,7 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev) 
{

	struct tpmi_per_power_domain_info *pd_info;

	bool read_blocked = 0, write_blocked = 0;

	struct intel_tpmi_plat_info *plat_info;

	struct oobmsm_plat_info *plat_info;

	struct device *dev = &auxdev->dev;

	struct tpmi_sst_struct *tpmi_sst;

	u8 i, num_resources, io_die_cnt;
@@ -1698,7 +1699,7 @@ EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_add, "INTEL_TPMI_SST"); 
void tpmi_sst_dev_remove(struct auxiliary_device *auxdev)

{

	struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(auxdev);

	struct intel_tpmi_plat_info *plat_info;

	struct oobmsm_plat_info *plat_info;



	plat_info = tpmi_get_platform_data(auxdev);

	if (!plat_info)
@@ -1720,7 +1721,7 @@ void tpmi_sst_dev_suspend(struct auxiliary_device *auxdev) 
{

	struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(auxdev);

	struct tpmi_per_power_domain_info *power_domain_info;

	struct intel_tpmi_plat_info *plat_info;

	struct oobmsm_plat_info *plat_info;

	void __iomem *cp_base;



	plat_info = tpmi_get_platform_data(auxdev);
@@ -1748,7 +1749,7 @@ void tpmi_sst_dev_resume(struct auxiliary_device *auxdev) 
{

	struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(auxdev);

	struct tpmi_per_power_domain_info *power_domain_info;

	struct intel_tpmi_plat_info *plat_info;

	struct oobmsm_plat_info *plat_info;

	void __iomem *cp_base;



	plat_info = tpmi_get_platform_data(auxdev);

drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c

+4 −3
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ 
#include <linux/auxiliary_bus.h>

#include <linux/bitfield.h>

#include <linux/bits.h>

#include <linux/intel_tpmi.h>

#include <linux/intel_vsec.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/intel_tpmi.h>



#include "../tpmi_power_domains.h"

#include "uncore-frequency-common.h"
@@ -448,7 +449,7 @@ static void remove_cluster_entries(struct tpmi_uncore_struct *tpmi_uncore) 
}



static void set_cdie_id(int domain_id, struct tpmi_uncore_cluster_info *cluster_info,

		       struct intel_tpmi_plat_info *plat_info)

			struct oobmsm_plat_info *plat_info)

{



	cluster_info->cdie_id = domain_id;
@@ -465,7 +466,7 @@ static void set_cdie_id(int domain_id, struct tpmi_uncore_cluster_info *cluster_ 
static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_device_id *id)

{

	bool read_blocked = 0, write_blocked = 0;

	struct intel_tpmi_plat_info *plat_info;

	struct oobmsm_plat_info *plat_info;

	struct tpmi_uncore_struct *tpmi_uncore;

	bool uncore_sysfs_added = false;

	int ret, i, pkg = 0;

drivers/platform/x86/intel/vsec_tpmi.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct intel_tpmi_info { 
	struct intel_vsec_device *vsec_dev;

	int feature_count;

	u64 pfs_start;

	struct intel_tpmi_plat_info plat_info;

	struct oobmsm_plat_info plat_info;

	void __iomem *tpmi_control_mem;

	struct dentry *dbgfs_dir;

};
@@ -187,7 +187,7 @@ struct tpmi_feature_state { 
/* Used during auxbus device creation */

static DEFINE_IDA(intel_vsec_tpmi_ida);



struct intel_tpmi_plat_info *tpmi_get_platform_data(struct auxiliary_device *auxdev)

struct oobmsm_plat_info *tpmi_get_platform_data(struct auxiliary_device *auxdev)

{

	struct intel_vsec_device *vsec_dev = auxdev_to_ivdev(auxdev);

drivers/powercap/intel_rapl_tpmi.c

+5 −4
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/auxiliary_bus.h>

#include <linux/io.h>

#include <linux/intel_tpmi.h>

#include <linux/intel_rapl.h>

#include <linux/intel_tpmi.h>

#include <linux/intel_vsec.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/slab.h>
@@ -48,7 +49,7 @@ enum tpmi_rapl_register { 


struct tpmi_rapl_package {

	struct rapl_if_priv priv;

	struct intel_tpmi_plat_info *tpmi_info;

	struct oobmsm_plat_info *tpmi_info;

	struct rapl_package *rp;

	void __iomem *base;

	struct list_head node;
@@ -253,7 +254,7 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev, 
				 const struct auxiliary_device_id *id)

{

	struct tpmi_rapl_package *trp;

	struct intel_tpmi_plat_info *info;

	struct oobmsm_plat_info *info;

	struct resource *res;

	u32 offset;

	int ret;