linux-stable.git/drivers/char/tpm, branch v4.7

tpm_tis: fix build warning with tpm_tis_resume

2016-02-26T09:32:07+00:00

drivers/char/tpm/tpm_tis.c:838: warning: ‘tpm_tis_resume’ defined but
not used

Reported-by: James Morris 
Fixes: 00194826e6be ("tpm_tis: Clean up the force=1 module parameter")
Signed-off-by: Jarkko Sakkinen 
cc: stable@vger.kernel.org

tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()

2016-02-20T07:59:33+00:00

Wrong call order.

Reported-by: Jason Gunthorpe 
Fixes: 74d6b3ceaa17
Signed-off-by: Jarkko Sakkinen 
cc: stable@vger.kernel.org

tpm_crb/tis: fix: use dev_name() for /proc/iomem

2016-02-20T07:59:33+00:00

In all cases use dev_name() for the mapped resources. This is both
for sake of consistency and also with some platforms resource name
given by ACPI object seems to return garbage.

Signed-off-by: Jarkko Sakkinen 
Fixes: 1bd047be37d9 ("tpm_crb: Use devm_ioremap_resource")

tpm_eventlog.c: fix binary_bios_measurements

2016-02-20T07:59:32+00:00

The commit 0cc698af36ff ("vTPM: support little endian guests") copied
the event, but without the event data, did an endian conversion on the
size and tried to output the event data from the copied version, which
has only have one byte of the data, resulting in garbage event data.

[jarkko.sakkinen@linux.intel.com: fixed minor coding style issues and
 renamed the local variable tempPtr as temp_ptr now that there is an
 excuse to do this.]

Signed-off-by: Harald Hoyer 
Fixes: 0cc698af36ff ("vTPM: support little endian guests")
Reviewed-by: Jarkko Sakkinen 
cc: stable@vger.kernel.org

tpm: fix: return rc when devm_add_action() fails

2016-02-20T07:59:32+00:00

Call put_device() and return error code if devm_add_action() fails.

Signed-off-by: Jarkko Sakkinen 
Reported-by: Jason Gunthorpe 
Fixes: 8e0ee3c9faed ("tpm: fix the cleanup of struct tpm_chip")

tpm: fix: set continueSession attribute for the unseal operation

2016-02-20T07:58:21+00:00

It's better to set the continueSession attribute for the unseal
operation so that the session object is not removed as a side-effect
when the operation is successful. Since a user process created the
session, it should be also decide when the session is destroyed.

Signed-off-by: Jarkko Sakkinen 
Fixes: 5beb0c435b ("keys, trusted: seal with a TPM2 authorization policy")

tpm: fix the cleanup of struct tpm_chip

2016-02-10T02:12:08+00:00

If the initialization fails before tpm_chip_register(), put_device()
will be not called, which causes release callback not to be called.
This patch fixes the issue by adding put_device() to devres list of
the parent device.

Fixes: 313d21eeab ("tpm: device class for tpm")
Signed-off-by: Jarkko Sakkinen 
cc: stable@vger.kernel.org
Reviewed-by: Jason Gunthorpe

tpm: fix the rollback in tpm_chip_register()

2016-02-10T02:12:02+00:00

Fixed the rollback and gave more self-documenting names for the
functions.

Fixes: d972b0523f ("tpm: fix call order in tpm-chip.c")
Signed-off-by: Jarkko Sakkinen 
cc: stable@vger.kernel.org
Reviewed-by: Jason Gunthorpe

tpm_crb: Use devm_ioremap_resource

2016-02-10T02:11:51+00:00

To support the force mode in tpm_tis we need to use resource locking
in tpm_crb as well, via devm_ioremap_resource.

The light restructuring better aligns crb and tis and makes it easier
to see the that new changes make sense.

The control area and its associated buffers do not always fall in the
range of the iomem resource given by the ACPI object. This patch fixes
the issue by mapping the buffers if this is the case.

[jarkko.sakkinen@linux.intel.com: squashed update described in the
 last paragraph.]

Signed-off-by: Jason Gunthorpe 
Tested-by: Jarkko Sakkinen 
Reviewed-by: Jarkko Sakkinen 
Acked-by: Peter Huewe 
Signed-off-by: Jarkko Sakkinen

tpm_crb: Drop le32_to_cpu(ioread32(..))

2016-02-10T02:11:43+00:00

ioread32 and readl are defined to read from PCI style memory, ie little
endian and return the result in host order. On platforms where a
swap is required ioread32/readl do the swap internally (eg see ppc).

Signed-off-by: Jason Gunthorpe 
Tested-by: Jarkko Sakkinen 
Reviewed-by: Jarkko Sakkinen 
Acked-by: Peter Huewe