diff options
| author | Claudio Carvalho <cclaudio@linux.vnet.ibm.com> | 2016-11-28 01:08:02 -0200 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-11-29 18:33:13 +1100 |
| commit | 52cf034c0a416d90a7b996c2e86959e6c457b1f3 (patch) | |
| tree | dd0acd93aa292e7b8fb5b1e92409bcd5b3317e80 | |
| parent | 39d05f12f11467589002696d57f0e893ce4d98d6 (diff) | |
| download | skiboot-52cf034c0a416d90a7b996c2e86959e6c457b1f3.zip skiboot-52cf034c0a416d90a7b996c2e86959e6c457b1f3.tar.gz skiboot-52cf034c0a416d90a7b996c2e86959e6c457b1f3.tar.bz2 | |
tpm_i2c_nuvoton: add tpm_check_status()
This adds the tpm_check_status(), which makes the code more easy to read
and also allows the use of a mask to check status.
Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
(cherry picked from commit 830717695a8bf4114cdffab3d40a3508c5b129b1)
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | libstb/drivers/tpm_i2c_nuvoton.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/libstb/drivers/tpm_i2c_nuvoton.c b/libstb/drivers/tpm_i2c_nuvoton.c index 755bb16..b6a9202 100644 --- a/libstb/drivers/tpm_i2c_nuvoton.c +++ b/libstb/drivers/tpm_i2c_nuvoton.c @@ -65,6 +65,11 @@ static int tpm_status_write_byte(uint8_t byte) sizeof(value)); } +static bool tpm_check_status(uint8_t status, uint8_t mask, uint8_t expected) +{ + return ((status & mask) == expected); +} + static int tpm_read_sts_reg_valid(uint8_t* value) { int polls, rc; @@ -75,8 +80,7 @@ static int tpm_read_sts_reg_valid(uint8_t* value) TPM_STS, 1, value, sizeof(uint8_t)); if (rc < 0) return rc; - if (rc == 0 && - ((*value & TPM_STS_VALID) == TPM_STS_VALID)) + if (tpm_check_status(*value, TPM_STS_VALID, TPM_STS_VALID)) return 0; /* Wait TPM STS register be settled */ time_wait_ms(5); @@ -98,8 +102,10 @@ static bool tpm_is_command_ready(int* rc) *rc = tpm_i2c_request_send(tpm_device->bus_id, tpm_device->xscom_base, SMBUS_READ, TPM_STS, 1, &value, sizeof(value)); - if (*rc == 0 && - ((value & TPM_STS_COMMAND_READY) == TPM_STS_COMMAND_READY)){ + if (*rc < 0) + false; + if (tpm_check_status(value, TPM_STS_COMMAND_READY, + TPM_STS_COMMAND_READY)) { DBG("---- TPM is command ready\n"); return true; } @@ -141,8 +147,9 @@ static bool tpm_is_expecting(int* rc) { uint8_t value = 0; *rc = tpm_read_sts_reg_valid(&value); - if (*rc == 0 && - (( value & TPM_STS_EXPECT) == TPM_STS_EXPECT)) + if (*rc < 0) + return false; + if (tpm_check_status(value, TPM_STS_EXPECT, TPM_STS_EXPECT)) return true; return false; } @@ -152,11 +159,10 @@ static bool tpm_is_data_avail(int* rc) uint8_t value = 0; *rc = tpm_read_sts_reg_valid(&value); - - if (*rc == 0 && (( value & - TPM_STS_DATA_AVAIL) == TPM_STS_DATA_AVAIL)) + if (*rc < 0) + return false; + if (tpm_check_status(value, TPM_STS_DATA_AVAIL, TPM_STS_DATA_AVAIL)) return true; - return false; } |