Skip to content

Commit ba7e421

Browse files
debox1jwrdegoede
authored andcommitted
platform/x86/intel/pmt: telemetry: Fix fixed region handling
Use the telem_type and the fixed block guid to determine if an entry is a fixed region. For certain platforms we don't support this. Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com> Signed-off-by: David E. Box <david.e.box@linux.intel.com> Signed-off-by: Gayatri Kammela <gayatri.kammela@linux.intel.com> Link: https://lore.kernel.org/r/20220629221334.434307-4-gayatri.kammela@linux.intel.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 99de050 commit ba7e421

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

drivers/platform/x86/intel/pmt/telemetry.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,19 @@
2323
#define TELEM_GUID_OFFSET 0x4
2424
#define TELEM_BASE_OFFSET 0x8
2525
#define TELEM_ACCESS(v) ((v) & GENMASK(3, 0))
26+
#define TELEM_TYPE(v) (((v) & GENMASK(7, 4)) >> 4)
2627
/* size is in bytes */
2728
#define TELEM_SIZE(v) (((v) & GENMASK(27, 12)) >> 10)
2829

2930
/* Used by client hardware to identify a fixed telemetry entry*/
3031
#define TELEM_CLIENT_FIXED_BLOCK_GUID 0x10000000
3132

33+
enum telem_type {
34+
TELEM_TYPE_PUNIT = 0,
35+
TELEM_TYPE_CRASHLOG,
36+
TELEM_TYPE_PUNIT_FIXED,
37+
};
38+
3239
struct pmt_telem_priv {
3340
int num_entries;
3441
struct intel_pmt_entry entry[];
@@ -39,10 +46,15 @@ static bool pmt_telem_region_overlaps(struct intel_pmt_entry *entry,
3946
{
4047
u32 guid = readl(entry->disc_table + TELEM_GUID_OFFSET);
4148

42-
if (guid != TELEM_CLIENT_FIXED_BLOCK_GUID)
43-
return false;
49+
if (intel_pmt_is_early_client_hw(dev)) {
50+
u32 type = TELEM_TYPE(readl(entry->disc_table));
51+
52+
if ((type == TELEM_TYPE_PUNIT_FIXED) ||
53+
(guid == TELEM_CLIENT_FIXED_BLOCK_GUID))
54+
return true;
55+
}
4456

45-
return intel_pmt_is_early_client_hw(dev);
57+
return false;
4658
}
4759

4860
static int pmt_telem_header_decode(struct intel_pmt_entry *entry,

0 commit comments

Comments
 (0)