Commit ce73358c authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jia, Yingbao
Browse files

platform/x86: ISST: Process read/write blocked feature status 

mainline inclusion
from mainline-v6.8
commit 8bed9ff7dbcce4d1a436f7839be48c6fd5fac0ce
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QD3
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8bed9ff7dbcce4d1a436f7839be48c6fd5fac0ce



-------------------------------------------------

Intel-SIG: commit 8bed9ff7dbcc platform/x86: ISST: Process read/write blocked feature status.
Backport intel SST driver update for 5.10 from 6.10

When a feature is read blocked, don't continue to read SST information
and register with SST core.

When the feature is write blocked, continue to offer read interface for
SST parameters, but don't allow any operation to change state. A state
change results from SST level change, feature change or class of service
change.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231204221740.3645130-5-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 87fa1e0e

drivers/platform/x86/intel_speed_select_if/isst_tpmi_core.c

+25 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct perf_level { 
 * @saved_clos_configs:	Save SST-CP CLOS configuration to store restore for suspend/resume

 * @saved_clos_assocs:	Save SST-CP CLOS association to store restore for suspend/resume

 * @saved_pp_control:	Save SST-PP control information to store restore for suspend/resume

 * @write_blocked:	Write operation is blocked, so can't change SST state

 *

 * This structure is used store complete SST information for a power_domain. This information

 * is used to read/write request for any SST IOCTL. Each physical CPU package can have multiple
@@ -259,6 +260,7 @@ struct tpmi_per_power_domain_info { 
	u64 saved_clos_configs[4];

	u64 saved_clos_assocs[4];

	u64 saved_pp_control;

	bool write_blocked;

};



/**
@@ -515,6 +517,9 @@ static long isst_if_clos_param(void __user *argp) 
		return -EINVAL;



	if (clos_param.get_set) {

		if (power_domain_info->write_blocked)

			return -EPERM;



		_write_cp_info("clos.min_freq", clos_param.min_freq_mhz,

			       (SST_CLOS_CONFIG_0_OFFSET + clos_param.clos * SST_REG_SIZE),

			       SST_CLOS_CONFIG_MIN_START, SST_CLOS_CONFIG_MIN_WIDTH,
@@ -602,6 +607,9 @@ static long isst_if_clos_assoc(void __user *argp) 


		power_domain_info = &sst_inst->power_domain_info[punit_id];



		if (assoc_cmds.get_set && power_domain_info->write_blocked)

			return -EPERM;



		offset = SST_CLOS_ASSOC_0_OFFSET +

				(punit_cpu_no / SST_CLOS_ASSOC_CPUS_PER_REG) * SST_REG_SIZE;

		shift = punit_cpu_no % SST_CLOS_ASSOC_CPUS_PER_REG;
@@ -752,6 +760,9 @@ static int isst_if_set_perf_level(void __user *argp) 
	if (!power_domain_info)

		return -EINVAL;



	if (power_domain_info->write_blocked)

		return -EPERM;



	if (!(power_domain_info->pp_header.allowed_level_mask & BIT(perf_level.level)))

		return -EINVAL;
@@ -809,6 +820,9 @@ static int isst_if_set_perf_feature(void __user *argp) 
	if (!power_domain_info)

		return -EINVAL;



	if (power_domain_info->write_blocked)

		return -EPERM;



	_write_pp_info("perf_feature", perf_feature.feature, SST_PP_CONTROL_OFFSET,

		       SST_PP_FEATURE_STATE_START, SST_PP_FEATURE_STATE_WIDTH,

		       SST_MUL_FACTOR_NONE)
@@ -1257,11 +1271,21 @@ static long isst_if_def_ioctl(struct file *file, unsigned int cmd, 


int tpmi_sst_dev_add(struct auxiliary_device *auxdev)

{

	bool read_blocked = 0, write_blocked = 0;

	struct intel_tpmi_plat_info *plat_info;

	struct tpmi_sst_struct *tpmi_sst;

	int i, ret, pkg = 0, inst = 0;

	int num_resources;



	ret = tpmi_get_feature_status(auxdev, TPMI_ID_SST, &read_blocked, &write_blocked);

	if (ret)

		dev_info(&auxdev->dev, "Can't read feature status: ignoring read/write blocked status\n");



	if (read_blocked) {

		dev_info(&auxdev->dev, "Firmware has blocked reads, exiting\n");

		return -ENODEV;

	}



	plat_info = tpmi_get_platform_data(auxdev);

	if (!plat_info) {

		dev_err(&auxdev->dev, "No platform info\n");
@@ -1306,6 +1330,7 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev) 
		tpmi_sst->power_domain_info[i].package_id = pkg;

		tpmi_sst->power_domain_info[i].power_domain_id = i;

		tpmi_sst->power_domain_info[i].auxdev = auxdev;

		tpmi_sst->power_domain_info[i].write_blocked = write_blocked;

		tpmi_sst->power_domain_info[i].sst_base = devm_ioremap_resource(&auxdev->dev, res);

		if (IS_ERR(tpmi_sst->power_domain_info[i].sst_base))

			return PTR_ERR(tpmi_sst->power_domain_info[i].sst_base);