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

platform/x86/intel/tpmi: Modify external interface to get read/write state 

mainline inclusion
from mainline-v6.8
commit 72dd14d241e1c6e241fc5b265746c59f306c6aa3
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=72dd14d241e1c6e241fc5b265746c59f306c6aa3



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

Intel-SIG: commit 72dd14d241e1 platform/x86/intel/tpmi: Modify external interface to get read/write state.
Backport intel tpmi base driver update for 6.6 from 6.10

Modify the external interface tpmi_get_feature_status() to get read
and write blocked instead of locked and disabled. Since auxiliary device
is not created when disabled, no use of returning disabled state. Also
locked state is not useful as feature driver can't use locked state
in a meaningful way.

Using read and write state, feature driver can decide which operations
to restrict for that feature.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231204221740.3645130-3-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 0d6718d3

drivers/platform/x86/intel/tpmi.c

+4 −4
Original line number Diff line number Diff line
@@ -345,8 +345,8 @@ static int tpmi_read_feature_status(struct intel_tpmi_info *tpmi_info, int featu 
	return ret;

}



int tpmi_get_feature_status(struct auxiliary_device *auxdev, int feature_id,

			    int *locked, int *disabled)

int tpmi_get_feature_status(struct auxiliary_device *auxdev,

			    int feature_id, bool *read_blocked, bool *write_blocked)

{

	struct intel_vsec_device *intel_vsec_dev = dev_to_ivdev(auxdev->dev.parent);

	struct intel_tpmi_info *tpmi_info = auxiliary_get_drvdata(&intel_vsec_dev->auxdev);
@@ -357,8 +357,8 @@ int tpmi_get_feature_status(struct auxiliary_device *auxdev, int feature_id, 
	if (ret)

		return ret;



	*locked = feature_state.locked;

	*disabled = !feature_state.enabled;

	*read_blocked = feature_state.read_blocked;

	*write_blocked = feature_state.write_blocked;



	return 0;

}

include/linux/intel_tpmi.h

+2 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ struct intel_tpmi_plat_info { 
struct intel_tpmi_plat_info *tpmi_get_platform_data(struct auxiliary_device *auxdev);

struct resource *tpmi_get_resource_at_index(struct auxiliary_device *auxdev, int index);

int tpmi_get_resource_count(struct auxiliary_device *auxdev);



int tpmi_get_feature_status(struct auxiliary_device *auxdev, int feature_id, int *locked,

			    int *disabled);

int tpmi_get_feature_status(struct auxiliary_device *auxdev, int feature_id, bool *read_blocked,

			    bool *write_blocked);

#endif