| Message ID | 1460577351-24632-5-git-send-email-christophe-h.ricard@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 13, 2016 at 09:55:43PM +0200, Christophe Ricard wrote: > Though the ioread/iowrite calls cannot fail, other implementations of this > interface might want to return error codes if their communication fails. > > This follows the usual pattern of negative values representing errors and > zero representing success. Positive values are not used (yet). > > Errors are passed back to the caller if possible. If the interface of a > function does not allow that, it tries to do the most sensible thing it > can, but this might also mean ignoring the error in this instance. You should declare the interface in only one patch and explain there why you need error codes. Would make this is easier to review and evaluate. Again, something to squash. /Jarkko > Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com> > Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> > --- > drivers/char/tpm/tpm_tis.c | 232 +++++++++++++++++++++++++++++----------- > drivers/char/tpm/tpm_tis_core.h | 46 ++++---- > 2 files changed, 193 insertions(+), 85 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > index 9f6d100..2056481 100644 > --- a/drivers/char/tpm/tpm_tis.c > +++ b/drivers/char/tpm/tpm_tis.c > @@ -129,8 +129,14 @@ static int wait_startup(struct tpm_chip *chip, int l) > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > unsigned long stop = jiffies + chip->timeout_a; > do { > - if (tpm_read8(chip, TPM_ACCESS(l)) & > - TPM_ACCESS_VALID) > + int rc; > + u8 access; > + > + rc = tpm_read8(chip, TPM_ACCESS(l), &access); > + if (rc < 0) > + return rc; > + > + if (access & TPM_ACCESS_VALID) > return 0; > msleep(TPM_TIMEOUT); > } while (time_before(jiffies, stop)); > @@ -140,9 +146,14 @@ static int wait_startup(struct tpm_chip *chip, int l) > static int check_locality(struct tpm_chip *chip, int l) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > + int rc; > + u8 access; > + > + rc = tpm_read8(chip, TPM_ACCESS(l), &access); > + if (rc < 0) > + return rc; > > - if ((tpm_read8(chip, TPM_ACCESS(l)) & > - (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == > + if ((access & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == > (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) > return priv->locality = l; > > @@ -152,7 +163,14 @@ static int check_locality(struct tpm_chip *chip, int l) > static void release_locality(struct tpm_chip *chip, int l, int force) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > - if (force || (tpm_read8(chip, TPM_ACCESS(l)) & > + int rc; > + u8 access; > + > + rc = tpm_read8(chip, TPM_ACCESS(l), &access); > + if (rc < 0) > + return; > + > + if (force || (access & > (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) == > (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) > tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_ACTIVE_LOCALITY); > @@ -168,8 +186,9 @@ static int request_locality(struct tpm_chip *chip, int l) > if (check_locality(chip, l) >= 0) > return l; > > - tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE); > - > + rc = tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE); > + if (rc < 0) > + return rc; > > stop = jiffies + chip->timeout_a; > > @@ -203,8 +222,14 @@ again: > static u8 tpm_tis_status(struct tpm_chip *chip) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > + int rc; > + u8 status; > > - return tpm_read8(chip, TPM_STS(priv->locality)); > + rc = tpm_read8(chip, TPM_STS(priv->locality), &status); > + if (rc < 0) > + return 0; > + > + return status; > } > > static void tpm_tis_ready(struct tpm_chip *chip) > @@ -219,14 +244,23 @@ static int get_burstcount(struct tpm_chip *chip) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > unsigned long stop; > - int burstcnt; > + int burstcnt, rc; > + u8 value; > > /* wait for burstcount */ > /* which timeout value, spec has 2 answers (c & d) */ > stop = jiffies + chip->timeout_d; > do { > - burstcnt = tpm_read8(chip, TPM_STS(priv->locality) + 1); > - burstcnt += tpm_read8(chip, TPM_STS(priv->locality) + 2) << 8; > + rc = tpm_read8(chip, TPM_STS(priv->locality) + 1, &value); > + if (rc < 0) > + return rc; > + > + burstcnt = value; > + rc = tpm_read8(chip, TPM_STS(priv->locality) + 2, &value); > + if (rc < 0) > + return rc; > + > + burstcnt += value << 8; > if (burstcnt) > return burstcnt; > msleep(TPM_TIMEOUT); > @@ -237,15 +271,19 @@ static int get_burstcount(struct tpm_chip *chip) > static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > - int size = 0, burstcnt; > + int size = 0, burstcnt, rc; > while (size < count && > wait_for_tpm_stat(chip, > TPM_STS_DATA_AVAIL | TPM_STS_VALID, > chip->timeout_c, > &priv->read_queue, true) == 0) { > burstcnt = min_t(int, get_burstcount(chip), count - size); > - tpm_read_bytes(chip, TPM_DATA_FIFO(priv->locality), burstcnt, > - buf + size); > + > + rc = tpm_read_bytes(chip, TPM_DATA_FIFO(priv->locality), > + burstcnt, buf + size); > + if (rc < 0) > + return rc; > + > size += burstcnt; > } > return size; > @@ -329,8 +367,11 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) > > while (count < len - 1) { > burstcnt = min_t(int, get_burstcount(chip), len - count - 1); > - tpm_write_bytes(chip, TPM_DATA_FIFO(priv->locality), > - burstcnt, buf + count); > + rc = tpm_write_bytes(chip, TPM_DATA_FIFO(priv->locality), > + burstcnt, buf + count); > + if (rc < 0) > + goto out_err; > + > count += burstcnt; > > wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, > @@ -343,7 +384,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) > } > > /* write last byte */ > - tpm_write8(chip, TPM_DATA_FIFO(priv->locality), buf[count]); > + rc = tpm_write8(chip, TPM_DATA_FIFO(priv->locality), buf[count]); > + if (rc < 0) > + goto out_err; > + > wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, > &priv->int_queue, false); > status = tpm_tis_status(chip); > @@ -364,10 +408,14 @@ static void disable_interrupts(struct tpm_chip *chip) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > u32 intmask; > + int rc; > + > + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); > + if (rc < 0) > + intmask = 0; > > - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); > intmask &= ~TPM_GLOBAL_INT_ENABLE; > - tpm_write32(chip, TPM_INT_ENABLE(priv->locality), intmask); > + rc = tpm_write32(chip, TPM_INT_ENABLE(priv->locality), intmask); > > devm_free_irq(&chip->dev, priv->irq, chip); > priv->irq = 0; > @@ -391,7 +439,10 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) > return rc; > > /* go and do it */ > - tpm_write8(chip, TPM_STS(priv->locality), TPM_STS_GO); > + rc = tpm_write8(chip, TPM_STS(priv->locality), TPM_STS_GO); > + if (rc < 0) > + goto out_err; > + > if (chip->flags & TPM_CHIP_FLAG_IRQ) { > ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); > > @@ -452,10 +503,12 @@ static bool tpm_tis_update_timeouts(struct tpm_chip *chip, > unsigned long *timeout_cap) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > - int i; > + int i, rc; > u32 did_vid; > > - did_vid = tpm_read32(chip, TPM_DID_VID(0)); > + rc = tpm_read32(chip, TPM_DID_VID(0), &did_vid); > + if (rc < 0) > + return rc; > > for (i = 0; i != ARRAY_SIZE(vendor_timeout_overrides); i++) { > if (vendor_timeout_overrides[i].did_vid != did_vid) > @@ -483,7 +536,11 @@ static int probe_itpm(struct tpm_chip *chip) > }; > size_t len = sizeof(cmd_getticks); > bool rem_itpm = itpm; > - u16 vendor = tpm_read16(chip, TPM_DID_VID(0)); > + u16 vendor; > + > + rc = tpm_read16(chip, TPM_DID_VID(0), &vendor); > + if (rc < 0) > + return rc; > > /* probe only iTPMS */ > if (vendor != TPM_VID_INTEL) > @@ -541,56 +598,62 @@ static const struct tpm_class_ops tpm_tis = { > .req_canceled = tpm_tis_req_canceled, > }; > > -static void tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > - u8 *result) > +static int tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > + u8 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > struct tpm_tis_phy *phy = priv->phy_id; > > while (len--) > - *result++ = ioread8(priv->iobase + addr); > + *result++ = ioread8(phy->iobase + addr); > + return 0; > } > > -static void tpm_mem_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > - u8 *value) > +static int tpm_mem_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > + u8 *value) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > struct tpm_tis_phy *phy = priv->phy_id; > > while (len--) > - iowrite8(*value++, priv->iobase + addr); > + iowrite8(*value++, phy->iobase + addr); > + return 0; > } > > -static u16 tpm_mem_read16(struct tpm_chip *chip, u32 addr) > +static int tpm_mem_read16(struct tpm_chip *chip, u32 addr, u16 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > struct tpm_tis_phy *phy = priv->phy_id; > > - return ioread16(priv->iobase + addr); > + *result = ioread16(phy->iobase + addr); > + return 0; > } > > -static void tpm_mem_write16(struct tpm_chip *chip, u32 addr, u16 value) > +static int tpm_mem_write16(struct tpm_chip *chip, u32 addr, u16 value) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > struct tpm_tis_phy *phy = priv->phy_id; > > - iowrite16(value, priv->iobase + addr); > + iowrite16(value, phy->iobase + addr); > + return 0; > } > > -static u32 tpm_mem_read32(struct tpm_chip *chip, u32 addr) > +static int tpm_mem_read32(struct tpm_chip *chip, u32 addr, u32 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > struct tpm_tis_phy *phy = priv->phy_id; > > - return ioread32(priv->iobase + addr); > + *result = ioread32(phy->iobase + addr); > + return 0; > } > > -static void tpm_mem_write32(struct tpm_chip *chip, u32 addr, u32 value) > +static int tpm_mem_write32(struct tpm_chip *chip, u32 addr, u32 value) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > struct tpm_tis_phy *phy = priv->phy_id; > > - iowrite32(value, priv->iobase + addr); > + iowrite32(value, phy->iobase + addr); > + return 0; > } > > static const struct tpm_tis_class_lowlevel tpm_mem = { > @@ -607,9 +670,11 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) > struct tpm_chip *chip = dev_id; > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > u32 interrupt; > - int i; > + int i, rc; > > - interrupt = tpm_read32(chip, TPM_INT_STATUS(priv->locality)); > + rc = tpm_read32(chip, TPM_INT_STATUS(priv->locality), &interrupt); > + if (rc < 0) > + return IRQ_NONE; > > if (interrupt == 0) > return IRQ_NONE; > @@ -627,9 +692,11 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) > wake_up_interruptible(&priv->int_queue); > > /* Clear interrupts handled with TPM_EOI */ > - tpm_write32(chip, TPM_INT_STATUS(priv->locality), interrupt); > + rc = tpm_write32(chip, TPM_INT_STATUS(priv->locality), interrupt); > + if (rc < 0) > + return IRQ_NONE; > > - tpm_read32(chip, TPM_INT_STATUS(priv->locality)); > + tpm_read32(chip, TPM_INT_STATUS(priv->locality), &interrupt); > return IRQ_HANDLED; > } > > @@ -642,6 +709,8 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > u8 original_int_vec; > + int rc; > + u32 int_status; > > if (devm_request_irq(&chip->dev, irq, tis_int_handler, flags, > dev_name(&chip->dev), chip) != 0) { > @@ -651,16 +720,28 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, > } > priv->irq = irq; > > - original_int_vec = tpm_read8(chip, TPM_INT_VECTOR(priv->locality)); > - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), irq); > + rc = tpm_read8(chip, TPM_INT_VECTOR(priv->locality), &original_int_vec); > + if (rc < 0) > + return rc; > + > + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), irq); > + if (rc < 0) > + return rc; > + > + rc = tpm_read32(chip, TPM_INT_STATUS(priv->locality), &int_status); > + if (rc < 0) > + return rc; > > /* Clear all existing */ > - tpm_write32(chip, TPM_INT_STATUS(priv->locality), > - tpm_read32(chip, TPM_INT_STATUS(priv->locality))); > + rc = tpm_write32(chip, TPM_INT_STATUS(priv->locality), int_status); > + if (rc < 0) > + return rc; > > /* Turn on */ > - tpm_write32(chip, TPM_INT_ENABLE(priv->locality), > - intmask | TPM_GLOBAL_INT_ENABLE); > + rc = tpm_write32(chip, TPM_INT_ENABLE(priv->locality), > + intmask | TPM_GLOBAL_INT_ENABLE); > + if (rc < 0) > + return rc; > > priv->irq_tested = false; > > @@ -676,8 +757,10 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, > * will call disable_irq which undoes all of the above. > */ > if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) { > - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), > - original_int_vec); > + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), > + original_int_vec); > + if (rc < 0) > + return rc; > > return 1; > } > @@ -693,9 +776,11 @@ static void tpm_tis_probe_irq(struct tpm_chip *chip, u32 intmask) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > u8 original_int_vec; > - int i; > + int i, rc; > > - original_int_vec = tpm_read8(chip, TPM_INT_VECTOR(priv->locality)); > + rc = tpm_read8(chip, TPM_INT_VECTOR(priv->locality), &original_int_vec); > + if (rc < 0) > + return; > > if (!original_int_vec) { > if (IS_ENABLED(CONFIG_X86)) > @@ -716,11 +801,17 @@ static void tpm_tis_remove(struct tpm_chip *chip) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > u32 reg = TPM_INT_ENABLE(priv->locality); > + u32 interrupt; > + int rc; > > if (chip->flags & TPM_CHIP_FLAG_TPM2) > tpm2_shutdown(chip, TPM2_SU_CLEAR); > > - tpm_write32(chip, reg, ~TPM_GLOBAL_INT_ENABLE & tpm_read32(chip, reg)); > + rc = tpm_read32(chip, reg, &interrupt); > + if (rc < 0) > + interrupt = 0; > + > + tpm_write32(chip, reg, ~TPM_GLOBAL_INT_ENABLE & interrupt); > release_locality(chip, priv->locality, 1); > } > > @@ -728,6 +819,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > acpi_handle acpi_dev_handle) > { > u32 vendor, intfcaps, intmask; > + u8 rid; > int rc, probe; > struct tpm_chip *chip; > struct tpm_tis_data *priv; > @@ -749,9 +841,9 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > chip->acpi_dev_handle = acpi_dev_handle; > #endif > > - priv->iobase = devm_ioremap_resource(dev, &tpm_info->res); > - if (IS_ERR(priv->iobase)) > - return PTR_ERR(priv->iobase); > + phy->iobase = devm_ioremap_resource(dev, &tpm_info->res); > + if (IS_ERR(phy->iobase)) > + return PTR_ERR(phy->iobase); > > priv->lowlevel = &tpm_mem; > > @@ -770,7 +862,10 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > } > > /* Take control of the TPM's interrupt hardware and shut it off */ > - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); > + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); > + if (rc < 0) > + goto out_err; > + > intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | > TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT; > intmask &= ~TPM_GLOBAL_INT_ENABLE; > @@ -785,12 +880,19 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > if (rc) > goto out_err; > > - vendor = tpm_read32(chip, TPM_DID_VID(0)); > + rc = tpm_read32(chip, TPM_DID_VID(0), &vendor); > + if (rc < 0) > + goto out_err; > + > priv->manufacturer_id = vendor; > > + rc = tpm_read8(chip, TPM_RID(0), &rid); > + if (rc < 0) > + goto out_err; > + > dev_info(dev, "%s TPM (device-id 0x%X, rev-id %d)\n", > (chip->flags & TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2", > - vendor >> 16, tpm_read8(chip, TPM_RID(0))); > + vendor >> 16, rid); > > if (!itpm) { > probe = probe_itpm(chip); > @@ -806,7 +908,10 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > > > /* Figure out the capabilities */ > - intfcaps = tpm_read32(chip, TPM_INTF_CAPS(priv->locality)); > + rc = tpm_read32(chip, TPM_INTF_CAPS(priv->locality), &intfcaps); > + if (rc < 0) > + goto out_err; > + > dev_dbg(dev, "TPM interface capabilities (0x%x):\n", > intfcaps); > if (intfcaps & TPM_INTF_BURST_COUNT_STATIC) > @@ -886,12 +991,17 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > u32 intmask; > + int rc; > > /* reenable interrupts that device may have lost or > BIOS/firmware may have disabled */ > - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), priv->irq); > + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), priv->irq); > + if (rc < 0) > + return; > > - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); > + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); > + if (rc < 0) > + return; > > intmask |= TPM_INTF_CMD_READY_INT > | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT > diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h > index 667a64e..b0f1e3c 100644 > --- a/drivers/char/tpm/tpm_tis_core.h > +++ b/drivers/char/tpm/tpm_tis_core.h > @@ -26,14 +26,14 @@ > #include "tpm.h" > > struct tpm_tis_class_lowlevel { > - void (*read_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > - u8 *result); > - void (*write_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > - u8 *value); > - u16 (*read16)(struct tpm_chip *chip, u32 addr); > - void (*write16)(struct tpm_chip *chip, u32 addr, u16 src); > - u32 (*read32)(struct tpm_chip *chip, u32 addr); > - void (*write32)(struct tpm_chip *chip, u32 addr, u32 src); > + int (*read_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > + u8 *result); > + int (*write_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > + u8 *value); > + int (*read16)(struct tpm_chip *chip, u32 addr, u16 *result); > + int (*write16)(struct tpm_chip *chip, u32 addr, u16 src); > + int (*read32)(struct tpm_chip *chip, u32 addr, u32 *result); > + int (*write32)(struct tpm_chip *chip, u32 addr, u32 src); > }; > > struct tpm_tis_data { > @@ -47,57 +47,55 @@ struct tpm_tis_data { > void *phy_id; > }; > > -static inline void tpm_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > +static inline int tpm_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > u8 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - priv->lowlevel->read_bytes(chip, addr, len, result); > + return priv->lowlevel->read_bytes(chip, addr, len, result); > } > > -static inline u8 tpm_read8(struct tpm_chip *chip, u32 addr) > +static inline int tpm_read8(struct tpm_chip *chip, u32 addr, u8 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > - u8 result; > > - priv->lowlevel->read_bytes(chip, addr, 1, &result); > - return result; > + return priv->lowlevel->read_bytes(chip, addr, 1, result); > } > > -static inline u16 tpm_read16(struct tpm_chip *chip, u32 addr) > +static inline int tpm_read16(struct tpm_chip *chip, u32 addr, u16 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - return priv->lowlevel->read16(chip, addr); > + return priv->lowlevel->read16(chip, addr, result); > } > > -static inline u32 tpm_read32(struct tpm_chip *chip, u32 addr) > +static inline u32 tpm_read32(struct tpm_chip *chip, u32 addr, u32 *result) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - return priv->lowlevel->read32(chip, addr); > + return priv->lowlevel->read32(chip, addr, result); > } > > -static inline void tpm_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > +static inline int tpm_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > u8 *value) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - priv->lowlevel->write_bytes(chip, addr, len, value); > + return priv->lowlevel->write_bytes(chip, addr, len, value); > } > > -static inline void tpm_write8(struct tpm_chip *chip, u32 addr, u8 value) > +static inline int tpm_write8(struct tpm_chip *chip, u32 addr, u8 value) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - priv->lowlevel->write_bytes(chip, addr, 1, &value); > + return priv->lowlevel->write_bytes(chip, addr, 1, &value); > } > > -static inline void tpm_write32(struct tpm_chip *chip, u32 addr, u32 value) > +static inline int tpm_write32(struct tpm_chip *chip, u32 addr, u32 value) > { > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - priv->lowlevel->write32(chip, addr, value); > + return priv->lowlevel->write32(chip, addr, value); > } > > #endif > -- > 2.5.0 > ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
On Tue, Apr 19, 2016 at 04:18:31PM +0300, Jarkko Sakkinen wrote: > On Wed, Apr 13, 2016 at 09:55:43PM +0200, Christophe Ricard wrote: > > Though the ioread/iowrite calls cannot fail, other implementations of this > > interface might want to return error codes if their communication fails. > > > > This follows the usual pattern of negative values representing errors and > > zero representing success. Positive values are not used (yet). > > > > Errors are passed back to the caller if possible. If the interface of a > > function does not allow that, it tries to do the most sensible thing it > > can, but this might also mean ignoring the error in this instance. > > You should declare the interface in only one patch and explain there > why you need error codes. Would make this is easier to review and > evaluate. Again, something to squash. I think I skip reviewing remaining patches since I've reviewed all the patches that setup the groundwork for the series and they clearly need still some rework. /Jarkko > > Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com> > > Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> > > --- > > drivers/char/tpm/tpm_tis.c | 232 +++++++++++++++++++++++++++++----------- > > drivers/char/tpm/tpm_tis_core.h | 46 ++++---- > > 2 files changed, 193 insertions(+), 85 deletions(-) > > > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > index 9f6d100..2056481 100644 > > --- a/drivers/char/tpm/tpm_tis.c > > +++ b/drivers/char/tpm/tpm_tis.c > > @@ -129,8 +129,14 @@ static int wait_startup(struct tpm_chip *chip, int l) > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > unsigned long stop = jiffies + chip->timeout_a; > > do { > > - if (tpm_read8(chip, TPM_ACCESS(l)) & > > - TPM_ACCESS_VALID) > > + int rc; > > + u8 access; > > + > > + rc = tpm_read8(chip, TPM_ACCESS(l), &access); > > + if (rc < 0) > > + return rc; > > + > > + if (access & TPM_ACCESS_VALID) > > return 0; > > msleep(TPM_TIMEOUT); > > } while (time_before(jiffies, stop)); > > @@ -140,9 +146,14 @@ static int wait_startup(struct tpm_chip *chip, int l) > > static int check_locality(struct tpm_chip *chip, int l) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > + int rc; > > + u8 access; > > + > > + rc = tpm_read8(chip, TPM_ACCESS(l), &access); > > + if (rc < 0) > > + return rc; > > > > - if ((tpm_read8(chip, TPM_ACCESS(l)) & > > - (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == > > + if ((access & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == > > (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) > > return priv->locality = l; > > > > @@ -152,7 +163,14 @@ static int check_locality(struct tpm_chip *chip, int l) > > static void release_locality(struct tpm_chip *chip, int l, int force) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - if (force || (tpm_read8(chip, TPM_ACCESS(l)) & > > + int rc; > > + u8 access; > > + > > + rc = tpm_read8(chip, TPM_ACCESS(l), &access); > > + if (rc < 0) > > + return; > > + > > + if (force || (access & > > (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) == > > (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) > > tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_ACTIVE_LOCALITY); > > @@ -168,8 +186,9 @@ static int request_locality(struct tpm_chip *chip, int l) > > if (check_locality(chip, l) >= 0) > > return l; > > > > - tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE); > > - > > + rc = tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE); > > + if (rc < 0) > > + return rc; > > > > stop = jiffies + chip->timeout_a; > > > > @@ -203,8 +222,14 @@ again: > > static u8 tpm_tis_status(struct tpm_chip *chip) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > + int rc; > > + u8 status; > > > > - return tpm_read8(chip, TPM_STS(priv->locality)); > > + rc = tpm_read8(chip, TPM_STS(priv->locality), &status); > > + if (rc < 0) > > + return 0; > > + > > + return status; > > } > > > > static void tpm_tis_ready(struct tpm_chip *chip) > > @@ -219,14 +244,23 @@ static int get_burstcount(struct tpm_chip *chip) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > unsigned long stop; > > - int burstcnt; > > + int burstcnt, rc; > > + u8 value; > > > > /* wait for burstcount */ > > /* which timeout value, spec has 2 answers (c & d) */ > > stop = jiffies + chip->timeout_d; > > do { > > - burstcnt = tpm_read8(chip, TPM_STS(priv->locality) + 1); > > - burstcnt += tpm_read8(chip, TPM_STS(priv->locality) + 2) << 8; > > + rc = tpm_read8(chip, TPM_STS(priv->locality) + 1, &value); > > + if (rc < 0) > > + return rc; > > + > > + burstcnt = value; > > + rc = tpm_read8(chip, TPM_STS(priv->locality) + 2, &value); > > + if (rc < 0) > > + return rc; > > + > > + burstcnt += value << 8; > > if (burstcnt) > > return burstcnt; > > msleep(TPM_TIMEOUT); > > @@ -237,15 +271,19 @@ static int get_burstcount(struct tpm_chip *chip) > > static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - int size = 0, burstcnt; > > + int size = 0, burstcnt, rc; > > while (size < count && > > wait_for_tpm_stat(chip, > > TPM_STS_DATA_AVAIL | TPM_STS_VALID, > > chip->timeout_c, > > &priv->read_queue, true) == 0) { > > burstcnt = min_t(int, get_burstcount(chip), count - size); > > - tpm_read_bytes(chip, TPM_DATA_FIFO(priv->locality), burstcnt, > > - buf + size); > > + > > + rc = tpm_read_bytes(chip, TPM_DATA_FIFO(priv->locality), > > + burstcnt, buf + size); > > + if (rc < 0) > > + return rc; > > + > > size += burstcnt; > > } > > return size; > > @@ -329,8 +367,11 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) > > > > while (count < len - 1) { > > burstcnt = min_t(int, get_burstcount(chip), len - count - 1); > > - tpm_write_bytes(chip, TPM_DATA_FIFO(priv->locality), > > - burstcnt, buf + count); > > + rc = tpm_write_bytes(chip, TPM_DATA_FIFO(priv->locality), > > + burstcnt, buf + count); > > + if (rc < 0) > > + goto out_err; > > + > > count += burstcnt; > > > > wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, > > @@ -343,7 +384,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) > > } > > > > /* write last byte */ > > - tpm_write8(chip, TPM_DATA_FIFO(priv->locality), buf[count]); > > + rc = tpm_write8(chip, TPM_DATA_FIFO(priv->locality), buf[count]); > > + if (rc < 0) > > + goto out_err; > > + > > wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, > > &priv->int_queue, false); > > status = tpm_tis_status(chip); > > @@ -364,10 +408,14 @@ static void disable_interrupts(struct tpm_chip *chip) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > u32 intmask; > > + int rc; > > + > > + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); > > + if (rc < 0) > > + intmask = 0; > > > > - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); > > intmask &= ~TPM_GLOBAL_INT_ENABLE; > > - tpm_write32(chip, TPM_INT_ENABLE(priv->locality), intmask); > > + rc = tpm_write32(chip, TPM_INT_ENABLE(priv->locality), intmask); > > > > devm_free_irq(&chip->dev, priv->irq, chip); > > priv->irq = 0; > > @@ -391,7 +439,10 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) > > return rc; > > > > /* go and do it */ > > - tpm_write8(chip, TPM_STS(priv->locality), TPM_STS_GO); > > + rc = tpm_write8(chip, TPM_STS(priv->locality), TPM_STS_GO); > > + if (rc < 0) > > + goto out_err; > > + > > if (chip->flags & TPM_CHIP_FLAG_IRQ) { > > ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); > > > > @@ -452,10 +503,12 @@ static bool tpm_tis_update_timeouts(struct tpm_chip *chip, > > unsigned long *timeout_cap) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - int i; > > + int i, rc; > > u32 did_vid; > > > > - did_vid = tpm_read32(chip, TPM_DID_VID(0)); > > + rc = tpm_read32(chip, TPM_DID_VID(0), &did_vid); > > + if (rc < 0) > > + return rc; > > > > for (i = 0; i != ARRAY_SIZE(vendor_timeout_overrides); i++) { > > if (vendor_timeout_overrides[i].did_vid != did_vid) > > @@ -483,7 +536,11 @@ static int probe_itpm(struct tpm_chip *chip) > > }; > > size_t len = sizeof(cmd_getticks); > > bool rem_itpm = itpm; > > - u16 vendor = tpm_read16(chip, TPM_DID_VID(0)); > > + u16 vendor; > > + > > + rc = tpm_read16(chip, TPM_DID_VID(0), &vendor); > > + if (rc < 0) > > + return rc; > > > > /* probe only iTPMS */ > > if (vendor != TPM_VID_INTEL) > > @@ -541,56 +598,62 @@ static const struct tpm_class_ops tpm_tis = { > > .req_canceled = tpm_tis_req_canceled, > > }; > > > > -static void tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > - u8 *result) > > +static int tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > + u8 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > struct tpm_tis_phy *phy = priv->phy_id; > > > > while (len--) > > - *result++ = ioread8(priv->iobase + addr); > > + *result++ = ioread8(phy->iobase + addr); > > + return 0; > > } > > > > -static void tpm_mem_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > - u8 *value) > > +static int tpm_mem_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > + u8 *value) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > struct tpm_tis_phy *phy = priv->phy_id; > > > > while (len--) > > - iowrite8(*value++, priv->iobase + addr); > > + iowrite8(*value++, phy->iobase + addr); > > + return 0; > > } > > > > -static u16 tpm_mem_read16(struct tpm_chip *chip, u32 addr) > > +static int tpm_mem_read16(struct tpm_chip *chip, u32 addr, u16 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > struct tpm_tis_phy *phy = priv->phy_id; > > > > - return ioread16(priv->iobase + addr); > > + *result = ioread16(phy->iobase + addr); > > + return 0; > > } > > > > -static void tpm_mem_write16(struct tpm_chip *chip, u32 addr, u16 value) > > +static int tpm_mem_write16(struct tpm_chip *chip, u32 addr, u16 value) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > struct tpm_tis_phy *phy = priv->phy_id; > > > > - iowrite16(value, priv->iobase + addr); > > + iowrite16(value, phy->iobase + addr); > > + return 0; > > } > > > > -static u32 tpm_mem_read32(struct tpm_chip *chip, u32 addr) > > +static int tpm_mem_read32(struct tpm_chip *chip, u32 addr, u32 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > struct tpm_tis_phy *phy = priv->phy_id; > > > > - return ioread32(priv->iobase + addr); > > + *result = ioread32(phy->iobase + addr); > > + return 0; > > } > > > > -static void tpm_mem_write32(struct tpm_chip *chip, u32 addr, u32 value) > > +static int tpm_mem_write32(struct tpm_chip *chip, u32 addr, u32 value) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > struct tpm_tis_phy *phy = priv->phy_id; > > > > - iowrite32(value, priv->iobase + addr); > > + iowrite32(value, phy->iobase + addr); > > + return 0; > > } > > > > static const struct tpm_tis_class_lowlevel tpm_mem = { > > @@ -607,9 +670,11 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) > > struct tpm_chip *chip = dev_id; > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > u32 interrupt; > > - int i; > > + int i, rc; > > > > - interrupt = tpm_read32(chip, TPM_INT_STATUS(priv->locality)); > > + rc = tpm_read32(chip, TPM_INT_STATUS(priv->locality), &interrupt); > > + if (rc < 0) > > + return IRQ_NONE; > > > > if (interrupt == 0) > > return IRQ_NONE; > > @@ -627,9 +692,11 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) > > wake_up_interruptible(&priv->int_queue); > > > > /* Clear interrupts handled with TPM_EOI */ > > - tpm_write32(chip, TPM_INT_STATUS(priv->locality), interrupt); > > + rc = tpm_write32(chip, TPM_INT_STATUS(priv->locality), interrupt); > > + if (rc < 0) > > + return IRQ_NONE; > > > > - tpm_read32(chip, TPM_INT_STATUS(priv->locality)); > > + tpm_read32(chip, TPM_INT_STATUS(priv->locality), &interrupt); > > return IRQ_HANDLED; > > } > > > > @@ -642,6 +709,8 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > u8 original_int_vec; > > + int rc; > > + u32 int_status; > > > > if (devm_request_irq(&chip->dev, irq, tis_int_handler, flags, > > dev_name(&chip->dev), chip) != 0) { > > @@ -651,16 +720,28 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, > > } > > priv->irq = irq; > > > > - original_int_vec = tpm_read8(chip, TPM_INT_VECTOR(priv->locality)); > > - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), irq); > > + rc = tpm_read8(chip, TPM_INT_VECTOR(priv->locality), &original_int_vec); > > + if (rc < 0) > > + return rc; > > + > > + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), irq); > > + if (rc < 0) > > + return rc; > > + > > + rc = tpm_read32(chip, TPM_INT_STATUS(priv->locality), &int_status); > > + if (rc < 0) > > + return rc; > > > > /* Clear all existing */ > > - tpm_write32(chip, TPM_INT_STATUS(priv->locality), > > - tpm_read32(chip, TPM_INT_STATUS(priv->locality))); > > + rc = tpm_write32(chip, TPM_INT_STATUS(priv->locality), int_status); > > + if (rc < 0) > > + return rc; > > > > /* Turn on */ > > - tpm_write32(chip, TPM_INT_ENABLE(priv->locality), > > - intmask | TPM_GLOBAL_INT_ENABLE); > > + rc = tpm_write32(chip, TPM_INT_ENABLE(priv->locality), > > + intmask | TPM_GLOBAL_INT_ENABLE); > > + if (rc < 0) > > + return rc; > > > > priv->irq_tested = false; > > > > @@ -676,8 +757,10 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, > > * will call disable_irq which undoes all of the above. > > */ > > if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) { > > - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), > > - original_int_vec); > > + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), > > + original_int_vec); > > + if (rc < 0) > > + return rc; > > > > return 1; > > } > > @@ -693,9 +776,11 @@ static void tpm_tis_probe_irq(struct tpm_chip *chip, u32 intmask) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > u8 original_int_vec; > > - int i; > > + int i, rc; > > > > - original_int_vec = tpm_read8(chip, TPM_INT_VECTOR(priv->locality)); > > + rc = tpm_read8(chip, TPM_INT_VECTOR(priv->locality), &original_int_vec); > > + if (rc < 0) > > + return; > > > > if (!original_int_vec) { > > if (IS_ENABLED(CONFIG_X86)) > > @@ -716,11 +801,17 @@ static void tpm_tis_remove(struct tpm_chip *chip) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > u32 reg = TPM_INT_ENABLE(priv->locality); > > + u32 interrupt; > > + int rc; > > > > if (chip->flags & TPM_CHIP_FLAG_TPM2) > > tpm2_shutdown(chip, TPM2_SU_CLEAR); > > > > - tpm_write32(chip, reg, ~TPM_GLOBAL_INT_ENABLE & tpm_read32(chip, reg)); > > + rc = tpm_read32(chip, reg, &interrupt); > > + if (rc < 0) > > + interrupt = 0; > > + > > + tpm_write32(chip, reg, ~TPM_GLOBAL_INT_ENABLE & interrupt); > > release_locality(chip, priv->locality, 1); > > } > > > > @@ -728,6 +819,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > > acpi_handle acpi_dev_handle) > > { > > u32 vendor, intfcaps, intmask; > > + u8 rid; > > int rc, probe; > > struct tpm_chip *chip; > > struct tpm_tis_data *priv; > > @@ -749,9 +841,9 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > > chip->acpi_dev_handle = acpi_dev_handle; > > #endif > > > > - priv->iobase = devm_ioremap_resource(dev, &tpm_info->res); > > - if (IS_ERR(priv->iobase)) > > - return PTR_ERR(priv->iobase); > > + phy->iobase = devm_ioremap_resource(dev, &tpm_info->res); > > + if (IS_ERR(phy->iobase)) > > + return PTR_ERR(phy->iobase); > > > > priv->lowlevel = &tpm_mem; > > > > @@ -770,7 +862,10 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > > } > > > > /* Take control of the TPM's interrupt hardware and shut it off */ > > - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); > > + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); > > + if (rc < 0) > > + goto out_err; > > + > > intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | > > TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT; > > intmask &= ~TPM_GLOBAL_INT_ENABLE; > > @@ -785,12 +880,19 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > > if (rc) > > goto out_err; > > > > - vendor = tpm_read32(chip, TPM_DID_VID(0)); > > + rc = tpm_read32(chip, TPM_DID_VID(0), &vendor); > > + if (rc < 0) > > + goto out_err; > > + > > priv->manufacturer_id = vendor; > > > > + rc = tpm_read8(chip, TPM_RID(0), &rid); > > + if (rc < 0) > > + goto out_err; > > + > > dev_info(dev, "%s TPM (device-id 0x%X, rev-id %d)\n", > > (chip->flags & TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2", > > - vendor >> 16, tpm_read8(chip, TPM_RID(0))); > > + vendor >> 16, rid); > > > > if (!itpm) { > > probe = probe_itpm(chip); > > @@ -806,7 +908,10 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > > > > > > /* Figure out the capabilities */ > > - intfcaps = tpm_read32(chip, TPM_INTF_CAPS(priv->locality)); > > + rc = tpm_read32(chip, TPM_INTF_CAPS(priv->locality), &intfcaps); > > + if (rc < 0) > > + goto out_err; > > + > > dev_dbg(dev, "TPM interface capabilities (0x%x):\n", > > intfcaps); > > if (intfcaps & TPM_INTF_BURST_COUNT_STATIC) > > @@ -886,12 +991,17 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > u32 intmask; > > + int rc; > > > > /* reenable interrupts that device may have lost or > > BIOS/firmware may have disabled */ > > - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), priv->irq); > > + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), priv->irq); > > + if (rc < 0) > > + return; > > > > - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); > > + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); > > + if (rc < 0) > > + return; > > > > intmask |= TPM_INTF_CMD_READY_INT > > | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT > > diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h > > index 667a64e..b0f1e3c 100644 > > --- a/drivers/char/tpm/tpm_tis_core.h > > +++ b/drivers/char/tpm/tpm_tis_core.h > > @@ -26,14 +26,14 @@ > > #include "tpm.h" > > > > struct tpm_tis_class_lowlevel { > > - void (*read_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > > - u8 *result); > > - void (*write_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > > - u8 *value); > > - u16 (*read16)(struct tpm_chip *chip, u32 addr); > > - void (*write16)(struct tpm_chip *chip, u32 addr, u16 src); > > - u32 (*read32)(struct tpm_chip *chip, u32 addr); > > - void (*write32)(struct tpm_chip *chip, u32 addr, u32 src); > > + int (*read_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > > + u8 *result); > > + int (*write_bytes)(struct tpm_chip *chip, u32 addr, u16 len, > > + u8 *value); > > + int (*read16)(struct tpm_chip *chip, u32 addr, u16 *result); > > + int (*write16)(struct tpm_chip *chip, u32 addr, u16 src); > > + int (*read32)(struct tpm_chip *chip, u32 addr, u32 *result); > > + int (*write32)(struct tpm_chip *chip, u32 addr, u32 src); > > }; > > > > struct tpm_tis_data { > > @@ -47,57 +47,55 @@ struct tpm_tis_data { > > void *phy_id; > > }; > > > > -static inline void tpm_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > +static inline int tpm_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > u8 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > > > - priv->lowlevel->read_bytes(chip, addr, len, result); > > + return priv->lowlevel->read_bytes(chip, addr, len, result); > > } > > > > -static inline u8 tpm_read8(struct tpm_chip *chip, u32 addr) > > +static inline int tpm_read8(struct tpm_chip *chip, u32 addr, u8 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > - u8 result; > > > > - priv->lowlevel->read_bytes(chip, addr, 1, &result); > > - return result; > > + return priv->lowlevel->read_bytes(chip, addr, 1, result); > > } > > > > -static inline u16 tpm_read16(struct tpm_chip *chip, u32 addr) > > +static inline int tpm_read16(struct tpm_chip *chip, u32 addr, u16 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > > > - return priv->lowlevel->read16(chip, addr); > > + return priv->lowlevel->read16(chip, addr, result); > > } > > > > -static inline u32 tpm_read32(struct tpm_chip *chip, u32 addr) > > +static inline u32 tpm_read32(struct tpm_chip *chip, u32 addr, u32 *result) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > > > - return priv->lowlevel->read32(chip, addr); > > + return priv->lowlevel->read32(chip, addr, result); > > } > > > > -static inline void tpm_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > +static inline int tpm_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, > > u8 *value) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > > > - priv->lowlevel->write_bytes(chip, addr, len, value); > > + return priv->lowlevel->write_bytes(chip, addr, len, value); > > } > > > > -static inline void tpm_write8(struct tpm_chip *chip, u32 addr, u8 value) > > +static inline int tpm_write8(struct tpm_chip *chip, u32 addr, u8 value) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > > > - priv->lowlevel->write_bytes(chip, addr, 1, &value); > > + return priv->lowlevel->write_bytes(chip, addr, 1, &value); > > } > > > > -static inline void tpm_write32(struct tpm_chip *chip, u32 addr, u32 value) > > +static inline int tpm_write32(struct tpm_chip *chip, u32 addr, u32 value) > > { > > struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > > > > - priv->lowlevel->write32(chip, addr, value); > > + return priv->lowlevel->write32(chip, addr, value); > > } > > > > #endif > > -- > > 2.5.0 > > ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 9f6d100..2056481 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -129,8 +129,14 @@ static int wait_startup(struct tpm_chip *chip, int l) struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); unsigned long stop = jiffies + chip->timeout_a; do { - if (tpm_read8(chip, TPM_ACCESS(l)) & - TPM_ACCESS_VALID) + int rc; + u8 access; + + rc = tpm_read8(chip, TPM_ACCESS(l), &access); + if (rc < 0) + return rc; + + if (access & TPM_ACCESS_VALID) return 0; msleep(TPM_TIMEOUT); } while (time_before(jiffies, stop)); @@ -140,9 +146,14 @@ static int wait_startup(struct tpm_chip *chip, int l) static int check_locality(struct tpm_chip *chip, int l) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); + int rc; + u8 access; + + rc = tpm_read8(chip, TPM_ACCESS(l), &access); + if (rc < 0) + return rc; - if ((tpm_read8(chip, TPM_ACCESS(l)) & - (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == + if ((access & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) return priv->locality = l; @@ -152,7 +163,14 @@ static int check_locality(struct tpm_chip *chip, int l) static void release_locality(struct tpm_chip *chip, int l, int force) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - if (force || (tpm_read8(chip, TPM_ACCESS(l)) & + int rc; + u8 access; + + rc = tpm_read8(chip, TPM_ACCESS(l), &access); + if (rc < 0) + return; + + if (force || (access & (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) == (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_ACTIVE_LOCALITY); @@ -168,8 +186,9 @@ static int request_locality(struct tpm_chip *chip, int l) if (check_locality(chip, l) >= 0) return l; - tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE); - + rc = tpm_write8(chip, TPM_ACCESS(l), TPM_ACCESS_REQUEST_USE); + if (rc < 0) + return rc; stop = jiffies + chip->timeout_a; @@ -203,8 +222,14 @@ again: static u8 tpm_tis_status(struct tpm_chip *chip) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); + int rc; + u8 status; - return tpm_read8(chip, TPM_STS(priv->locality)); + rc = tpm_read8(chip, TPM_STS(priv->locality), &status); + if (rc < 0) + return 0; + + return status; } static void tpm_tis_ready(struct tpm_chip *chip) @@ -219,14 +244,23 @@ static int get_burstcount(struct tpm_chip *chip) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); unsigned long stop; - int burstcnt; + int burstcnt, rc; + u8 value; /* wait for burstcount */ /* which timeout value, spec has 2 answers (c & d) */ stop = jiffies + chip->timeout_d; do { - burstcnt = tpm_read8(chip, TPM_STS(priv->locality) + 1); - burstcnt += tpm_read8(chip, TPM_STS(priv->locality) + 2) << 8; + rc = tpm_read8(chip, TPM_STS(priv->locality) + 1, &value); + if (rc < 0) + return rc; + + burstcnt = value; + rc = tpm_read8(chip, TPM_STS(priv->locality) + 2, &value); + if (rc < 0) + return rc; + + burstcnt += value << 8; if (burstcnt) return burstcnt; msleep(TPM_TIMEOUT); @@ -237,15 +271,19 @@ static int get_burstcount(struct tpm_chip *chip) static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - int size = 0, burstcnt; + int size = 0, burstcnt, rc; while (size < count && wait_for_tpm_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, chip->timeout_c, &priv->read_queue, true) == 0) { burstcnt = min_t(int, get_burstcount(chip), count - size); - tpm_read_bytes(chip, TPM_DATA_FIFO(priv->locality), burstcnt, - buf + size); + + rc = tpm_read_bytes(chip, TPM_DATA_FIFO(priv->locality), + burstcnt, buf + size); + if (rc < 0) + return rc; + size += burstcnt; } return size; @@ -329,8 +367,11 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) while (count < len - 1) { burstcnt = min_t(int, get_burstcount(chip), len - count - 1); - tpm_write_bytes(chip, TPM_DATA_FIFO(priv->locality), - burstcnt, buf + count); + rc = tpm_write_bytes(chip, TPM_DATA_FIFO(priv->locality), + burstcnt, buf + count); + if (rc < 0) + goto out_err; + count += burstcnt; wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, @@ -343,7 +384,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) } /* write last byte */ - tpm_write8(chip, TPM_DATA_FIFO(priv->locality), buf[count]); + rc = tpm_write8(chip, TPM_DATA_FIFO(priv->locality), buf[count]); + if (rc < 0) + goto out_err; + wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, &priv->int_queue, false); status = tpm_tis_status(chip); @@ -364,10 +408,14 @@ static void disable_interrupts(struct tpm_chip *chip) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); u32 intmask; + int rc; + + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); + if (rc < 0) + intmask = 0; - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); intmask &= ~TPM_GLOBAL_INT_ENABLE; - tpm_write32(chip, TPM_INT_ENABLE(priv->locality), intmask); + rc = tpm_write32(chip, TPM_INT_ENABLE(priv->locality), intmask); devm_free_irq(&chip->dev, priv->irq, chip); priv->irq = 0; @@ -391,7 +439,10 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) return rc; /* go and do it */ - tpm_write8(chip, TPM_STS(priv->locality), TPM_STS_GO); + rc = tpm_write8(chip, TPM_STS(priv->locality), TPM_STS_GO); + if (rc < 0) + goto out_err; + if (chip->flags & TPM_CHIP_FLAG_IRQ) { ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); @@ -452,10 +503,12 @@ static bool tpm_tis_update_timeouts(struct tpm_chip *chip, unsigned long *timeout_cap) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - int i; + int i, rc; u32 did_vid; - did_vid = tpm_read32(chip, TPM_DID_VID(0)); + rc = tpm_read32(chip, TPM_DID_VID(0), &did_vid); + if (rc < 0) + return rc; for (i = 0; i != ARRAY_SIZE(vendor_timeout_overrides); i++) { if (vendor_timeout_overrides[i].did_vid != did_vid) @@ -483,7 +536,11 @@ static int probe_itpm(struct tpm_chip *chip) }; size_t len = sizeof(cmd_getticks); bool rem_itpm = itpm; - u16 vendor = tpm_read16(chip, TPM_DID_VID(0)); + u16 vendor; + + rc = tpm_read16(chip, TPM_DID_VID(0), &vendor); + if (rc < 0) + return rc; /* probe only iTPMS */ if (vendor != TPM_VID_INTEL) @@ -541,56 +598,62 @@ static const struct tpm_class_ops tpm_tis = { .req_canceled = tpm_tis_req_canceled, }; -static void tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, - u8 *result) +static int tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, + u8 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_phy *phy = priv->phy_id; while (len--) - *result++ = ioread8(priv->iobase + addr); + *result++ = ioread8(phy->iobase + addr); + return 0; } -static void tpm_mem_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, - u8 *value) +static int tpm_mem_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, + u8 *value) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_phy *phy = priv->phy_id; while (len--) - iowrite8(*value++, priv->iobase + addr); + iowrite8(*value++, phy->iobase + addr); + return 0; } -static u16 tpm_mem_read16(struct tpm_chip *chip, u32 addr) +static int tpm_mem_read16(struct tpm_chip *chip, u32 addr, u16 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_phy *phy = priv->phy_id; - return ioread16(priv->iobase + addr); + *result = ioread16(phy->iobase + addr); + return 0; } -static void tpm_mem_write16(struct tpm_chip *chip, u32 addr, u16 value) +static int tpm_mem_write16(struct tpm_chip *chip, u32 addr, u16 value) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_phy *phy = priv->phy_id; - iowrite16(value, priv->iobase + addr); + iowrite16(value, phy->iobase + addr); + return 0; } -static u32 tpm_mem_read32(struct tpm_chip *chip, u32 addr) +static int tpm_mem_read32(struct tpm_chip *chip, u32 addr, u32 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_phy *phy = priv->phy_id; - return ioread32(priv->iobase + addr); + *result = ioread32(phy->iobase + addr); + return 0; } -static void tpm_mem_write32(struct tpm_chip *chip, u32 addr, u32 value) +static int tpm_mem_write32(struct tpm_chip *chip, u32 addr, u32 value) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_phy *phy = priv->phy_id; - iowrite32(value, priv->iobase + addr); + iowrite32(value, phy->iobase + addr); + return 0; } static const struct tpm_tis_class_lowlevel tpm_mem = { @@ -607,9 +670,11 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) struct tpm_chip *chip = dev_id; struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); u32 interrupt; - int i; + int i, rc; - interrupt = tpm_read32(chip, TPM_INT_STATUS(priv->locality)); + rc = tpm_read32(chip, TPM_INT_STATUS(priv->locality), &interrupt); + if (rc < 0) + return IRQ_NONE; if (interrupt == 0) return IRQ_NONE; @@ -627,9 +692,11 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) wake_up_interruptible(&priv->int_queue); /* Clear interrupts handled with TPM_EOI */ - tpm_write32(chip, TPM_INT_STATUS(priv->locality), interrupt); + rc = tpm_write32(chip, TPM_INT_STATUS(priv->locality), interrupt); + if (rc < 0) + return IRQ_NONE; - tpm_read32(chip, TPM_INT_STATUS(priv->locality)); + tpm_read32(chip, TPM_INT_STATUS(priv->locality), &interrupt); return IRQ_HANDLED; } @@ -642,6 +709,8 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); u8 original_int_vec; + int rc; + u32 int_status; if (devm_request_irq(&chip->dev, irq, tis_int_handler, flags, dev_name(&chip->dev), chip) != 0) { @@ -651,16 +720,28 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, } priv->irq = irq; - original_int_vec = tpm_read8(chip, TPM_INT_VECTOR(priv->locality)); - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), irq); + rc = tpm_read8(chip, TPM_INT_VECTOR(priv->locality), &original_int_vec); + if (rc < 0) + return rc; + + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), irq); + if (rc < 0) + return rc; + + rc = tpm_read32(chip, TPM_INT_STATUS(priv->locality), &int_status); + if (rc < 0) + return rc; /* Clear all existing */ - tpm_write32(chip, TPM_INT_STATUS(priv->locality), - tpm_read32(chip, TPM_INT_STATUS(priv->locality))); + rc = tpm_write32(chip, TPM_INT_STATUS(priv->locality), int_status); + if (rc < 0) + return rc; /* Turn on */ - tpm_write32(chip, TPM_INT_ENABLE(priv->locality), - intmask | TPM_GLOBAL_INT_ENABLE); + rc = tpm_write32(chip, TPM_INT_ENABLE(priv->locality), + intmask | TPM_GLOBAL_INT_ENABLE); + if (rc < 0) + return rc; priv->irq_tested = false; @@ -676,8 +757,10 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, * will call disable_irq which undoes all of the above. */ if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) { - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), - original_int_vec); + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), + original_int_vec); + if (rc < 0) + return rc; return 1; } @@ -693,9 +776,11 @@ static void tpm_tis_probe_irq(struct tpm_chip *chip, u32 intmask) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); u8 original_int_vec; - int i; + int i, rc; - original_int_vec = tpm_read8(chip, TPM_INT_VECTOR(priv->locality)); + rc = tpm_read8(chip, TPM_INT_VECTOR(priv->locality), &original_int_vec); + if (rc < 0) + return; if (!original_int_vec) { if (IS_ENABLED(CONFIG_X86)) @@ -716,11 +801,17 @@ static void tpm_tis_remove(struct tpm_chip *chip) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); u32 reg = TPM_INT_ENABLE(priv->locality); + u32 interrupt; + int rc; if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_shutdown(chip, TPM2_SU_CLEAR); - tpm_write32(chip, reg, ~TPM_GLOBAL_INT_ENABLE & tpm_read32(chip, reg)); + rc = tpm_read32(chip, reg, &interrupt); + if (rc < 0) + interrupt = 0; + + tpm_write32(chip, reg, ~TPM_GLOBAL_INT_ENABLE & interrupt); release_locality(chip, priv->locality, 1); } @@ -728,6 +819,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, acpi_handle acpi_dev_handle) { u32 vendor, intfcaps, intmask; + u8 rid; int rc, probe; struct tpm_chip *chip; struct tpm_tis_data *priv; @@ -749,9 +841,9 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, chip->acpi_dev_handle = acpi_dev_handle; #endif - priv->iobase = devm_ioremap_resource(dev, &tpm_info->res); - if (IS_ERR(priv->iobase)) - return PTR_ERR(priv->iobase); + phy->iobase = devm_ioremap_resource(dev, &tpm_info->res); + if (IS_ERR(phy->iobase)) + return PTR_ERR(phy->iobase); priv->lowlevel = &tpm_mem; @@ -770,7 +862,10 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, } /* Take control of the TPM's interrupt hardware and shut it off */ - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); + if (rc < 0) + goto out_err; + intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT; intmask &= ~TPM_GLOBAL_INT_ENABLE; @@ -785,12 +880,19 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, if (rc) goto out_err; - vendor = tpm_read32(chip, TPM_DID_VID(0)); + rc = tpm_read32(chip, TPM_DID_VID(0), &vendor); + if (rc < 0) + goto out_err; + priv->manufacturer_id = vendor; + rc = tpm_read8(chip, TPM_RID(0), &rid); + if (rc < 0) + goto out_err; + dev_info(dev, "%s TPM (device-id 0x%X, rev-id %d)\n", (chip->flags & TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2", - vendor >> 16, tpm_read8(chip, TPM_RID(0))); + vendor >> 16, rid); if (!itpm) { probe = probe_itpm(chip); @@ -806,7 +908,10 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, /* Figure out the capabilities */ - intfcaps = tpm_read32(chip, TPM_INTF_CAPS(priv->locality)); + rc = tpm_read32(chip, TPM_INTF_CAPS(priv->locality), &intfcaps); + if (rc < 0) + goto out_err; + dev_dbg(dev, "TPM interface capabilities (0x%x):\n", intfcaps); if (intfcaps & TPM_INTF_BURST_COUNT_STATIC) @@ -886,12 +991,17 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); u32 intmask; + int rc; /* reenable interrupts that device may have lost or BIOS/firmware may have disabled */ - tpm_write8(chip, TPM_INT_VECTOR(priv->locality), priv->irq); + rc = tpm_write8(chip, TPM_INT_VECTOR(priv->locality), priv->irq); + if (rc < 0) + return; - intmask = tpm_read32(chip, TPM_INT_ENABLE(priv->locality)); + rc = tpm_read32(chip, TPM_INT_ENABLE(priv->locality), &intmask); + if (rc < 0) + return; intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 667a64e..b0f1e3c 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -26,14 +26,14 @@ #include "tpm.h" struct tpm_tis_class_lowlevel { - void (*read_bytes)(struct tpm_chip *chip, u32 addr, u16 len, - u8 *result); - void (*write_bytes)(struct tpm_chip *chip, u32 addr, u16 len, - u8 *value); - u16 (*read16)(struct tpm_chip *chip, u32 addr); - void (*write16)(struct tpm_chip *chip, u32 addr, u16 src); - u32 (*read32)(struct tpm_chip *chip, u32 addr); - void (*write32)(struct tpm_chip *chip, u32 addr, u32 src); + int (*read_bytes)(struct tpm_chip *chip, u32 addr, u16 len, + u8 *result); + int (*write_bytes)(struct tpm_chip *chip, u32 addr, u16 len, + u8 *value); + int (*read16)(struct tpm_chip *chip, u32 addr, u16 *result); + int (*write16)(struct tpm_chip *chip, u32 addr, u16 src); + int (*read32)(struct tpm_chip *chip, u32 addr, u32 *result); + int (*write32)(struct tpm_chip *chip, u32 addr, u32 src); }; struct tpm_tis_data { @@ -47,57 +47,55 @@ struct tpm_tis_data { void *phy_id; }; -static inline void tpm_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, +static inline int tpm_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, u8 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - priv->lowlevel->read_bytes(chip, addr, len, result); + return priv->lowlevel->read_bytes(chip, addr, len, result); } -static inline u8 tpm_read8(struct tpm_chip *chip, u32 addr) +static inline int tpm_read8(struct tpm_chip *chip, u32 addr, u8 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - u8 result; - priv->lowlevel->read_bytes(chip, addr, 1, &result); - return result; + return priv->lowlevel->read_bytes(chip, addr, 1, result); } -static inline u16 tpm_read16(struct tpm_chip *chip, u32 addr) +static inline int tpm_read16(struct tpm_chip *chip, u32 addr, u16 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - return priv->lowlevel->read16(chip, addr); + return priv->lowlevel->read16(chip, addr, result); } -static inline u32 tpm_read32(struct tpm_chip *chip, u32 addr) +static inline u32 tpm_read32(struct tpm_chip *chip, u32 addr, u32 *result) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - return priv->lowlevel->read32(chip, addr); + return priv->lowlevel->read32(chip, addr, result); } -static inline void tpm_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, +static inline int tpm_write_bytes(struct tpm_chip *chip, u32 addr, u16 len, u8 *value) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - priv->lowlevel->write_bytes(chip, addr, len, value); + return priv->lowlevel->write_bytes(chip, addr, len, value); } -static inline void tpm_write8(struct tpm_chip *chip, u32 addr, u8 value) +static inline int tpm_write8(struct tpm_chip *chip, u32 addr, u8 value) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - priv->lowlevel->write_bytes(chip, addr, 1, &value); + return priv->lowlevel->write_bytes(chip, addr, 1, &value); } -static inline void tpm_write32(struct tpm_chip *chip, u32 addr, u32 value) +static inline int tpm_write32(struct tpm_chip *chip, u32 addr, u32 value) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); - priv->lowlevel->write32(chip, addr, value); + return priv->lowlevel->write32(chip, addr, value); } #endif