Skip to content

Commit 95de914

Browse files
spandruvadajwrdegoede
authored andcommitted
platform/x86/intel: tpmi: Remove hardcoded unit and offset
Use sizeof(u32) for TPMI entry size units. Also add a define for capability offset unit size. Signed-off-by: Srinivas Pandruvada <[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 899c7b1 commit 95de914

File tree

1 file changed

+5
-3
lines changed
  • drivers/platform/x86/intel

1 file changed

+5
-3
lines changed

drivers/platform/x86/intel/tpmi.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
222222
snprintf(feature_id_name, sizeof(feature_id_name), "tpmi-%s", name);
223223

224224
for (i = 0, tmp = res; i < pfs->pfs_header.num_entries; i++, tmp++) {
225-
u64 entry_size_bytes = pfs->pfs_header.entry_size * 4;
225+
u64 entry_size_bytes = pfs->pfs_header.entry_size * sizeof(u32);
226226

227227
tmp->start = pfs->vsec_offset + entry_size_bytes * i;
228228
tmp->end = tmp->start + entry_size_bytes - 1;
@@ -277,7 +277,7 @@ static int tpmi_process_info(struct intel_tpmi_info *tpmi_info,
277277
void __iomem *info_mem;
278278

279279
info_mem = ioremap(pfs->vsec_offset + TPMI_INFO_BUS_INFO_OFFSET,
280-
pfs->pfs_header.entry_size * 4 - TPMI_INFO_BUS_INFO_OFFSET);
280+
pfs->pfs_header.entry_size * sizeof(u32) - TPMI_INFO_BUS_INFO_OFFSET);
281281
if (!info_mem)
282282
return -ENOMEM;
283283

@@ -308,6 +308,8 @@ static int tpmi_fetch_pfs_header(struct intel_tpmi_pm_feature *pfs, u64 start, i
308308
return 0;
309309
}
310310

311+
#define TPMI_CAP_OFFSET_UNIT 1024
312+
311313
static int intel_vsec_tpmi_init(struct auxiliary_device *auxdev)
312314
{
313315
struct intel_vsec_device *vsec_dev = auxdev_to_ivdev(auxdev);
@@ -354,7 +356,7 @@ static int intel_vsec_tpmi_init(struct auxiliary_device *auxdev)
354356
if (!pfs_start)
355357
pfs_start = res_start;
356358

357-
pfs->pfs_header.cap_offset *= 1024;
359+
pfs->pfs_header.cap_offset *= TPMI_CAP_OFFSET_UNIT;
358360

359361
pfs->vsec_offset = pfs_start + pfs->pfs_header.cap_offset;
360362

0 commit comments

Comments
 (0)