Unverified Commit dc7901b5 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Ilpo Järvinen
Browse files

platform/x86: ISST: Store and restore all domains data 



The suspend/resume callbacks currently only store and restore the
configuration for power domain 0. However, other power domains may also
have modified configurations that need to be preserved across suspend/
resume cycles.

Extend the store/restore functionality to handle all power domains.

Fixes: 91576aca ("platform/x86: ISST: Add suspend/resume callbacks")
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
CC: stable@vger.kernel.org
Link: https://patch.msgid.link/20260107060256.1634188-3-srinivas.pandruvada@linux.intel.com


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

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

+33 −21
Original line number Diff line number Diff line
@@ -1723,55 +1723,67 @@ EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_remove, "INTEL_TPMI_SST"); 
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 tpmi_per_power_domain_info *power_domain_info, *pd_info;

	struct oobmsm_plat_info *plat_info;

	void __iomem *cp_base;

	int num_resources, i;



	plat_info = tpmi_get_platform_data(auxdev);

	if (!plat_info)

		return;



	power_domain_info = tpmi_sst->power_domain_info[plat_info->partition];

	num_resources = tpmi_sst->number_of_power_domains[plat_info->partition];



	cp_base = power_domain_info->sst_base + power_domain_info->sst_header.cp_offset;

	power_domain_info->saved_sst_cp_control = readq(cp_base + SST_CP_CONTROL_OFFSET);



	memcpy_fromio(power_domain_info->saved_clos_configs, cp_base + SST_CLOS_CONFIG_0_OFFSET,

		      sizeof(power_domain_info->saved_clos_configs));

	for (i = 0; i < num_resources; i++) {

		pd_info = &power_domain_info[i];

		if (!pd_info || !pd_info->sst_base)

			continue;



	memcpy_fromio(power_domain_info->saved_clos_assocs, cp_base + SST_CLOS_ASSOC_0_OFFSET,

		      sizeof(power_domain_info->saved_clos_assocs));

		cp_base = pd_info->sst_base + pd_info->sst_header.cp_offset;

		pd_info->saved_sst_cp_control = readq(cp_base + SST_CP_CONTROL_OFFSET);

		memcpy_fromio(pd_info->saved_clos_configs, cp_base + SST_CLOS_CONFIG_0_OFFSET,

			      sizeof(pd_info->saved_clos_configs));

		memcpy_fromio(pd_info->saved_clos_assocs, cp_base + SST_CLOS_ASSOC_0_OFFSET,

			      sizeof(pd_info->saved_clos_assocs));



	power_domain_info->saved_pp_control = readq(power_domain_info->sst_base +

						    power_domain_info->sst_header.pp_offset +

		pd_info->saved_pp_control = readq(pd_info->sst_base +

						  pd_info->sst_header.pp_offset +

						  SST_PP_CONTROL_OFFSET);

	}

}

EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_suspend, "INTEL_TPMI_SST");



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 tpmi_per_power_domain_info *power_domain_info, *pd_info;

	struct oobmsm_plat_info *plat_info;

	void __iomem *cp_base;

	int num_resources, i;



	plat_info = tpmi_get_platform_data(auxdev);

	if (!plat_info)

		return;



	power_domain_info = tpmi_sst->power_domain_info[plat_info->partition];

	num_resources = tpmi_sst->number_of_power_domains[plat_info->partition];



	cp_base = power_domain_info->sst_base + power_domain_info->sst_header.cp_offset;

	writeq(power_domain_info->saved_sst_cp_control, cp_base + SST_CP_CONTROL_OFFSET);



	memcpy_toio(cp_base + SST_CLOS_CONFIG_0_OFFSET, power_domain_info->saved_clos_configs,

		    sizeof(power_domain_info->saved_clos_configs));

	for (i = 0; i < num_resources; i++) {

		pd_info = &power_domain_info[i];

		if (!pd_info || !pd_info->sst_base)

			continue;



	memcpy_toio(cp_base + SST_CLOS_ASSOC_0_OFFSET, power_domain_info->saved_clos_assocs,

		    sizeof(power_domain_info->saved_clos_assocs));

		cp_base = pd_info->sst_base + pd_info->sst_header.cp_offset;

		writeq(pd_info->saved_sst_cp_control, cp_base + SST_CP_CONTROL_OFFSET);

		memcpy_toio(cp_base + SST_CLOS_CONFIG_0_OFFSET, pd_info->saved_clos_configs,

			    sizeof(pd_info->saved_clos_configs));

		memcpy_toio(cp_base + SST_CLOS_ASSOC_0_OFFSET, pd_info->saved_clos_assocs,

			    sizeof(pd_info->saved_clos_assocs));



	writeq(power_domain_info->saved_pp_control, power_domain_info->sst_base +

				power_domain_info->sst_header.pp_offset + SST_PP_CONTROL_OFFSET);

		writeq(pd_info->saved_pp_control, power_domain_info->sst_base +

		       pd_info->sst_header.pp_offset + SST_PP_CONTROL_OFFSET);

	}

}

EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_resume, "INTEL_TPMI_SST");