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

platform/x86/intel/tpmi: Change vsec offset to u64 

mainline inclusion
from mainline-v6.9
commit 57221a07ff37ff356f9265acd228bc3c8744c8fc
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=57221a07ff37ff356f9265acd228bc3c8744c8fc



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

Intel-SIG: commit 57221a07ff37 platform/x86/intel/tpmi: Change vsec offset to u64.
Backport intel tpmi base driver update for 5.10

The vsec offset can be 64 bit long depending on the PFS start. So change
type to u64. Also use 64 bit formatting for seq_printf.

Fixes: 47731fd2 ("platform/x86/intel: Intel TPMI enumeration driver")
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: stable@vger.kernel.org # v6.3+
Link: https://lore.kernel.org/r/20240305194644.2077867-1-srinivas.pandruvada@linux.intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 082c7244

drivers/platform/x86/intel_vsec_tpmi.c

+5 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct intel_tpmi_pfs_entry { 
 */

struct intel_tpmi_pm_feature {

	struct intel_tpmi_pfs_entry pfs_header;

	unsigned int vsec_offset;

	u64 vsec_offset;

	struct intel_vsec_device *vsec_dev;

};
@@ -376,7 +376,7 @@ static int tpmi_pfs_dbg_show(struct seq_file *s, void *unused) 
			read_blocked = feature_state.read_blocked ? 'Y' : 'N';

			write_blocked = feature_state.write_blocked ? 'Y' : 'N';

		}

		seq_printf(s, "0x%02x\t\t0x%02x\t\t0x%04x\t\t0x%04x\t\t0x%02x\t\t0x%08x\t%c\t%c\t\t%c\t\t%c\n",

		seq_printf(s, "0x%02x\t\t0x%02x\t\t0x%04x\t\t0x%04x\t\t0x%02x\t\t0x%016llx\t%c\t%c\t\t%c\t\t%c\n",

			   pfs->pfs_header.tpmi_id, pfs->pfs_header.num_entries,

			   pfs->pfs_header.entry_size, pfs->pfs_header.cap_offset,

			   pfs->pfs_header.attribute, pfs->vsec_offset, locked, disabled,
@@ -395,7 +395,8 @@ static int tpmi_mem_dump_show(struct seq_file *s, void *unused) 
	struct intel_tpmi_pm_feature *pfs = s->private;

	int count, ret = 0;

	void __iomem *mem;

	u32 off, size;

	u32 size;

	u64 off;

	u8 *buffer;



	size = TPMI_GET_SINGLE_ENTRY_SIZE(pfs);
@@ -411,7 +412,7 @@ static int tpmi_mem_dump_show(struct seq_file *s, void *unused) 
	mutex_lock(&tpmi_dev_lock);



	for (count = 0; count < pfs->pfs_header.num_entries; ++count) {

		seq_printf(s, "TPMI Instance:%d offset:0x%x\n", count, off);

		seq_printf(s, "TPMI Instance:%d offset:0x%llx\n", count, off);



		mem = ioremap(off, size);

		if (!mem) {