Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: 91576acab020 ("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>
authored by
Srinivas Pandruvada
and committed by
Ilpo Järvinen
dc7901b5
0e5aef27
+33
-21
+33
-21
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
+33
-21
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
···
1723
1723
void tpmi_sst_dev_suspend(struct auxiliary_device *auxdev)
1724
1724
{
1725
1725
struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(auxdev);
1726
-
struct tpmi_per_power_domain_info *power_domain_info;
1726
+
struct tpmi_per_power_domain_info *power_domain_info, *pd_info;
1727
1727
struct oobmsm_plat_info *plat_info;
1728
1728
void __iomem *cp_base;
1729
+
int num_resources, i;
1729
1730
1730
1731
plat_info = tpmi_get_platform_data(auxdev);
1731
1732
if (!plat_info)
1732
1733
return;
1733
1734
1734
1735
power_domain_info = tpmi_sst->power_domain_info[plat_info->partition];
1736
+
num_resources = tpmi_sst->number_of_power_domains[plat_info->partition];
1735
1737
1736
-
cp_base = power_domain_info->sst_base + power_domain_info->sst_header.cp_offset;
1737
-
power_domain_info->saved_sst_cp_control = readq(cp_base + SST_CP_CONTROL_OFFSET);
1738
+
for (i = 0; i < num_resources; i++) {
1739
+
pd_info = &power_domain_info[i];
1740
+
if (!pd_info || !pd_info->sst_base)
1741
+
continue;
1738
1742
1739
-
memcpy_fromio(power_domain_info->saved_clos_configs, cp_base + SST_CLOS_CONFIG_0_OFFSET,
1740
-
sizeof(power_domain_info->saved_clos_configs));
1743
+
cp_base = pd_info->sst_base + pd_info->sst_header.cp_offset;
1744
+
pd_info->saved_sst_cp_control = readq(cp_base + SST_CP_CONTROL_OFFSET);
1745
+
memcpy_fromio(pd_info->saved_clos_configs, cp_base + SST_CLOS_CONFIG_0_OFFSET,
1746
+
sizeof(pd_info->saved_clos_configs));
1747
+
memcpy_fromio(pd_info->saved_clos_assocs, cp_base + SST_CLOS_ASSOC_0_OFFSET,
1748
+
sizeof(pd_info->saved_clos_assocs));
1741
1749
1742
-
memcpy_fromio(power_domain_info->saved_clos_assocs, cp_base + SST_CLOS_ASSOC_0_OFFSET,
1743
-
sizeof(power_domain_info->saved_clos_assocs));
1744
-
1745
-
power_domain_info->saved_pp_control = readq(power_domain_info->sst_base +
1746
-
power_domain_info->sst_header.pp_offset +
1747
-
SST_PP_CONTROL_OFFSET);
1750
+
pd_info->saved_pp_control = readq(pd_info->sst_base +
1751
+
pd_info->sst_header.pp_offset +
1752
+
SST_PP_CONTROL_OFFSET);
1753
+
}
1748
1754
}
1749
1755
EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_suspend, "INTEL_TPMI_SST");
1750
1756
1751
1757
void tpmi_sst_dev_resume(struct auxiliary_device *auxdev)
1752
1758
{
1753
1759
struct tpmi_sst_struct *tpmi_sst = auxiliary_get_drvdata(auxdev);
1754
-
struct tpmi_per_power_domain_info *power_domain_info;
1760
+
struct tpmi_per_power_domain_info *power_domain_info, *pd_info;
1755
1761
struct oobmsm_plat_info *plat_info;
1756
1762
void __iomem *cp_base;
1763
+
int num_resources, i;
1757
1764
1758
1765
plat_info = tpmi_get_platform_data(auxdev);
1759
1766
if (!plat_info)
1760
1767
return;
1761
1768
1762
1769
power_domain_info = tpmi_sst->power_domain_info[plat_info->partition];
1770
+
num_resources = tpmi_sst->number_of_power_domains[plat_info->partition];
1763
1771
1764
-
cp_base = power_domain_info->sst_base + power_domain_info->sst_header.cp_offset;
1765
-
writeq(power_domain_info->saved_sst_cp_control, cp_base + SST_CP_CONTROL_OFFSET);
1772
+
for (i = 0; i < num_resources; i++) {
1773
+
pd_info = &power_domain_info[i];
1774
+
if (!pd_info || !pd_info->sst_base)
1775
+
continue;
1766
1776
1767
-
memcpy_toio(cp_base + SST_CLOS_CONFIG_0_OFFSET, power_domain_info->saved_clos_configs,
1768
-
sizeof(power_domain_info->saved_clos_configs));
1777
+
cp_base = pd_info->sst_base + pd_info->sst_header.cp_offset;
1778
+
writeq(pd_info->saved_sst_cp_control, cp_base + SST_CP_CONTROL_OFFSET);
1779
+
memcpy_toio(cp_base + SST_CLOS_CONFIG_0_OFFSET, pd_info->saved_clos_configs,
1780
+
sizeof(pd_info->saved_clos_configs));
1781
+
memcpy_toio(cp_base + SST_CLOS_ASSOC_0_OFFSET, pd_info->saved_clos_assocs,
1782
+
sizeof(pd_info->saved_clos_assocs));
1769
1783
1770
-
memcpy_toio(cp_base + SST_CLOS_ASSOC_0_OFFSET, power_domain_info->saved_clos_assocs,
1771
-
sizeof(power_domain_info->saved_clos_assocs));
1772
-
1773
-
writeq(power_domain_info->saved_pp_control, power_domain_info->sst_base +
1774
-
power_domain_info->sst_header.pp_offset + SST_PP_CONTROL_OFFSET);
1784
+
writeq(pd_info->saved_pp_control, power_domain_info->sst_base +
1785
+
pd_info->sst_header.pp_offset + SST_PP_CONTROL_OFFSET);
1786
+
}
1775
1787
}
1776
1788
EXPORT_SYMBOL_NS_GPL(tpmi_sst_dev_resume, "INTEL_TPMI_SST");
1777
1789