Commit 619d996c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull TPM updates from Jarkko Sakkinen:
 "Only some minor tweaks"

* tag 'tpmdd-next-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: atmel: Drop PPC64 specific MMIO setup
  char: tpm: cr50: Add new device/vendor ID 0x50666666
  char: tpm: cr50: Move i2c locking to request/relinquish locality ops
  char: tpm: cr50: Use generic request/relinquish locality ops
  tpm: ibmvtpm: Set TPM_OPS_AUTO_STARTUP flag on driver
parents d0c9a21c 5578b434

drivers/char/tpm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ config TCG_NSC 


config TCG_ATMEL

	tristate "Atmel TPM Interface"

	depends on PPC64 || HAS_IOPORT_MAP

	depends on HAS_IOPORT_MAP

	depends on HAS_IOPORT

	help

	  If you have a TPM security chip from Atmel say Yes and it

drivers/char/tpm/tpm2-sessions.c

+0 −1
Original line number Diff line number Diff line
@@ -1390,5 +1390,4 @@ int tpm2_sessions_init(struct tpm_chip *chip) 


	return rc;

}

EXPORT_SYMBOL(tpm2_sessions_init);

#endif /* CONFIG_TCG_TPM2_HMAC */

drivers/char/tpm/tpm_atmel.c

+60 −3
Original line number Diff line number Diff line
@@ -15,7 +15,66 @@ 
 */



#include "tpm.h"

#include "tpm_atmel.h"



struct tpm_atmel_priv {

	int region_size;

	int have_region;

	unsigned long base;

	void __iomem *iobase;

};



#define atmel_getb(chip, offset) inb(atmel_get_priv(chip)->base + (offset))

#define atmel_putb(val, chip, offset) \

	outb(val, atmel_get_priv(chip)->base + (offset))

#define atmel_request_region request_region

#define atmel_release_region release_region

/* Atmel definitions */

enum tpm_atmel_addr {

	TPM_ATMEL_BASE_ADDR_LO = 0x08,

	TPM_ATMEL_BASE_ADDR_HI = 0x09

};



static inline int tpm_read_index(int base, int index)

{

	outb(index, base);

	return inb(base + 1) & 0xFF;

}



/* Verify this is a 1.1 Atmel TPM */

static int atmel_verify_tpm11(void)

{

	/* verify that it is an Atmel part */

	if (tpm_read_index(TPM_ADDR, 4) != 'A' ||

	    tpm_read_index(TPM_ADDR, 5) != 'T' ||

	    tpm_read_index(TPM_ADDR, 6) != 'M' ||

	    tpm_read_index(TPM_ADDR, 7) != 'L')

		return 1;



	/* query chip for its version number */

	if (tpm_read_index(TPM_ADDR, 0x00) != 1 ||

	    tpm_read_index(TPM_ADDR, 0x01) != 1)

		return 1;



	/* This is an atmel supported part */

	return 0;

}



/* Determine where to talk to device */

static void __iomem *atmel_get_base_addr(unsigned long *base, int *region_size)

{

	int lo, hi;



	if (atmel_verify_tpm11() != 0)

		return NULL;



	lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);

	hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);



	*base = (hi << 8) | lo;

	*region_size = 2;



	return ioport_map(*base, *region_size);

}



/* write status bits */

enum tpm_atmel_write_status {
@@ -142,7 +201,6 @@ static void atml_plat_remove(void) 
	tpm_chip_unregister(chip);

	if (priv->have_region)

		atmel_release_region(priv->base, priv->region_size);

	atmel_put_base_addr(priv->iobase);

	platform_device_unregister(pdev);

}
@@ -211,7 +269,6 @@ static int __init init_atmel(void) 
err_unreg_dev:

	platform_device_unregister(pdev);

err_rel_reg:

	atmel_put_base_addr(iobase);

	if (have_region)

		atmel_release_region(base,

				     region_size);

drivers/char/tpm/tpm_atmel.h

deleted100644 → 0
+0 −140
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2005 IBM Corporation

 *

 * Authors:

 * Kylene Hall <kjhall@us.ibm.com>

 *

 * Maintained by: <tpmdd-devel@lists.sourceforge.net>

 *

 * Device driver for TCG/TCPA TPM (trusted platform module).

 * Specifications at www.trustedcomputinggroup.org

 *

 * These difference are required on power because the device must be

 * discovered through the device tree and iomap must be used to get

 * around the need for holes in the io_page_mask.  This does not happen

 * automatically because the tpm is not a normal pci device and lives

 * under the root node.

 */



