platform/x86: intel_pmc_core: Make pmc_core_lpm_display() generic for platforms that...
authorGayatri Kammela <gayatri.kammela@intel.com>
Tue, 3 Mar 2020 21:28:08 +0000 (13:28 -0800)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 20 Mar 2020 12:47:01 +0000 (14:47 +0200)
Currently pmc_core_lpm_display() uses an array of the struct pointers,
i.e.  tgl_lpm_maps for Tiger Lake directly to iterate through and to get
the number of (live) status registers which is hard coded and can not
be re-used for the future platforms that support sub-states. To maintain
readability, make pmc_core_lpm_display() generic, so that it can be re-used
for future platforms.

Cc: Chen Zhou <chenzhou10@huawei.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: David E. Box <david.e.box@intel.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/platform/x86/intel_pmc_core.c

index 986fe67..6ddb74d 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <linux/suspend.h>
 #include <linux/uaccess.h>
 
@@ -639,20 +640,35 @@ static void pmc_core_slps0_display(struct pmc_dev *pmcdev, struct device *dev,
        }
 }
 
+static int pmc_core_lpm_get_arr_size(const struct pmc_bit_map **maps)
+{
+       int idx;
+
+       for (idx = 0; maps[idx]; idx++)
+               ;/* Nothing */
+
+       return idx;
+}
+
 static void pmc_core_lpm_display(struct pmc_dev *pmcdev, struct device *dev,
                                 struct seq_file *s, u32 offset,
                                 const char *str,
                                 const struct pmc_bit_map **maps)
 {
-       u32 lpm_regs[ARRAY_SIZE(tgl_lpm_maps)-1];
-       int index, idx, len = 32, bit_mask;
+       int index, idx, len = 32, bit_mask, arr_size;
+       u32 *lpm_regs;
+
+       arr_size = pmc_core_lpm_get_arr_size(maps);
+       lpm_regs = kmalloc_array(arr_size, sizeof(*lpm_regs), GFP_KERNEL);
+       if (!lpm_regs)
+               return;
 
-       for (index = 0; tgl_lpm_maps[index]; index++) {
+       for (index = 0; index < arr_size; index++) {
                lpm_regs[index] = pmc_core_reg_read(pmcdev, offset);
                offset += 4;
        }
 
-       for (idx = 0; maps[idx]; idx++) {
+       for (idx = 0; idx < arr_size; idx++) {
                if (dev)
                        dev_dbg(dev, "\nLPM_%s_%d:\t0x%x\n", str, idx,
                                lpm_regs[idx]);
@@ -671,6 +687,8 @@ static void pmc_core_lpm_display(struct pmc_dev *pmcdev, struct device *dev,
                                           lpm_regs[idx] & bit_mask ? 1 : 0);
                }
        }
+
+       kfree(lpm_regs);
 }
 
 #if IS_ENABLED(CONFIG_DEBUG_FS)