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

platform/x86/intel/tpmi: Don't create devices for disabled features 

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



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

Intel-SIG: commit b87434f2e6fe platform/x86/intel/tpmi: Don't create devices for disabled features.
Backport intel tpmi base driver update for 6.6 from 6.10

If some TPMI features are disabled, don't create auxiliary devices. In
this way feature drivers will not load.

While creating auxiliary devices, call tpmi_read_feature_status() to
check feature state and return if the feature is disabled without
creating a device.

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-2-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 d41771b2

drivers/platform/x86/intel/tpmi.c

+13 −1
Original line number Diff line number Diff line
@@ -598,9 +598,21 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info, 
	struct intel_vsec_device *vsec_dev = tpmi_info->vsec_dev;

	char feature_id_name[TPMI_FEATURE_NAME_LEN];

	struct intel_vsec_device *feature_vsec_dev;

	struct tpmi_feature_state feature_state;

	struct resource *res, *tmp;

	const char *name;

	int i;

	int i, ret;



	ret = tpmi_read_feature_status(tpmi_info, pfs->pfs_header.tpmi_id, &feature_state);

	if (ret)

		return ret;



	/*

	 * If not enabled, continue to look at other features in the PFS, so return -EOPNOTSUPP.

	 * This will not cause failure of loading of this driver.

	 */

	if (!feature_state.enabled)

		return -EOPNOTSUPP;



	name = intel_tpmi_name(pfs->pfs_header.tpmi_id);

	if (!name)