Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 22 May 2024 14:55:39 GMT
From:      Ryan Libby <rlibby@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: bea2bf458d2c - main - tpm_if.m: declare bus addresses as bus_size_t not bus_addr_t
Message-ID:  <202405221455.44MEtdEn052843@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by rlibby:

URL: https://cgit.FreeBSD.org/src/commit/?id=bea2bf458d2cc030e97fd7b9c210b3ee97ee8d79

commit bea2bf458d2cc030e97fd7b9c210b3ee97ee8d79
Author:     Ryan Libby <rlibby@FreeBSD.org>
AuthorDate: 2024-05-22 14:55:04 +0000
Commit:     Ryan Libby <rlibby@FreeBSD.org>
CommitDate: 2024-05-22 14:55:04 +0000

    tpm_if.m: declare bus addresses as bus_size_t not bus_addr_t
    
    Do like bus_space(9) does.  This fixes the build on platforms where
    bus_addr_t and bus_size_t are different (like i386 PAE).
    
    Reviewed by:    jhibbits
    Fixes:          c2e9c5bbf022 tpm: Refactor TIS and add a SPI attachment
    Differential Revision:  https://reviews.freebsd.org/D45287
---
 sys/dev/tpm/tpm_bus.c |  2 +-
 sys/dev/tpm/tpm_if.m  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/dev/tpm/tpm_bus.c b/sys/dev/tpm/tpm_bus.c
index f0d3c26c33f1..6e2cc5d81cb6 100644
--- a/sys/dev/tpm/tpm_bus.c
+++ b/sys/dev/tpm/tpm_bus.c
@@ -77,7 +77,7 @@ tpm_write_4(device_t dev, bus_size_t off, uint32_t val)
 }
 
 static void
-tpm_write_barrier(device_t dev, bus_addr_t off, bus_size_t length)
+tpm_write_barrier(device_t dev, bus_size_t off, bus_size_t length)
 {
 	struct tpm_sc *sc = device_get_softc(dev);
 
diff --git a/sys/dev/tpm/tpm_if.m b/sys/dev/tpm/tpm_if.m
index 2b6afe22f3e8..b0149ba163a6 100644
--- a/sys/dev/tpm/tpm_if.m
+++ b/sys/dev/tpm/tpm_if.m
@@ -41,7 +41,7 @@ METHOD int transmit {
 
 METHOD uint64_t read_8 {
 	device_t dev;
-	bus_addr_t addr;
+	bus_size_t addr;
 }
 
 #
@@ -49,28 +49,28 @@ METHOD uint64_t read_8 {
 #
 METHOD uint32_t read_4 {
 	device_t dev;
-	bus_addr_t addr;
+	bus_size_t addr;
 };
 
 METHOD uint8_t read_1 {
 	device_t dev;
-	bus_addr_t addr;
+	bus_size_t addr;
 };
 
 METHOD void write_4 {
 	device_t dev;
-	bus_addr_t addr;
+	bus_size_t addr;
 	uint32_t value;
 };
 
 METHOD void write_1 {
 	device_t dev;
-	bus_addr_t addr;
+	bus_size_t addr;
 	uint8_t value;
 };
 
 METHOD void write_barrier {
 	device_t dev;
-	bus_addr_t off;
+	bus_size_t off;
 	bus_size_t length;
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405221455.44MEtdEn052843>