platform/x86: intel_pmc_core: Avoid a u32 overflow
authorRajat Jain <rajatja@google.com>
Sat, 16 Feb 2019 00:19:20 +0000 (16:19 -0800)
committerDarren Hart (VMware) <dvhart@infradead.org>
Sat, 23 Feb 2019 17:21:02 +0000 (09:21 -0800)
The register (SLP_S0_RES) at offset slp_s0_offset is a 32 bit register.
The pmc_core_adjust_slp_s0_step() could overflow the u32 value while
returning it after adjusting the step. Thus change to u64, this is
already accounted for in debugfs attribute (that wants to output a
64 bit value).

Signed-off-by: Rajat Jain <rajatja@google.com>
Acked-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/intel_pmc_core.c

index 835ed6d..08d8b45 100644 (file)
@@ -330,9 +330,9 @@ static inline void pmc_core_reg_write(struct pmc_dev *pmcdev, int
        writel(val, pmcdev->regbase + reg_offset);
 }
 
-static inline u32 pmc_core_adjust_slp_s0_step(u32 value)
+static inline u64 pmc_core_adjust_slp_s0_step(u32 value)
 {
-       return value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
+       return (u64)value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
 }
 
 static int pmc_core_dev_state_get(void *data, u64 *val)