On Thu, 29 Jan 2015, Jarkko Sakkinen wrote: > Fixed suspend/resume paths for TPM 2.0 and consolidated all the > associated code to the tpm_pm_suspend() and tpm_pm_resume() > functions. Resume path should be handled by the firmware, i.e. > Startup(CLEAR) for hibernate and Startup(STATE) for suspend. > > There might be some non-PC embedded devices in the future where > Startup() is not the handled by the FW but fixing the code for > those IMHO should be postponed until there is hardware available > to test the fixes although extra Startup in the driver code is > essentially a NOP. > > Added Shutdown(CLEAR) to the remove paths of TIS and CRB drivers. > Changed tpm2_shutdown() to a void function because there isn't > much you can do except print an error message if this fails with > a system error. > > Reported-by: Peter Hüwe <PeterHuewe@xxxxxx> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> > --- > drivers/char/tpm/tpm-interface.c | 6 ++++-- > drivers/char/tpm/tpm.h | 2 +- > drivers/char/tpm/tpm2-cmd.c | 19 +++++++++++-------- > drivers/char/tpm/tpm_crb.c | 20 +++++--------------- > drivers/char/tpm/tpm_tis.c | 26 +++++++++++++------------- > 5 files changed, 34 insertions(+), 39 deletions(-) Resume still functions on TPM 1.2 chip, with and without CONFIG_TCG_CRB. Tested-by: Scot Doyle <lkml14@xxxxxxxxxxxxx>
