Commit 208d9b65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd 

Pull tpm fixes from Jarkko Sakkinen:
 "The bug fix for tpm_tis_core_init() is not that critical but still
  makes sense to get into release for the sake of better quality.

  I included the Intel CPU model define change mainly to help Tony just
  a bit, as for this subsystem it cannot realistically speaking cause
  any possible harm"

* tag 'tpmdd-next-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: Switch to new Intel CPU model defines
  tpm_tis: Do *not* flush uninitialized work
parents 71d7b52c f071d02e

drivers/char/tpm/tpm.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/tpm_eventlog.h>



#ifdef CONFIG_X86

#include <asm/intel-family.h>

#include <asm/cpu_device_id.h>

#endif



#define TPM_MINOR		224	/* officially assigned */

drivers/char/tpm/tpm_tis_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1020,6 +1020,7 @@ void tpm_tis_remove(struct tpm_chip *chip) 
		interrupt = 0;



	tpm_tis_write32(priv, reg, ~TPM_GLOBAL_INT_ENABLE & interrupt);

	if (priv->free_irq_work.func)

		flush_work(&priv->free_irq_work);



	tpm_tis_clkrun_enable(chip, false);

drivers/char/tpm/tpm_tis_core.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static inline int tpm_tis_verify_crc(struct tpm_tis_data *data, size_t len, 
static inline bool is_bsw(void)

{

#ifdef CONFIG_X86

	return ((boot_cpu_data.x86_model == INTEL_FAM6_ATOM_AIRMONT) ? 1 : 0);

	return (boot_cpu_data.x86_vfm == INTEL_ATOM_AIRMONT) ? 1 : 0;

#else

	return false;

#endif