hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm_crb: refine the naming of constants 

Renamed CRB protocol specific constants to match the TCG PC Client
Platform TPM Profile (PTP) Specification and driver status constants
to be explicit that they are driver specific.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Jarkko Sakkinen 2016-09-02 22:34:19 +03:00
parent 35fec6f1eb
commit 7fd10d6185
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/char/tpm/tpm_crb.c
View File

@ -34,14 +34,14 @@ enum crb_defaults {
CRB_ACPI_START_INDEX = 1, CRB_ACPI_START_INDEX = 1,
}; };
enum crb_ca_request { enum crb_ctrl_req {
CRB_CA_REQ_GO_IDLE = BIT(0), CRB_CTRL_REQ_GO_IDLE = BIT(0),
CRB_CA_REQ_CMD_READY = BIT(1), CRB_CTRL_REQ_CMD_READY = BIT(1),
}; };
enum crb_ca_status { enum crb_ctrl_sts {
CRB_CA_STS_ERROR = BIT(0), CRB_CTRL_STS_ERROR = BIT(0),
CRB_CA_STS_TPM_IDLE = BIT(1), CRB_CTRL_STS_TPM_IDLE = BIT(1),
}; };
enum crb_start { enum crb_start {
@ -67,7 +67,7 @@ struct crb_control_area {
} __packed; } __packed;
enum crb_status { enum crb_status {
CRB_STS_COMPLETE = BIT(0), CRB_DRV_STS_COMPLETE = BIT(0),
}; };
enum crb_flags { enum crb_flags {
@ -92,7 +92,7 @@ static u8 crb_status(struct tpm_chip *chip)
if ((ioread32(&priv->cca->start) & CRB_START_INVOKE) != if ((ioread32(&priv->cca->start) & CRB_START_INVOKE) !=
CRB_START_INVOKE) CRB_START_INVOKE)
sts |= CRB_STS_COMPLETE; sts |= CRB_DRV_STS_COMPLETE;
return sts; return sts;
} }
@ -106,7 +106,7 @@ static int crb_recv(struct tpm_chip *chip, u8 *buf, size_t count)
if (count < 6) if (count < 6)
return -EIO; return -EIO;
if (ioread32(&priv->cca->sts) & CRB_CA_STS_ERROR) if (ioread32(&priv->cca->sts) & CRB_CTRL_STS_ERROR)
return -EIO; return -EIO;
memcpy_fromio(buf, priv->rsp, 6); memcpy_fromio(buf, priv->rsp, 6);
@ -194,8 +194,8 @@ static const struct tpm_class_ops tpm_crb = {
.send = crb_send, .send = crb_send,
.cancel = crb_cancel, .cancel = crb_cancel,
.req_canceled = crb_req_canceled, .req_canceled = crb_req_canceled,
.req_complete_mask = CRB_STS_COMPLETE, .req_complete_mask = CRB_DRV_STS_COMPLETE,
.req_complete_val = CRB_STS_COMPLETE, .req_complete_val = CRB_DRV_STS_COMPLETE,
}; };
static int crb_init(struct acpi_device *device, struct crb_priv *priv) static int crb_init(struct acpi_device *device, struct crb_priv *priv)