Commit 87cdfdd1 authored by Nayna Jain's avatar Nayna Jain Committed by Jarkko Sakkinen
Browse files

tpm: move wait_for_tpm_stat() to respective driver files 



The function wait_for_tpm_stat() is currently defined in
tpm-interface file. It is a hardware specific function used
only by tpm_tis and xen-tpmfront, so it is removed from
tpm-interface.c and defined in respective driver files.

Suggested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarNayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent d21bd689

drivers/char/tpm/tpm-interface.c

+0 −60
Original line number Diff line number Diff line
@@ -1035,66 +1035,6 @@ int tpm_send(u32 chip_num, void *cmd, size_t buflen) 
}

EXPORT_SYMBOL_GPL(tpm_send);



static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,

					bool check_cancel, bool *canceled)

{

	u8 status = chip->ops->status(chip);



	*canceled = false;

	if ((status & mask) == mask)

		return true;

	if (check_cancel && chip->ops->req_canceled(chip, status)) {

		*canceled = true;

		return true;

	}

	return false;

}



int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,

		      wait_queue_head_t *queue, bool check_cancel)

{

	unsigned long stop;

	long rc;

	u8 status;

	bool canceled = false;



	/* check current status */

	status = chip->ops->status(chip);

	if ((status & mask) == mask)

		return 0;



	stop = jiffies + timeout;



	if (chip->flags & TPM_CHIP_FLAG_IRQ) {

again:

		timeout = stop - jiffies;

		if ((long)timeout <= 0)

			return -ETIME;

		rc = wait_event_interruptible_timeout(*queue,

			wait_for_tpm_stat_cond(chip, mask, check_cancel,

					       &canceled),

			timeout);

		if (rc > 0) {

			if (canceled)

				return -ECANCELED;

			return 0;

		}

		if (rc == -ERESTARTSYS && freezing(current)) {

			clear_thread_flag(TIF_SIGPENDING);

			goto again;

		}

	} else {

		do {

			tpm_msleep(TPM_TIMEOUT);

			status = chip->ops->status(chip);

			if ((status & mask) == mask)

				return 0;

		} while (time_before(jiffies, stop));

	}

	return -ETIME;

}

EXPORT_SYMBOL_GPL(wait_for_tpm_stat);



#define TPM_ORD_SAVESTATE 152

#define SAVESTATE_RESULT_SIZE 10

drivers/char/tpm/tpm.h

+0 −2
Original line number Diff line number Diff line
@@ -512,8 +512,6 @@ int tpm_do_selftest(struct tpm_chip *chip); 
unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm_pm_suspend(struct device *dev);

int tpm_pm_resume(struct device *dev);

int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,

		      wait_queue_head_t *queue, bool check_cancel);



static inline void tpm_msleep(unsigned int delay_msec)

{

drivers/char/tpm/tpm_tis_core.c

+60 −0
Original line number Diff line number Diff line
@@ -31,6 +31,66 @@ 
#include "tpm.h"

#include "tpm_tis_core.h"



static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,

					bool check_cancel, bool *canceled)

{

	u8 status = chip->ops->status(chip);



	*canceled = false;

	if ((status & mask) == mask)

		return true;

	if (check_cancel && chip->ops->req_canceled(chip, status)) {

		*canceled = true;

		return true;

	}

	return false;

}



static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,

		unsigned long timeout, wait_queue_head_t *queue,

		bool check_cancel)

{

	unsigned long stop;

	long rc;

	u8 status;

	bool canceled = false;



	/* check current status */

	status = chip->ops->status(chip);

	if ((status & mask) == mask)

		return 0;



	stop = jiffies + timeout;



	if (chip->flags & TPM_CHIP_FLAG_IRQ) {

again:

		timeout = stop - jiffies;

		if ((long)timeout <= 0)

			return -ETIME;

		rc = wait_event_interruptible_timeout(*queue,

			wait_for_tpm_stat_cond(chip, mask, check_cancel,

					       &canceled),

			timeout);

		if (rc > 0) {

			if (canceled)

				return -ECANCELED;

			return 0;

		}

		if (rc == -ERESTARTSYS && freezing(current)) {

			clear_thread_flag(TIF_SIGPENDING);

			goto again;

		}

	} else {

		do {

			tpm_msleep(TPM_TIMEOUT);

			status = chip->ops->status(chip);

			if ((status & mask) == mask)

				return 0;

		} while (time_before(jiffies, stop));

	}

	return -ETIME;

}



/* Before we attempt to access the TPM we must see that the valid bit is set.

 * The specification says that this bit is 0 at reset and remains 0 until the

 * 'TPM has gone through its self test and initialization and has established

drivers/char/tpm/xen-tpmfront.c

+61 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/errno.h>

#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/freezer.h>

#include <xen/xen.h>

#include <xen/events.h>

#include <xen/interface/io/tpmif.h>
@@ -39,6 +40,66 @@ enum status_bits { 
	VTPM_STATUS_CANCELED = 0x8,

};



static bool wait_for_tpm_stat_cond(struct tpm_chip *chip, u8 mask,

					bool check_cancel, bool *canceled)

{

	u8 status = chip->ops->status(chip);



	*canceled = false;

	if ((status & mask) == mask)

		return true;

	if (check_cancel && chip->ops->req_canceled(chip, status)) {

		*canceled = true;

		return true;

	}

	return false;

}



static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask,

		unsigned long timeout, wait_queue_head_t *queue,

		bool check_cancel)

{

	unsigned long stop;

	long rc;

	u8 status;

	bool canceled = false;



	/* check current status */

	status = chip->ops->status(chip);

	if ((status & mask) == mask)

		return 0;



	stop = jiffies + timeout;



	if (chip->flags & TPM_CHIP_FLAG_IRQ) {

again:

		timeout = stop - jiffies;

		if ((long)timeout <= 0)

			return -ETIME;

		rc = wait_event_interruptible_timeout(*queue,

			wait_for_tpm_stat_cond(chip, mask, check_cancel,

					       &canceled),

			timeout);

		if (rc > 0) {

			if (canceled)

				return -ECANCELED;

			return 0;

		}

		if (rc == -ERESTARTSYS && freezing(current)) {

			clear_thread_flag(TIF_SIGPENDING);

			goto again;

		}

	} else {

		do {

			tpm_msleep(TPM_TIMEOUT);

			status = chip->ops->status(chip);

			if ((status & mask) == mask)

				return 0;

		} while (time_before(jiffies, stop));

	}

	return -ETIME;

}



static u8 vtpm_status(struct tpm_chip *chip)

{

	struct tpm_private *priv = dev_get_drvdata(&chip->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE