From nobody Wed May 22 14:55:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VkvVz2sxTz5LrHB; Wed, 22 May 2024 14:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VkvVz2Ck7z4LrD; Wed, 22 May 2024 14:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716389739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJv/pwv9xGi2q5Gkt4Czp3DBUlGy6aZTRt3yr2bGeN4=; b=U4yiTUn53mo8vb4QKsh9lxzBd3jDbL9emRdr2K9ow3kmvISDNlPlaT6imLzSywfLmoJ+Je leQQP9E4vBP8AqNWaku3IhFz8AMbYixapY1H8P9FQoN50zarACSBFFV7G4S86yIhsgQEpf qc8NMLjXAsVS3pZIFauX0yWfcViyy92X+9jgIt3u2OkUa7D/fZcb1E0g+ouUfqB4Bo/QSv jNlJY0TjYhmFT0tYBu6k8ofTX1lfccaYeXhPLrBIA+rs8XKwGcyaWYIkkIC6aHHxNnWzQ2 ZwlK0OtWcwMpoNbpuz/fkSmFTORrkS/SnZ9qToQgT8HnM5+PZaseQ0BPxvqCWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716389739; a=rsa-sha256; cv=none; b=OTAlCKAQEVVRvJE5ArTSWRJpSRmt4zlXRnQ9RhVuSGftO0T3xHBXxKqct/DK+OBX1wIzqG 8SosncfFnfKkhh2o1q6li/MfY0ZUZBuB0zxWdB6ZVnC1E7CBbuGMDqTKyYBnq6A7/Q9hPi KIxs41uIjZu7PnVQiBGuna9quh+g/m4aakfXKjOtVBCnypKWtSytezr6QHzzDN4R+klwNT fvI+qWK0a/DhQNySphIgCl6hX7W1PXKPx5vHHXhOtL9yBnejGJhvWldWLwNtR5kPW/ys4/ jm9iVSxqynUh+CXKC4/hDjCSDI7/rhIj0CYFmnXhTB4R5EMxlBHUrClAJnuljg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716389739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJv/pwv9xGi2q5Gkt4Czp3DBUlGy6aZTRt3yr2bGeN4=; b=qVrg8v23z3TlFo0jUKEUYGepUbTQIrCDXjPemLdMJRDOnFr6adIxl3DSYBGp7lWA+3Q+Kj +asqT3dbXPkmss8ZZ/xGwsImoGwRkl94Xfk2rPeO5/sbU0l4nD895vLfKMUfccOufBXx/X mjRP5shJmPJfpQaG3R7xRVkXIQlDjbkhGVcFVbaCJvmpf8EFh0FQ6LQtQr66wXAXp1/HyW iySFJKNX1ugtobUCvxPZalpT95mWpLEVclTckOjx+flOfOCxORZMws1a6cI6xTUME2AQp6 kFLyrv+eDa7UoRBjumR87gJ556SRF5jHXjq18wPrP5cexIkhbO6sBHIQbdZ+cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VkvVz1jVdz17wh; Wed, 22 May 2024 14:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MEtdDW052846; Wed, 22 May 2024 14:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MEtdEn052843; Wed, 22 May 2024 14:55:39 GMT (envelope-from git) Date: Wed, 22 May 2024 14:55:39 GMT Message-Id: <202405221455.44MEtdEn052843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: bea2bf458d2c - main - tpm_if.m: declare bus addresses as bus_size_t not bus_addr_t List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bea2bf458d2cc030e97fd7b9c210b3ee97ee8d79 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=bea2bf458d2cc030e97fd7b9c210b3ee97ee8d79 commit bea2bf458d2cc030e97fd7b9c210b3ee97ee8d79 Author: Ryan Libby AuthorDate: 2024-05-22 14:55:04 +0000 Commit: Ryan Libby 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; }