GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/common/smbus: remove misleading definition 

SMBHST_STAT_NOERROR was a redefinition of SMBHST_STAT_INTERRUPT that was
used in smbus_wait_until_done. Remove the misleading bit definition that
also didn't correspond with the register definitions and replace it with
the definition of the actual bit that gets checked. Also add a comment
that the code actually checks the IRQ status flag to see if the last
command is already completed.

Change-Id: I1a58fe0d58d3887dd2e83320e977a57e271685b3
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48219
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Felix Held 2020-12-01 21:29:59 +01:00
parent 43a5f88bb4
commit f42da176de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/amd/common/block/include/amdblocks/smbus.h
View File

@ -11,7 +11,6 @@
#define SMBHST_STAT_INTERRUPT (1 << 1) #define SMBHST_STAT_INTERRUPT (1 << 1)
#define SMBHST_STAT_BUSY (1 << 0) #define SMBHST_STAT_BUSY (1 << 0)
#define SMBHST_STAT_CLEAR 0xff #define SMBHST_STAT_CLEAR 0xff
#define SMBHST_STAT_NOERROR (1 << 1) /* TODO: this one looks odd */
#define SMBHST_STAT_VAL_BITS 0x1f #define SMBHST_STAT_VAL_BITS 0x1f
#define SMBHST_STAT_ERROR_BITS 0x1c #define SMBHST_STAT_ERROR_BITS 0x1c

3
src/soc/amd/common/block/smbus/smbus.c
View File

@ -69,7 +69,8 @@ static int smbus_wait_until_done(uintptr_t mmio)
val &= SMBHST_STAT_VAL_BITS; /* mask off reserved bits */ val &= SMBHST_STAT_VAL_BITS; /* mask off reserved bits */
if (val & SMBHST_STAT_ERROR_BITS) if (val & SMBHST_STAT_ERROR_BITS)
return -5; /* error */ return -5; /* error */
if (val == SMBHST_STAT_NOERROR) { /* check IRQ status bit to see if the last host command is completed */
if (val == SMBHST_STAT_INTERRUPT) {
controller_write8(mmio, SMBHSTSTAT, val); /* clr sts */ controller_write8(mmio, SMBHSTSTAT, val); /* clr sts */
return 0; return 0;
} }