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

platform/x86/intel/tpmi: Handle error from tpmi_process_info() 

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



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

Intel-SIG: commit 2920141fc149 platform/x86/intel/tpmi: Handle error from tpmi_process_info().
Backport intel tpmi base driver update for 5.10

When tpmi_process_info() returns error, fail to load the driver.
This can happen if call to ioremap() returns error.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: stable@vger.kernel.org # v6.3+
Link: https://lore.kernel.org/r/20240423204619.3946901-2-srinivas.pandruvada@linux.intel.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.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 da6e938e

drivers/platform/x86/intel_vsec_tpmi.c

+5 −2
Original line number Diff line number Diff line
@@ -763,8 +763,11 @@ static int intel_vsec_tpmi_init(struct auxiliary_device *auxdev) 
		 * when actual device nodes created outside this

		 * loop via tpmi_create_devices().

		 */

		if (pfs->pfs_header.tpmi_id == TPMI_INFO_ID)

			tpmi_process_info(tpmi_info, pfs);

		if (pfs->pfs_header.tpmi_id == TPMI_INFO_ID) {

			ret = tpmi_process_info(tpmi_info, pfs);

			if (ret)

				return ret;

		}



		if (pfs->pfs_header.tpmi_id == TPMI_CONTROL_ID)

			tpmi_set_control_base(auxdev, tpmi_info, pfs);