rjmcmahon
/
umber-kernel
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

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

[ Upstream commit dc7901b5a1563a9c9eb29b3b0b0dac3162065cd8 ]

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: 91576acab0 ("platform/x86: ISST: Add suspend/resume callbacks")
Signed-off-by: Srinivas 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: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Srinivas Pandruvada 2026-01-06 22:02:56 -08:00 committed by Sasha Levin
parent 067d784870
commit e3704ce5d7
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
View File

@ -1723,55 +1723,67 @@ EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_remove, "INTEL_TPMI_SST");
void tpmi_sst_dev_suspend(struct auxiliary_device *auxdev) void tpmi_sst_dev_suspend(struct auxiliary_device *auxdev)
{ {
struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(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; struct oobmsm_plat_info *plat_info;
void __iomem *cp_base; void __iomem *cp_base;
int num_resources, i;
plat_info = tpmi_get_platform_data(auxdev); plat_info = tpmi_get_platform_data(auxdev);
if (!plat_info) if (!plat_info)
return; return;
power_domain_info = tpmi_sst->power_domain_info[plat_info->partition]; 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; for (i = 0; i < num_resources; i++) {
power_domain_info->saved_sst_cp_control = readq(cp_base + SST_CP_CONTROL_OFFSET); pd_info = &power_domain_info[i];
if (!pd_info || !pd_info->sst_base)
continue;
memcpy_fromio(power_domain_info->saved_clos_configs, cp_base + SST_CLOS_CONFIG_0_OFFSET, cp_base = pd_info->sst_base + pd_info->sst_header.cp_offset;
sizeof(power_domain_info->saved_clos_configs)); 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));
memcpy_fromio(power_domain_info->saved_clos_assocs, cp_base + SST_CLOS_ASSOC_0_OFFSET, pd_info->saved_pp_control = readq(pd_info->sst_base +
sizeof(power_domain_info->saved_clos_assocs)); pd_info->sst_header.pp_offset +
SST_PP_CONTROL_OFFSET);
power_domain_info->saved_pp_control = readq(power_domain_info->sst_base + }
power_domain_info->sst_header.pp_offset +
SST_PP_CONTROL_OFFSET);
} }
EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_suspend, "INTEL_TPMI_SST"); EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_suspend, "INTEL_TPMI_SST");
void tpmi_sst_dev_resume(struct auxiliary_device *auxdev) void tpmi_sst_dev_resume(struct auxiliary_device *auxdev)
{ {
struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(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; struct oobmsm_plat_info *plat_info;
void __iomem *cp_base; void __iomem *cp_base;
int num_resources, i;
plat_info = tpmi_get_platform_data(auxdev); plat_info = tpmi_get_platform_data(auxdev);
if (!plat_info) if (!plat_info)
return; return;
power_domain_info = tpmi_sst->power_domain_info[plat_info->partition]; 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; for (i = 0; i < num_resources; i++) {
writeq(power_domain_info->saved_sst_cp_control, cp_base + SST_CP_CONTROL_OFFSET); pd_info = &power_domain_info[i];
if (!pd_info || !pd_info->sst_base)
continue;
memcpy_toio(cp_base + SST_CLOS_CONFIG_0_OFFSET, power_domain_info->saved_clos_configs, cp_base = pd_info->sst_base + pd_info->sst_header.cp_offset;
sizeof(power_domain_info->saved_clos_configs)); 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));
memcpy_toio(cp_base + SST_CLOS_ASSOC_0_OFFSET, power_domain_info->saved_clos_assocs, writeq(pd_info->saved_pp_control, power_domain_info->sst_base +
sizeof(power_domain_info->saved_clos_assocs)); pd_info->sst_header.pp_offset + SST_PP_CONTROL_OFFSET);
}
writeq(power_domain_info->saved_pp_control, power_domain_info->sst_base +
power_domain_info->sst_header.pp_offset + SST_PP_CONTROL_OFFSET);
} }
EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_resume, "INTEL_TPMI_SST"); EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_resume, "INTEL_TPMI_SST");