struct tpm_atmel_priv {

	int region_size;

	int have_region;

	unsigned long base;

	void __iomem *iobase;

};



#ifdef CONFIG_PPC64



#include <linux/of.h>



#define atmel_getb(priv, offset) readb(priv->iobase + offset)

#define atmel_putb(val, priv, offset) writeb(val, priv->iobase + offset)

#define atmel_request_region request_mem_region

#define atmel_release_region release_mem_region



static inline void atmel_put_base_addr(void __iomem *iobase)

{

	iounmap(iobase);

}



static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)

{

	struct device_node *dn;

	unsigned long address, size;

	const unsigned int *reg;

	int reglen;

	int naddrc;

	int nsizec;



	dn = of_find_node_by_name(NULL, "tpm");



	if (!dn)

		return NULL;



	if (!of_device_is_compatible(dn, "AT97SC3201")) {

		of_node_put(dn);

		return NULL;

	}



	reg = of_get_property(dn, "reg", &reglen);

	naddrc = of_n_addr_cells(dn);

	nsizec = of_n_size_cells(dn);



	of_node_put(dn);





	if (naddrc == 2)

		address = ((unsigned long) reg[0] << 32) | reg[1];

	else

		address = reg[0];



	if (nsizec == 2)

		size =

		    ((unsigned long) reg[naddrc] << 32) | reg[naddrc + 1];

	else

		size = reg[naddrc];



	*base = address;

	*region_size = size;

	return ioremap(*base, *region_size);

}

#else

#define atmel_getb(chip, offset) inb(atmel_get_priv(chip)->base + offset)

#define atmel_putb(val, chip, offset) \

	outb(val, atmel_get_priv(chip)->base + offset)

#define atmel_request_region request_region

#define atmel_release_region release_region

/* Atmel definitions */

enum tpm_atmel_addr {

	TPM_ATMEL_BASE_ADDR_LO = 0x08,

	TPM_ATMEL_BASE_ADDR_HI = 0x09

};



static inline int tpm_read_index(int base, int index)

{

	outb(index, base);

	return inb(base+1) & 0xFF;

}



/* Verify this is a 1.1 Atmel TPM */

static int atmel_verify_tpm11(void)

{



	/* verify that it is an Atmel part */

	if (tpm_read_index(TPM_ADDR, 4) != 'A' ||

	    tpm_read_index(TPM_ADDR, 5) != 'T' ||

	    tpm_read_index(TPM_ADDR, 6) != 'M' ||

	    tpm_read_index(TPM_ADDR, 7) != 'L')

		return 1;



	/* query chip for its version number */

	if (tpm_read_index(TPM_ADDR, 0x00) != 1 ||

	    tpm_read_index(TPM_ADDR, 0x01) != 1)

		return 1;



	/* This is an atmel supported part */

	return 0;

}



static inline void atmel_put_base_addr(void __iomem *iobase)

{

}



/* Determine where to talk to device */

static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)

{

	int lo, hi;



	if (atmel_verify_tpm11() != 0)

		return NULL;



	lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);

	hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);



	*base = (hi << 8) | lo;

	*region_size = 2;



	return ioport_map(*base, *region_size);

}

#endif

drivers/char/tpm/tpm_ibmvtpm.c

+1 −14
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ static bool tpm_ibmvtpm_req_canceled(struct tpm_chip *chip, u8 status) 
}



static const struct tpm_class_ops tpm_ibmvtpm = {

	.flags = TPM_OPS_AUTO_STARTUP,

	.recv = tpm_ibmvtpm_recv,

	.send = tpm_ibmvtpm_send,

	.cancel = tpm_ibmvtpm_cancel,
@@ -690,20 +691,6 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, 
	if (!strcmp(id->compat, "IBM,vtpm20"))

		chip->flags |= TPM_CHIP_FLAG_TPM2;



	rc = tpm_get_timeouts(chip);

	if (rc)

		goto init_irq_cleanup;



	if (chip->flags & TPM_CHIP_FLAG_TPM2) {

		rc = tpm2_get_cc_attrs_tbl(chip);

		if (rc)

			goto init_irq_cleanup;



		rc = tpm2_sessions_init(chip);

		if (rc)

			goto init_irq_cleanup;

	}



	return tpm_chip_register(chip);

init_irq_cleanup:

	do {