Separate stepping from model in peci_GetCPUID()

Including the stepping in the CPUID was too granular and was
causing a lot of unnecessary updates to code that uses it.

This change returns the CPU model as the main parameter for
identifying the processor and gives the stepping as a separate
parameter in case it is needed.

Tested:
Combined with the changes in the consumers of this library,
verified that the CPU model can correctly be retreived and
used to determine the correct PECI calls to use.

Change-Id: Ifef3ed4c952bf303bcb43aebb6a013e91719756e
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/libpeci/peci.h b/libpeci/peci.h
index b68ea6c..81fba95 100644
--- a/libpeci/peci.h
+++ b/libpeci/peci.h
@@ -32,12 +32,8 @@ extern "C" {
 
 typedef enum
 {
-    skx = 0x00050654,
-    clx = 0x00050656,
-    clx2 = 0x00050657,
-    cpx = 0x0005065A,
+    skx = 0x00050650,
     icx = 0x000606A0,
-    icx2 = 0x000606A4,
 } CPUModel;
 
 // PECI Status Codes
@@ -235,7 +231,7 @@ void peci_Unlock(int peci_fd);
 EPECIStatus peci_Ping(uint8_t target);
 EPECIStatus peci_Ping_seq(uint8_t target, int peci_fd);
 EPECIStatus peci_GetCPUID(const uint8_t clientAddr, CPUModel* cpuModel,
-                          uint8_t* cc);
+                          uint8_t* stepping, uint8_t* cc);
 
 #ifdef __cplusplus
 }