Module Name: src
Committed By: martin
Date: Mon Aug 29 15:48:31 UTC 2022
Modified Files:
src/sys/dev/ic [netbsd-9]: tpm.c
src/sys/dev/isa [netbsd-9]: tpm_isa.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1505):
sys/dev/isa/tpm_isa.c: revision 1.8
sys/dev/ic/tpm.c: revision 1.20
Add missing printing-of-newlines in the attach routine.
Remove extra newline from boot messages (isa and acpi front-ends
already provide the newline).
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/dev/ic/tpm.c
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/isa/tpm_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/tpm.c
diff -u src/sys/dev/ic/tpm.c:1.13.2.2 src/sys/dev/ic/tpm.c:1.13.2.3
--- src/sys/dev/ic/tpm.c:1.13.2.2 Wed Aug 3 16:00:47 2022
+++ src/sys/dev/ic/tpm.c Mon Aug 29 15:48:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm.c,v 1.13.2.2 2022/08/03 16:00:47 martin Exp $ */
+/* $NetBSD: tpm.c,v 1.13.2.3 2022/08/29 15:48:31 martin Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.13.2.2 2022/08/03 16:00:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.13.2.3 2022/08/29 15:48:31 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -821,9 +821,6 @@ tpm_tis12_init(struct tpm_softc *sc)
{
int rv;
- aprint_naive("\n");
- aprint_normal("\n");
-
sc->sc_caps = bus_space_read_4(sc->sc_bt, sc->sc_bh,
TPM_INTF_CAPABILITY);
sc->sc_devid = bus_space_read_4(sc->sc_bt, sc->sc_bh, TPM_ID);
Index: src/sys/dev/isa/tpm_isa.c
diff -u src/sys/dev/isa/tpm_isa.c:1.4.2.1 src/sys/dev/isa/tpm_isa.c:1.4.2.2
--- src/sys/dev/isa/tpm_isa.c:1.4.2.1 Wed Oct 16 09:52:38 2019
+++ src/sys/dev/isa/tpm_isa.c Mon Aug 29 15:48:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_isa.c,v 1.4.2.1 2019/10/16 09:52:38 martin Exp $ */
+/* $NetBSD: tpm_isa.c,v 1.4.2.2 2022/08/29 15:48:30 martin Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm_isa.c,v 1.4.2.1 2019/10/16 09:52:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_isa.c,v 1.4.2.2 2022/08/29 15:48:30 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,6 +113,9 @@ tpm_isa_attach(device_t parent, device_t
base = (unsigned int)ia->ia_iomem[0].ir_addr;
size = TPM_SPACE_SIZE;
+ aprint_normal("\n");
+ aprint_naive("\n");
+
sc->sc_dev = self;
sc->sc_ver = TPM_1_2;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
