Skip to content

Commit

Permalink
tpm: make check_locality return bool
Browse files Browse the repository at this point in the history 
Since check_locality is checking to see if a certain
locality is active, return true if active otherwise
return false.

Cc: Christophe Ricard <christophe.ricard@gmail.com>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Marcel Selhorst <tpmdd@selhorst.net>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  • Loading branch information
Jerry Snitselaar authored and Jarkko Sakkinen committed Apr 3, 2017
1 parent 67c2f3d commit 84d2594
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 21 deletions.
12 changes: 6 additions & 6 deletions drivers/char/tpm/st33zp24/st33zp24.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ static u8 st33zp24_status(struct tpm_chip *chip)
/*
* check_locality if the locality is active
* @param: chip, the tpm chip description
* @return: the active locality or -EACCESS.
* @return: true if LOCALITY0 is active, otherwise false
*/
static int check_locality(struct tpm_chip *chip)
static bool check_locality(struct tpm_chip *chip)
{
struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);
u8 data;
Expand All @@ -129,9 +129,9 @@ static int check_locality(struct tpm_chip *chip)
if (status && (data &
(TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) ==
(TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID))
return tpm_dev->locality;
return true;

return -EACCES;
return false;
} /* check_locality() */

/*
Expand All @@ -146,7 +146,7 @@ static int request_locality(struct tpm_chip *chip)
long ret;
u8 data;

if (check_locality(chip) == tpm_dev->locality)
if (check_locality(chip))
return tpm_dev->locality;

data = TPM_ACCESS_REQUEST_USE;
Expand All @@ -158,7 +158,7 @@ static int request_locality(struct tpm_chip *chip)

/* Request locality is usually effective after the request */
do {
if (check_locality(chip) >= 0)
if (check_locality(chip))
return tpm_dev->locality;
msleep(TPM_TIMEOUT);
} while (time_before(jiffies, stop));
Expand Down
12 changes: 6 additions & 6 deletions drivers/char/tpm/tpm_i2c_infineon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,22 +278,22 @@ enum tis_defaults {
#define TPM_DATA_FIFO(l) (0x0005 | ((l) << 4))
#define TPM_DID_VID(l) (0x0006 | ((l) << 4))

static int check_locality(struct tpm_chip *chip, int loc)
static bool check_locality(struct tpm_chip *chip, int loc)
{
u8 buf;
int rc;

rc = iic_tpm_read(TPM_ACCESS(loc), &buf, 1);
if (rc < 0)
return rc;
return false;

if ((buf & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) ==
(TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) {
tpm_dev.locality = loc;
return loc;
return true;
}

return -EIO;
return false;
}

/* implementation similar to tpm_tis */
Expand All @@ -315,15 +315,15 @@ static int request_locality(struct tpm_chip *chip, int loc)
unsigned long stop;
u8 buf = TPM_ACCESS_REQUEST_USE;

if (check_locality(chip, loc) >= 0)
if (check_locality(chip, loc))
return loc;

iic_tpm_write(TPM_ACCESS(loc), &buf, 1);

/* wait for burstcount */
stop = jiffies + chip->timeout_a;
do {
if (check_locality(chip, loc) >= 0)
if (check_locality(chip, loc))
return loc;
usleep_range(TPM_TIMEOUT_US_LOW, TPM_TIMEOUT_US_HI);
} while (time_before(jiffies, stop));
Expand Down
20 changes: 11 additions & 9 deletions drivers/char/tpm/tpm_tis_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,23 @@ static int wait_startup(struct tpm_chip *chip, int l)
return -1;
}

static int check_locality(struct tpm_chip *chip, int l)
static bool check_locality(struct tpm_chip *chip, int l)
{
struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
int rc;
u8 access;

rc = tpm_tis_read8(priv, TPM_ACCESS(l), &access);
if (rc < 0)
return rc;
return false;

if ((access & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) ==
(TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID))
return priv->locality = l;
(TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) {
priv->locality = l;
return true;
}

return -1;
return false;
}

static void release_locality(struct tpm_chip *chip, int l, int force)
Expand All @@ -96,7 +98,7 @@ static int request_locality(struct tpm_chip *chip, int l)
unsigned long stop, timeout;
long rc;

if (check_locality(chip, l) >= 0)
if (check_locality(chip, l))
return l;

rc = tpm_tis_write8(priv, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE);
Expand All @@ -112,7 +114,7 @@ static int request_locality(struct tpm_chip *chip, int l)
return -1;
rc = wait_event_interruptible_timeout(priv->int_queue,
(check_locality
(chip, l) >= 0),
(chip, l)),
timeout);
if (rc > 0)
return l;
Expand All @@ -123,7 +125,7 @@ static int request_locality(struct tpm_chip *chip, int l)
} else {
/* wait for burstcount */
do {
if (check_locality(chip, l) >= 0)
if (check_locality(chip, l))
return l;
msleep(TPM_TIMEOUT);
} while (time_before(jiffies, stop));
Expand Down Expand Up @@ -535,7 +537,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
wake_up_interruptible(&priv->read_queue);
if (interrupt & TPM_INTF_LOCALITY_CHANGE_INT)
for (i = 0; i < 5; i++)
if (check_locality(chip, i) >= 0)
if (check_locality(chip, i))
break;
if (interrupt &
(TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT |
Expand Down

0 comments on commit 84d2594

Please sign in to comment.