sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

peci: Clear status on completion

Browse Source 
The PECI-over-eSPI implementation, like the legacy implementation, must
acknowledge when the transaction is done by clearing the bit in the
register.

Fixes a hang during shutdown on oryp11 after unplugging a TBT display.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2023-06-21 12:44:12 -06:00
parent c7288a5a60
commit dd555b9012
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/board/system76/common/peci.c
View File

@ -135,6 +135,8 @@ bool peci_get_temp(int16_t *data) {
return false; return false;
} }
} }
// Clear upstream done status
ESUCTRL0 = ESUCTRL0_DONE;
// Wait for response // Wait for response
//TODO: do this asynchronously to avoid delays? //TODO: do this asynchronously to avoid delays?
@ -155,10 +157,14 @@ bool peci_get_temp(int16_t *data) {
uint8_t low = PUTOOBDB[5]; uint8_t low = PUTOOBDB[5];
uint8_t high = PUTOOBDB[6]; uint8_t high = PUTOOBDB[6];
*data = (((int16_t)high << 8) | (int16_t)low); *data = (((int16_t)high << 8) | (int16_t)low);
// Clear PUT_OOB status
ESOCTRL0 = ESOCTRL0_STATUS;
return true; return true;
} else { } else {
// Did not receive enough data // Did not receive enough data
DEBUG("peci_get_temp: len %d < 7\n", len); DEBUG("peci_get_temp: len %d < 7\n", len);
// Clear PUT_OOB status
ESOCTRL0 = ESOCTRL0_STATUS;
return false; return false;
} }
} }
@ -223,6 +229,8 @@ int16_t peci_wr_pkg_config(uint8_t index, uint16_t param, uint32_t data) {
return false; return false;
} }
} }
// Clear upstream done status
ESUCTRL0 = ESUCTRL0_DONE;
// Wait for response // Wait for response
//TODO: do this asynchronously to avoid delays? //TODO: do this asynchronously to avoid delays?
@ -242,6 +250,10 @@ int16_t peci_wr_pkg_config(uint8_t index, uint16_t param, uint32_t data) {
// Received enough data for status code // Received enough data for status code
int16_t cc = (int16_t)PUTOOBDB[5]; int16_t cc = (int16_t)PUTOOBDB[5];
// Clear PUT_OOB status
ESOCTRL0 = ESOCTRL0_STATUS;
if (cc & 0x80) { if (cc & 0x80) {
return -cc; return -cc;
} else { } else {
@ -250,6 +262,8 @@ int16_t peci_wr_pkg_config(uint8_t index, uint16_t param, uint32_t data) {
} else { } else {
// Did not receive enough data // Did not receive enough data
DEBUG("peci_wr_pkg_config: len %d < 6\n", len); DEBUG("peci_wr_pkg_config: len %d < 6\n", len);
// Clear PUT_OOB status
ESOCTRL0 = ESOCTRL0_STATUS;
return -0x1000; return -0x1000;
} }
} }