 @@ -1,14 +1,14 @@
-/*	$NetBSD: tpm.c,v 1.16 2019/10/09 14:03:58 maxv Exp $	*/
+/*	$NetBSD: tpm.c,v 1.17 2021/01/04 18:22:19 riastradh Exp $	*/
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -38,37 +38,39 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.16 2019/10/09 14:03:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.17 2021/01/04 18:22:19 riastradh Exp $");
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/pmf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <dev/ic/tpmreg.h>
 #include <dev/ic/tpmvar.h>
 #include "ioconf.h"
 CTASSERT(sizeof(struct tpm_header) == 10);
 #define TPM_BUFSIZ	1024
 #define TPM_PARAM_SIZE	0x0001	/* that's a flag */
 /* Timeouts. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tpmreg.h,v 1.6 2019/10/09 07:30:58 maxv Exp $	*/
+/*	$NetBSD: tpmreg.h,v 1.7 2021/01/04 18:22:19 riastradh Exp $	*/
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,35 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#if (BYTE_ORDER == LITTLE_ENDIAN)
+#ifndef	DEV_IC_TPMREG_H
 #define	DEV_IC_TPMREG_H
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/endian.h>
 #if (_BYTE_ORDER == _LITTLE_ENDIAN)
 #define TPM_BE16(a)	bswap16(a)
 #define TPM_BE32(a)	bswap32(a)
 #else
 #define TPM_BE16(a)	(a)
 #define TPM_BE32(a)	(a)
 #endif
 struct tpm_header {
 	uint16_t tag;
 	uint32_t length;
 	uint32_t code;
 } __packed;
 @@ -95,13 +103,15 @@ struct tpm_header {
 #define		TPM_STS_DATA_AVAIL		__BIT(4)
 #define		TPM_STS_DATA_EXPECT		__BIT(3)
 #define		TPM_STS_SELFTEST_DONE		__BIT(2)
 #define		TPM_STS_RESP_RETRY		__BIT(1)
 #define	TPM_DATA			0x0024	/* 32bit register */
 #define	TPM_ID				0x0f00	/* 32bit register */
 #define	TPM_REV				0x0f04	/* 8bit register */
 /*
  * Five localities, 4K per locality.
  */
 #define	TPM_SPACE_SIZE	0x5000
 #endif	/* DEV_IC_TPMREG_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tpmvar.h,v 1.7 2019/10/09 14:03:58 maxv Exp $	*/
+/*	$NetBSD: tpmvar.h,v 1.8 2021/01/04 18:22:19 riastradh Exp $	*/
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,51 +19,60 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	DEV_IC_TPMVAR_H
 #define	DEV_IC_TPMVAR_H
 #include <sys/types.h>
 #define TPM_API_VERSION		1
 enum tpm_version {
 	TPM_1_2,
 	TPM_2_0
 };
 enum itf_version {
 	TIS_1_2,
 	CRB
 };
 struct tpm_ioc_getinfo {
 	uint32_t api_version;
 	uint32_t tpm_version;
 	uint32_t itf_version;
 	uint32_t device_id;
 	uint32_t device_rev;
 	uint32_t device_caps;
 };
 #define TPM_IOC_GETINFO		_IOR ('N',  0, struct tpm_ioc_getinfo)
 #ifdef _KERNEL
 #include <sys/bus.h>
 #include <sys/device_if.h>
 #include <sys/mutex.h>
 struct tpm_softc;
 struct tpm_intf {
 	enum itf_version version;
 	int (*probe)(bus_space_tag_t, bus_space_handle_t);
 	int (*init)(struct tpm_softc *);
 	int (*start)(struct tpm_softc *, int);
 	int (*read)(struct tpm_softc *, void *, size_t, size_t *, int);
 	int (*write)(struct tpm_softc *, const void *, size_t);
 	int (*end)(struct tpm_softc *, int, int);
 };
 extern const struct tpm_intf tpm_intf_tis12;
 @@ -78,13 +87,15 @@ struct tpm_softc {
 	bus_space_tag_t sc_bt;
 	bus_space_handle_t sc_bh;
 	uint32_t sc_devid;
 	uint32_t sc_rev;
 	uint32_t sc_status;
 	uint32_t sc_caps;
 };
 bool tpm_suspend(device_t, const pmf_qual_t *);
 bool tpm_resume(device_t, const pmf_qual_t *);
 #endif
 #endif	/* DEV_IC_TPMVAR_H */