platform/x86: ISST: Fix for write lock and suspend/resume
Subsystems (3)
Srinivas Pandruvada
maintainerv2 cover platform/x86: ISST: Fix for write lock and suspend/resume
There are two issues, which are not urgent as the current deployed systems don't support them, but need fixes:
- Write lock- Even if the TPMI is write locked it will still write to MMIO
- store-restore data during suspend/resume: Not storing and restoring data to all power domains.
v2:
One minor fix for new line
Srinivas Pandruvada (2):
platform/x86: ISST: Add missing write block check platform/x86: ISST: Store and restore all domains data
.../intel/speed_select_if/isst_tpmi_core.c | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-)
Signature · 1 line
2.52.0
Srinivas Pandruvada
maintainerPATCH v2 1/2 platform/x86: ISST: Add missing write block check
If writes are blocked, then return error during SST-CP enable command. Add missing write block check in this code path.
---
v2:
- No change
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c +3 -0
@@ -612,6 +612,9 @@ static long isst_if_core_power_state(void __user *argp)return -EINVAL ;if (core_power.get_set) { +if (power_domain_info->write_blocked) +return -EPERM ; +_write_cp_info ("cp_enable" , core_power.enable,SST_CP_CONTROL_OFFSET , SST_CP_ENABLE_START, SST_CP_ENABLE_WIDTH, SST_MUL_FACTOR_NONE) _write_cp_info("cp_prio_type", core_power.priority_type, SST_CP_CONTROL_OFFSET,
Signature · 1 line
2.52.0
Srinivas Pandruvada
maintainerPATCH v2 2/2 platform/x86: ISST: Store and restore all domains data
In reply to Srinivas PandruvadaThe 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.
---
v2:
- Remove new line in tpmi_sst_dev_suspend() after cp_base assignment
.../intel/speed_select_if/isst_tpmi_core.c | 54 +++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-)
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c +33 -21
@@ -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 + -SST_PP_CONTROL_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" );
Signature · 1 line
2.52.0
Ilpo Järvinen
maintainerQuoted 10 lines · Srinivas Pandruvada
There are two issues, which are not urgent as the current deployed systems don't support them, but need fixes:
- Write lock- Even if the TPMI is write locked it will still write to MMIO
- store-restore data during suspend/resume: Not storing and restoring data to all power domains.v2:
One minor fix for new line[...]
Thank you for your contribution, it has been applied to my local review-ilpo-next branch. Note it will show up in the public platform-drivers-x86/review-ilpo-next branch only once I've pushed my local branch there, which might take a while.
The list of commits applied:
[1/2] platform/x86: ISST: Add missing write block check
commit: 51bec3adb6006e070fefd43a3fabcd4446b910f2
[2/2] platform/x86: ISST: Store and restore all domains data
commit: c2cacb320ade6beca0e02d399a4385181409ebdd--
i.