Skip to content

Commit 59eb081

Browse files
spandruvadajwrdegoede
authored andcommitted
platform/x86/intel/tpmi: Check major version change for TPMI Information
Check the major version from TPMI information header and fail to load driver if the version is not supported. Signed-off-by: Srinivas Pandruvada <[email protected]> Reviewed-by: Ilpo Järvinen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent 2920141 commit 59eb081

File tree

1 file changed

+13
-4
lines changed
  • drivers/platform/x86/intel

1 file changed

+13
-4
lines changed

drivers/platform/x86/intel/tpmi.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,28 +666,37 @@ static int tpmi_create_devices(struct intel_tpmi_info *tpmi_info)
666666
}
667667

668668
#define TPMI_INFO_BUS_INFO_OFFSET 0x08
669+
#define TPMI_INFO_MAJOR_VERSION 0x00
669670

670671
static int tpmi_process_info(struct intel_tpmi_info *tpmi_info,
671672
struct intel_tpmi_pm_feature *pfs)
672673
{
673674
struct tpmi_info_header header;
674675
void __iomem *info_mem;
676+
u64 feature_header;
677+
int ret = 0;
675678

676-
info_mem = ioremap(pfs->vsec_offset + TPMI_INFO_BUS_INFO_OFFSET,
677-
pfs->pfs_header.entry_size * sizeof(u32) - TPMI_INFO_BUS_INFO_OFFSET);
679+
info_mem = ioremap(pfs->vsec_offset, pfs->pfs_header.entry_size * sizeof(u32));
678680
if (!info_mem)
679681
return -ENOMEM;
680682

681-
memcpy_fromio(&header, info_mem, sizeof(header));
683+
feature_header = readq(info_mem);
684+
if (TPMI_MAJOR_VERSION(feature_header) != TPMI_INFO_MAJOR_VERSION) {
685+
ret = -ENODEV;
686+
goto error_info_header;
687+
}
688+
689+
memcpy_fromio(&header, info_mem + TPMI_INFO_BUS_INFO_OFFSET, sizeof(header));
682690

683691
tpmi_info->plat_info.package_id = header.pkg;
684692
tpmi_info->plat_info.bus_number = header.bus;
685693
tpmi_info->plat_info.device_number = header.dev;
686694
tpmi_info->plat_info.function_number = header.fn;
687695

696+
error_info_header:
688697
iounmap(info_mem);
689698

690-
return 0;
699+
return ret;
691700
}
692701

693702
static int tpmi_fetch_pfs_header(struct intel_tpmi_pm_feature *pfs, u64 start, int size)

0 commit comments

Comments
 (0)