Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

platform/x86/intel/pmt: Add header to struct intel_pmt_entry

The PMT header is passed to several functions. Instead, store the header in
struct intel_pmt_entry which is also passed to these functions and shorten
the argument list. This simplifies the calls in preparation for later
changes. While here also perform a newline cleanup.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129222132.2331261-10-david.e.box@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

authored by

David E. Box and committed by
Hans de Goede
4d1b7efe e97ec7f6

+13 -15
+3 -5
drivers/platform/x86/intel/pmt/class.c
··· 159 159 }; 160 160 161 161 static int intel_pmt_populate_entry(struct intel_pmt_entry *entry, 162 - struct intel_pmt_header *header, 163 162 struct intel_vsec_device *ivdev, 164 163 struct resource *disc_res) 165 164 { 166 165 struct pci_dev *pci_dev = ivdev->pcidev; 167 166 struct device *dev = &ivdev->auxdev.dev; 167 + struct intel_pmt_header *header = &entry->header; 168 168 u8 bir; 169 169 170 170 /* ··· 313 313 struct intel_vsec_device *intel_vsec_dev, int idx) 314 314 { 315 315 struct device *dev = &intel_vsec_dev->auxdev.dev; 316 - struct intel_pmt_header header; 317 316 struct resource *disc_res; 318 317 int ret; 319 318 ··· 322 323 if (IS_ERR(entry->disc_table)) 323 324 return PTR_ERR(entry->disc_table); 324 325 325 - ret = ns->pmt_header_decode(entry, &header, dev); 326 + ret = ns->pmt_header_decode(entry, dev); 326 327 if (ret) 327 328 return ret; 328 329 329 - ret = intel_pmt_populate_entry(entry, &header, intel_vsec_dev, disc_res); 330 + ret = intel_pmt_populate_entry(entry, intel_vsec_dev, disc_res); 330 331 if (ret) 331 332 return ret; 332 333 333 334 return intel_pmt_dev_register(entry, ns, dev); 334 - 335 335 } 336 336 EXPORT_SYMBOL_NS_GPL(intel_pmt_dev_create, INTEL_PMT); 337 337
+8 -8
drivers/platform/x86/intel/pmt/class.h
··· 18 18 #define GET_BIR(v) ((v) & GENMASK(2, 0)) 19 19 #define GET_ADDRESS(v) ((v) & GENMASK(31, 3)) 20 20 21 + struct intel_pmt_header { 22 + u32 base_offset; 23 + u32 size; 24 + u32 guid; 25 + u8 access_type; 26 + }; 27 + 21 28 struct intel_pmt_entry { 29 + struct intel_pmt_header header; 22 30 struct bin_attribute pmt_bin_attr; 23 31 struct kobject *kobj; 24 32 void __iomem *disc_table; ··· 37 29 int devid; 38 30 }; 39 31 40 - struct intel_pmt_header { 41 - u32 base_offset; 42 - u32 size; 43 - u32 guid; 44 - u8 access_type; 45 - }; 46 - 47 32 struct intel_pmt_namespace { 48 33 const char *name; 49 34 struct xarray *xa; 50 35 const struct attribute_group *attr_grp; 51 36 int (*pmt_header_decode)(struct intel_pmt_entry *entry, 52 - struct intel_pmt_header *header, 53 37 struct device *dev); 54 38 }; 55 39
+1 -1
drivers/platform/x86/intel/pmt/crashlog.c
··· 223 223 }; 224 224 225 225 static int pmt_crashlog_header_decode(struct intel_pmt_entry *entry, 226 - struct intel_pmt_header *header, 227 226 struct device *dev) 228 227 { 229 228 void __iomem *disc_table = entry->disc_table; 229 + struct intel_pmt_header *header = &entry->header; 230 230 struct crashlog_entry *crashlog; 231 231 232 232 if (!pmt_crashlog_supported(entry))
+1 -1
drivers/platform/x86/intel/pmt/telemetry.c
··· 58 58 } 59 59 60 60 static int pmt_telem_header_decode(struct intel_pmt_entry *entry, 61 - struct intel_pmt_header *header, 62 61 struct device *dev) 63 62 { 64 63 void __iomem *disc_table = entry->disc_table; 64 + struct intel_pmt_header *header = &entry->header; 65 65 66 66 if (pmt_telem_region_overlaps(entry, dev)) 67 67 return 1;