openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tpm: drop 'irq' from struct tpm_vendor_specific 

Dropped the field 'irq' from struct tpm_vendor_specific and make it
available to the various private structures in the drivers using irqs.

A dedicated flag TPM_CHIP_FLAG_IRQ is added for the upper layers.

In st33zp24, struct st33zp24_dev declaration is moved to st33zp24.h in
order to make accessible irq from other phy's(i2c, spi).

In tpm_i2c_nuvoton, chip->vendor.priv is not directly allocated. We can
access irq field from priv_data in a cleaner way.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Christophe Ricard 2016-03-31 22:56:56 +02:00 committed by Jarkko Sakkinen
parent 4eea703caa
commit 570a36097f
9 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/char/tpm/st33zp24/st33zp24.c
View File

@ -73,14 +73,6 @@ enum tis_defaults {
TIS_LONG_TIMEOUT = 2000, TIS_LONG_TIMEOUT = 2000,
}; };
struct st33zp24_dev {
struct tpm_chip *chip;
void *phy_id;
const struct st33zp24_phy_ops *ops;
u32 intrs;
int io_lpcpd;
};
/* /*
* clear_interruption clear the pending interrupt. * clear_interruption clear the pending interrupt.
* @param: tpm_dev, the tpm device device. * @param: tpm_dev, the tpm device device.
@ -288,10 +280,10 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
stop = jiffies + timeout; stop = jiffies + timeout;
if (chip->vendor.irq) { if (chip->flags & TPM_CHIP_FLAG_IRQ) {
cur_intrs = tpm_dev->intrs; cur_intrs = tpm_dev->intrs;
clear_interruption(tpm_dev); clear_interruption(tpm_dev);
enable_irq(chip->vendor.irq); enable_irq(tpm_dev->irq);
do { do {
if (ret == -ERESTARTSYS && freezing(current)) if (ret == -ERESTARTSYS && freezing(current))
@ -314,7 +306,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
} }
} while (ret == -ERESTARTSYS && freezing(current)); } while (ret == -ERESTARTSYS && freezing(current));
disable_irq_nosync(chip->vendor.irq); disable_irq_nosync(tpm_dev->irq);
} else { } else {
do { do {
@ -376,7 +368,7 @@ static irqreturn_t tpm_ioserirq_handler(int irq, void *dev_id)
tpm_dev->intrs++; tpm_dev->intrs++;
wake_up_interruptible(&chip->vendor.read_queue); wake_up_interruptible(&chip->vendor.read_queue);
disable_irq_nosync(chip->vendor.irq); disable_irq_nosync(tpm_dev->irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} /* tpm_ioserirq_handler() */ } /* tpm_ioserirq_handler() */
@ -456,7 +448,7 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf,
if (ret < 0) if (ret < 0)
goto out_err; goto out_err;
if (chip->vendor.irq) { if (chip->flags & TPM_CHIP_FLAG_IRQ) {
ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
ret = wait_for_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, ret = wait_for_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID,
@ -611,9 +603,10 @@ int st33zp24_probe(void *phy_id, const struct st33zp24_phy_ops *ops,
if (ret < 0) if (ret < 0)
goto _tpm_clean_answer; goto _tpm_clean_answer;
chip->vendor.irq = irq; tpm_dev->irq = irq;
chip->flags |= TPM_CHIP_FLAG_IRQ;
disable_irq_nosync(chip->vendor.irq); disable_irq_nosync(tpm_dev->irq);
tpm_gen_interrupt(chip); tpm_gen_interrupt(chip);
} }

10
drivers/char/tpm/st33zp24/st33zp24.h
View File

@ -21,6 +21,16 @@
#define TPM_WRITE_DIRECTION 0x80 #define TPM_WRITE_DIRECTION 0x80
#define TPM_BUFSIZE 2048 #define TPM_BUFSIZE 2048
struct st33zp24_dev {
struct tpm_chip *chip;
void *phy_id;
const struct st33zp24_phy_ops *ops;
int irq;
u32 intrs;
int io_lpcpd;
};
struct st33zp24_phy_ops { struct st33zp24_phy_ops {
int (*send)(void *phy_id, u8 tpm_register, u8 *tpm_data, int tpm_size); int (*send)(void *phy_id, u8 tpm_register, u8 *tpm_data, int tpm_size);
int (*recv)(void *phy_id, u8 tpm_register, u8 *tpm_data, int tpm_size); int (*recv)(void *phy_id, u8 tpm_register, u8 *tpm_data, int tpm_size);

4
drivers/char/tpm/tpm-interface.c
View File

@ -359,7 +359,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
goto out; goto out;
} }
if (chip->vendor.irq) if (chip->flags & TPM_CHIP_FLAG_IRQ)
goto out_recv; goto out_recv;
if (chip->flags & TPM_CHIP_FLAG_TPM2) if (chip->flags & TPM_CHIP_FLAG_TPM2)
@ -890,7 +890,7 @@ int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
stop = jiffies + timeout; stop = jiffies + timeout;
if (chip->vendor.irq) { if (chip->flags & TPM_CHIP_FLAG_IRQ) {
again: again:
timeout = stop - jiffies; timeout = stop - jiffies;
if ((long)timeout <= 0) if ((long)timeout <= 0)

3
drivers/char/tpm/tpm.h
View File

@ -131,8 +131,6 @@ enum tpm2_startup_types {
struct tpm_chip; struct tpm_chip;
struct tpm_vendor_specific { struct tpm_vendor_specific {
int irq;
int locality; int locality;
unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */ unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */
bool timeout_adjusted; bool timeout_adjusted;
@ -154,6 +152,7 @@ struct tpm_vendor_specific {
enum tpm_chip_flags { enum tpm_chip_flags {
TPM_CHIP_FLAG_REGISTERED = BIT(0), TPM_CHIP_FLAG_REGISTERED = BIT(0),
TPM_CHIP_FLAG_TPM2 = BIT(1), TPM_CHIP_FLAG_TPM2 = BIT(1),
TPM_CHIP_FLAG_IRQ = BIT(2),
}; };
struct tpm_chip { struct tpm_chip {

1
drivers/char/tpm/tpm_i2c_atmel.c
View File

@ -173,7 +173,6 @@ static int i2c_atmel_probe(struct i2c_client *client,
chip->vendor.timeout_b = msecs_to_jiffies(TPM_I2C_LONG_TIMEOUT); chip->vendor.timeout_b = msecs_to_jiffies(TPM_I2C_LONG_TIMEOUT);
chip->vendor.timeout_c = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT); chip->vendor.timeout_c = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
chip->vendor.timeout_d = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT); chip->vendor.timeout_d = msecs_to_jiffies(TPM_I2C_SHORT_TIMEOUT);
chip->vendor.irq = 0;
/* There is no known way to probe for this device, and all version /* There is no known way to probe for this device, and all version
* information seems to be read via TPM commands. Thus we rely on the * information seems to be read via TPM commands. Thus we rely on the

3
drivers/char/tpm/tpm_i2c_infineon.c
View File

@ -585,9 +585,6 @@ static int tpm_tis_i2c_init(struct device *dev)
if (IS_ERR(chip)) if (IS_ERR(chip))
return PTR_ERR(chip); return PTR_ERR(chip);
/* Disable interrupts */
chip->vendor.irq = 0;
/* Default timeouts */ /* Default timeouts */
chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT); chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);
chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT); chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);

28
drivers/char/tpm/tpm_i2c_nuvoton.c
View File

@ -55,6 +55,7 @@
#define I2C_DRIVER_NAME "tpm_i2c_nuvoton" #define I2C_DRIVER_NAME "tpm_i2c_nuvoton"
struct priv_data { struct priv_data {
int irq;
unsigned int intrs; unsigned int intrs;
}; };
@ -176,12 +177,12 @@ static bool i2c_nuvoton_check_status(struct tpm_chip *chip, u8 mask, u8 value)
static int i2c_nuvoton_wait_for_stat(struct tpm_chip *chip, u8 mask, u8 value, static int i2c_nuvoton_wait_for_stat(struct tpm_chip *chip, u8 mask, u8 value,
u32 timeout, wait_queue_head_t *queue) u32 timeout, wait_queue_head_t *queue)
{ {
if (chip->vendor.irq && queue) { if ((chip->flags & TPM_CHIP_FLAG_IRQ) && queue) {
s32 rc; s32 rc;
struct priv_data *priv = chip->vendor.priv; struct priv_data *priv = chip->vendor.priv;
unsigned int cur_intrs = priv->intrs; unsigned int cur_intrs = priv->intrs;
enable_irq(chip->vendor.irq); enable_irq(priv->irq);
rc = wait_event_interruptible_timeout(*queue, rc = wait_event_interruptible_timeout(*queue,
cur_intrs != priv->intrs, cur_intrs != priv->intrs,
timeout); timeout);
@ -477,7 +478,7 @@ static irqreturn_t i2c_nuvoton_int_handler(int dummy, void *dev_id)
priv->intrs++; priv->intrs++;
wake_up(&chip->vendor.read_queue); wake_up(&chip->vendor.read_queue);
disable_irq_nosync(chip->vendor.irq); disable_irq_nosync(priv->irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -521,6 +522,7 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
int rc; int rc;
struct tpm_chip *chip; struct tpm_chip *chip;
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct priv_data *priv;
u32 vid = 0; u32 vid = 0;
rc = get_vid(client, &vid); rc = get_vid(client, &vid);
@ -534,10 +536,10 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
if (IS_ERR(chip)) if (IS_ERR(chip))
return PTR_ERR(chip); return PTR_ERR(chip);
chip->vendor.priv = devm_kzalloc(dev, sizeof(struct priv_data), priv = devm_kzalloc(dev, sizeof(struct priv_data), GFP_KERNEL);
GFP_KERNEL); if (!priv)
if (!chip->vendor.priv)
return -ENOMEM; return -ENOMEM;
chip->vendor.priv = priv;
init_waitqueue_head(&chip->vendor.read_queue); init_waitqueue_head(&chip->vendor.read_queue);
@ -552,19 +554,21 @@ static int i2c_nuvoton_probe(struct i2c_client *client,
* TPM_INTF_INT_LEVEL_LOW | TPM_INTF_DATA_AVAIL_INT * TPM_INTF_INT_LEVEL_LOW | TPM_INTF_DATA_AVAIL_INT
* The IRQ should be set in the i2c_board_info (which is done * The IRQ should be set in the i2c_board_info (which is done
* automatically in of_i2c_register_devices, for device tree users */ * automatically in of_i2c_register_devices, for device tree users */
chip->vendor.irq = client->irq; chip->flags |= TPM_CHIP_FLAG_IRQ;
priv->irq = client->irq;
if (chip->vendor.irq) { if (chip->flags & TPM_CHIP_FLAG_IRQ) {
dev_dbg(dev, "%s() chip-vendor.irq\n", __func__); dev_dbg(dev, "%s() priv->irq\n", __func__);
rc = devm_request_irq(dev, chip->vendor.irq, rc = devm_request_irq(dev, client->irq,
i2c_nuvoton_int_handler, i2c_nuvoton_int_handler,
IRQF_TRIGGER_LOW, IRQF_TRIGGER_LOW,
dev_name(&chip->dev), dev_name(&chip->dev),
chip); chip);
if (rc) { if (rc) {
dev_err(dev, "%s() Unable to request irq: %d for use\n", dev_err(dev, "%s() Unable to request irq: %d for use\n",
__func__, chip->vendor.irq); __func__, priv->irq);
chip->vendor.irq = 0; chip->flags &= ~TPM_CHIP_FLAG_IRQ;
priv->irq = 0;
} else { } else {
/* Clear any pending interrupt */ /* Clear any pending interrupt */
i2c_nuvoton_ready(chip); i2c_nuvoton_ready(chip);

30
drivers/char/tpm/tpm_tis.c
View File

@ -96,6 +96,7 @@ struct tpm_info {
struct priv_data { struct priv_data {
void __iomem *iobase; void __iomem *iobase;
u16 manufacturer_id; u16 manufacturer_id;
int irq;
bool irq_tested; bool irq_tested;
wait_queue_head_t int_queue; wait_queue_head_t int_queue;
}; };
@ -177,7 +178,7 @@ static int request_locality(struct tpm_chip *chip, int l)
stop = jiffies + chip->vendor.timeout_a; stop = jiffies + chip->vendor.timeout_a;
if (chip->vendor.irq) { if (chip->flags & TPM_CHIP_FLAG_IRQ) {
again: again:
timeout = stop - jiffies; timeout = stop - jiffies;
if ((long)timeout <= 0) if ((long)timeout <= 0)
@ -385,8 +386,9 @@ static void disable_interrupts(struct tpm_chip *chip)
intmask &= ~TPM_GLOBAL_INT_ENABLE; intmask &= ~TPM_GLOBAL_INT_ENABLE;
iowrite32(intmask, iowrite32(intmask,
priv->iobase + TPM_INT_ENABLE(chip->vendor.locality)); priv->iobase + TPM_INT_ENABLE(chip->vendor.locality));
devm_free_irq(&chip->dev, chip->vendor.irq, chip); devm_free_irq(&chip->dev, priv->irq, chip);
chip->vendor.irq = 0; priv->irq = 0;
chip->flags &= ~TPM_CHIP_FLAG_IRQ;
} }
/* /*
@ -409,7 +411,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)
iowrite8(TPM_STS_GO, iowrite8(TPM_STS_GO,
priv->iobase + TPM_STS(chip->vendor.locality)); priv->iobase + TPM_STS(chip->vendor.locality));
if (chip->vendor.irq) { if (chip->flags & TPM_CHIP_FLAG_IRQ) {
ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
if (chip->flags & TPM_CHIP_FLAG_TPM2) if (chip->flags & TPM_CHIP_FLAG_TPM2)
@ -436,14 +438,16 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
int rc, irq; int rc, irq;
struct priv_data *priv = chip->vendor.priv; struct priv_data *priv = chip->vendor.priv;
if (!chip->vendor.irq || priv->irq_tested) if (!(chip->flags & TPM_CHIP_FLAG_IRQ) || priv->irq_tested)
return tpm_tis_send_main(chip, buf, len); return tpm_tis_send_main(chip, buf, len);
/* Verify receipt of the expected IRQ */ /* Verify receipt of the expected IRQ */
irq = chip->vendor.irq; irq = priv->irq;
chip->vendor.irq = 0; priv->irq = 0;
chip->flags &= ~TPM_CHIP_FLAG_IRQ;
rc = tpm_tis_send_main(chip, buf, len); rc = tpm_tis_send_main(chip, buf, len);
chip->vendor.irq = irq; priv->irq = irq;
chip->flags |= TPM_CHIP_FLAG_IRQ;
if (!priv->irq_tested) if (!priv->irq_tested)
msleep(1); msleep(1);
if (!priv->irq_tested) if (!priv->irq_tested)
@ -605,7 +609,7 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,
irq); irq);
return -1; return -1;
} }
chip->vendor.irq = irq; priv->irq = irq;
original_int_vec = ioread8(priv->iobase + original_int_vec = ioread8(priv->iobase +
TPM_INT_VECTOR(chip->vendor.locality)); TPM_INT_VECTOR(chip->vendor.locality));
@ -634,7 +638,7 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,
/* tpm_tis_send will either confirm the interrupt is working or it /* tpm_tis_send will either confirm the interrupt is working or it
* will call disable_irq which undoes all of the above. * will call disable_irq which undoes all of the above.
*/ */
if (!chip->vendor.irq) { if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
iowrite8(original_int_vec, iowrite8(original_int_vec,
priv->iobase + TPM_INT_VECTOR(chip->vendor.locality)); priv->iobase + TPM_INT_VECTOR(chip->vendor.locality));
return 1; return 1;
@ -797,7 +801,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
if (tpm_info->irq) { if (tpm_info->irq) {
tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
tpm_info->irq); tpm_info->irq);
if (!chip->vendor.irq) if (!(chip->flags & TPM_CHIP_FLAG_IRQ))
dev_err(&chip->dev, FW_BUG dev_err(&chip->dev, FW_BUG
"TPM interrupt not working, polling instead\n"); "TPM interrupt not working, polling instead\n");
} else } else
@ -841,7 +845,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
/* reenable interrupts that device may have lost or /* reenable interrupts that device may have lost or
BIOS/firmware may have disabled */ BIOS/firmware may have disabled */
iowrite8(chip->vendor.irq, priv->iobase + iowrite8(priv->irq, priv->iobase +
TPM_INT_VECTOR(chip->vendor.locality)); TPM_INT_VECTOR(chip->vendor.locality));
intmask = intmask =
@ -860,7 +864,7 @@ static int tpm_tis_resume(struct device *dev)
struct tpm_chip *chip = dev_get_drvdata(dev); struct tpm_chip *chip = dev_get_drvdata(dev);
int ret; int ret;
if (chip->vendor.irq) if (chip->flags & TPM_CHIP_FLAG_IRQ)
tpm_tis_reenable_interrupts(chip); tpm_tis_reenable_interrupts(chip);
ret = tpm_pm_resume(dev); ret = tpm_pm_resume(dev);

7
drivers/char/tpm/xen-tpmfront.c
View File

@ -28,6 +28,7 @@ struct tpm_private {
unsigned int evtchn; unsigned int evtchn;
int ring_ref; int ring_ref;
domid_t backend_id; domid_t backend_id;
int irq;
}; };
enum status_bits { enum status_bits {
@ -217,7 +218,7 @@ static int setup_ring(struct xenbus_device *dev, struct tpm_private *priv)
xenbus_dev_fatal(dev, rv, "allocating TPM irq"); xenbus_dev_fatal(dev, rv, "allocating TPM irq");
return rv; return rv;
} }
priv->chip->vendor.irq = rv; priv->irq = rv;
again: again:
rv = xenbus_transaction_start(&xbt); rv = xenbus_transaction_start(&xbt);
@ -277,8 +278,8 @@ static void ring_free(struct tpm_private *priv)
else else
free_page((unsigned long)priv->shr); free_page((unsigned long)priv->shr);
if (priv->chip && priv->chip->vendor.irq) if (priv->irq)
unbind_from_irqhandler(priv->chip->vendor.irq, priv); unbind_from_irqhandler(priv->irq, priv);
kfree(priv); kfree(priv);
} }