common: peci: WIP peci_get_temp over espi

src/board/system76/common/peci.c

@@ -69,7 +69,85 @@ static struct Fan __code FAN = {
 
 #if USE_PECI_OVER_ESPI
 
-//TODO
+void peci_init(void) {}
+
+// Returns true on success, false on error
+bool peci_get_temp(int16_t * data) {
+    // Wait for completion
+    while (ESUCTRL0 & ESUCTRL0_BUSY) {}
+    // Clear upstream status
+    ESUCTRL0 = ESUCTRL0;
+    // Clear OOB status
+    ESOCTRL0 = ESOCTRL0;
+
+    // Set upstream cycle type
+    ESUCTRL1 = ESUCTRL1_OOB;
+    // Set upstream tag / length[11:8]
+    ESUCTRL2 = 0;
+    // Set upstream length [7:0] (size of PECI data plus 3)
+    ESUCTRL3 = 8;
+
+    // Destination address (0x10 is PCH, left shifted by one)
+    UDB[0] = 0x10 << 1;
+    // Command code (0x01 is PECI)
+    UDB[1] = 0x01;
+    // Set byte count
+    UDB[2] = 5;
+    // Set source address (0x0F is EC, left shifted by one, or with 1)
+    UDB[3] = (0x0F << 1) | 1;
+    // PECI target address (0x30 is default)
+    UDB[4] = 0x30;
+    // PECI write length
+    UDB[5] = 1;
+    // PECI read length
+    UDB[6] = 2;
+    // PECI command (0x01 = GetTemp)
+    UDB[7] = 0x01;
+
+    // Set upstream enable
+    ESUCTRL0 |= ESUCTRL0_ENABLE;
+    // Set upstream go
+    ESUCTRL0 |= ESUCTRL0_GO;
+
+    // Wait while upstream busy
+    while (ESUCTRL0 & ESUCTRL0_BUSY) {}
+
+    uint8_t status = ESUCTRL0;
+    if (status & ESUCTRL0_DONE) {
+        // Upstream is done
+    } else {
+        //TODO: Upstream not done, how do we get error message?
+    }
+
+    // Wait for response
+    //TODO: do this asynchronously to avoid delays
+    while (!(ESOCTRL0 & ESOCTRL0_STATUS)) {}
+
+    // Read response length
+    uint8_t len = ESOCTRL4;
+    if (len >= 7) {
+        //TODO: verify packet type, handle PECI status
+
+        // Received enough data for temperature
+        uint8_t low = PUTOOBDB[5];
+        uint8_t high = PUTOOBDB[6];
+        *data = (((int16_t)high << 8) | (int16_t)low);
+        return true;
+    } else {
+        // Did not receive enough data
+        return false;
+    }
+}
+
+// Returns positive completion code on success, negative completion code or
+// negative (0x1000 | status register) on PECI hardware error
+int16_t peci_wr_pkg_config(uint8_t index, uint16_t param, uint32_t data) {
+    //TODO: IMPLEMENT THIS STUB
+    index = index;
+    param = param;
+    data = data;
+    return 0;
+}
 
 #else // USE_PECI_OVER_ESPI
 
@@ -83,8 +161,8 @@ void peci_init(void) {
     PADCTLR = 0x02;
 }
 
-// Returns status register, caller must check for success
+// Returns true on success, false on error
-uint8_t peci_get_temp(int16_t * data) {
+bool peci_get_temp(int16_t * data) {
     // Wait for completion
     while (HOSTAR & 1) {}
     // Clear status
@@ -112,8 +190,10 @@ uint8_t peci_get_temp(int16_t * data) {
         uint8_t low = HORDDR;
         uint8_t high = HORDDR;
         *data = (((int16_t)high << 8) | (int16_t)low);
+        return true;
+    } else {
+        return false;
     }
-    return status;
 }
 
 // Returns positive completion code on success, negative completion code or
@@ -183,8 +263,7 @@ uint8_t peci_get_fan_duty(void) {
 
     if (peci_on) {
         int16_t peci_offset = 0;
-        uint8_t status = peci_get_temp(&peci_offset);
+        if (peci_get_temp(&peci_offset)) {
-        if (status & BIT(1)) {
             // Use result if finished successfully
             peci_temp = PECI_TEMP(T_JUNCTION) + (peci_offset >> 6);
             duty = fan_duty(&FAN, peci_temp);

src/board/system76/oryp11/board.mk

@@ -34,6 +34,9 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=17600 \
 	-DCHARGER_INPUT_CURRENT=11500
 
+# Use PECI over ESPI	
+CFLAGS+=-DUSE_PECI_OVER_ESPI=1
+
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=230 \

src/ec/ite/include/ec/espi.h

@@ -5,6 +5,8 @@
 
 #include <stdint.h>
 
+#include <common/macro.h>
+
 struct VirtualWire {
     volatile uint8_t __xdata *index;
     uint8_t shift;
@@ -105,17 +107,38 @@ volatile uint8_t __xdata __at(0x31A2) ESGCTRL2;
 volatile uint8_t __xdata __at(0x31A3) ESGCTRL3;
 
 // eSPI upstream control
+
+// Upstream flags
 volatile uint8_t __xdata __at(0x31B0) ESUCTRL0;
+    #define ESUCTRL0_ENABLE BIT(7)
+    #define ESUCTRL0_GO BIT(6)
+    #define ESUCTRL0_DONE BIT(1)
+    #define ESUCTRL0_BUSY BIT(0)
+
+// Upstream cycle type
 volatile uint8_t __xdata __at(0x31B1) ESUCTRL1;
+    // OOB message
+    #define ESUCTRL1_OOB 0x07
+
+// Upstream tag @ [7:4], upstream length [11:8] @ [3:0]
 volatile uint8_t __xdata __at(0x31B2) ESUCTRL2;
+
+// Upstream length [7:0]
 volatile uint8_t __xdata __at(0x31B3) ESUCTRL3;
+
 volatile uint8_t __xdata __at(0x31B6) ESUCTRL6;
 volatile uint8_t __xdata __at(0x31B7) ESUCTRL7;
 volatile uint8_t __xdata __at(0x31B8) ESUCTRL8;
 
 // eSPI OOB control
+
+// PUT_OOB status
 volatile uint8_t __xdata __at(0x31C0) ESOCTRL0;
+    #define ESOCTRL0_STATUS BIT(7)
+
 volatile uint8_t __xdata __at(0x31C1) ESOCTRL1;
+
+// PUT_OOB length
 volatile uint8_t __xdata __at(0x31C4) ESOCTRL4;
 
 // Virtual wires