From nobody Wed Sep 04 13:56:39 2024 X-Original-To: dev-commits-src-all@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 4WzPDR3R9Gz5TwwV; Wed, 04 Sep 2024 13:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzPDR2tLmz45Hs; Wed, 4 Sep 2024 13:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725458199; 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=xdpoFKdAscKqrqktehkoFYobckHzBz8ROd/b/TQ2aiA=; b=qplPFgI57zzWb/OzJ+nZNBX3yUd4Q//KojPVHJMBnG1u243ndAPpdQMv/ZymDhM9Ged7RY GqnfLuTHXYhSlPBbzxoUxc6PIJj2EuZQhxqNpXYAcSIr0uIbaezS/+aI+dTW+T3bzKGVF8 DdyhTQz38yxrZ9ZU9fqX0hxPl42XQtMnP3zq4Rvtq42mOku3S5i3i210zJOG3vsmeeGfdu y8odj2CplfwTf7y9v6+oxXZkxYDC39PXxoExpsMYp32p+0BwirPfp1pmngCsOjmXwRThBR XF9W73v+OP/RkWsPS0/9DvNi0A39Gv4xoZ3hHwSUDr3pZa3SxKKk0eJlZzSOyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725458199; a=rsa-sha256; cv=none; b=DiZ4tQ2XtfIcQUVXFJu0wqbC8E7eiH4xJ3DGMJpV5xTgmxRueioF/++tkfIftyC+rNRmOl xWLEwj5qLde9QnwDI7zxOWvyq5/FQo0c+4TKK3zDO4KTKv5bbzxTIy0/zuhkNv9pKt9IRM SHTeVNDliXj1BmX22H3vAj8SWcL87BASCx8R1V97mPw5U0F6jDdgjLydysKQfQb1rJStfo in1mfS+3wlW58Ms/K1waTe6Hj+NbMQFNfMJ8YJrneJ6BqogZSkKiolq2HLCqgaTNH8qVoA oS6hz5cdr3cMGre49E4e3VcAeBQWOxzAvw92PXkJzlb3L+j98Yn7qinGt7bSdg== 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=1725458199; 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=xdpoFKdAscKqrqktehkoFYobckHzBz8ROd/b/TQ2aiA=; b=AQ0xxyiex0TIjIWdXC66l/FrDjeOapi0KFkbQfQjU62xcmqJvEiWKaF9OU0mQV7uckEL+T 7ukRqfwLIg2MiFGC5fbDoNpv/WGol4TUnpSupdULrNhGBVg41vor7eK1DKvbNfn33gYhnd jletSfxy0Y5HM17VO6O4yCixmTHAyofdZQSsH5X1gzBmf6NQ9IaCibgPTd0Ke8wZvXPqE0 KpLRyoVtiYAKJRqDKnRYN8Q5Lbt2svdTWfT4WCfIgmooPy/fqUBEz9O/skqm7HIuFW9dqh rJTPiw2g20l2gkeGJndL9XhDnFFPYq8HROHA7u2ZS+SinuJ6grlBRMkSR0R6OQ== 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 4WzPDR2TF3zRZB; Wed, 4 Sep 2024 13:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484DudZp014561; Wed, 4 Sep 2024 13:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484DudX6014558; Wed, 4 Sep 2024 13:56:39 GMT (envelope-from git) Date: Wed, 4 Sep 2024 13:56:39 GMT Message-Id: <202409041356.484DudX6014558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fcef359272fd - main - uart: Use uintptr_t instead of vm_offset_t for pointer arithmetic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcef359272fdda27eef770a512b15bb40232cbd2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fcef359272fdda27eef770a512b15bb40232cbd2 commit fcef359272fdda27eef770a512b15bb40232cbd2 Author: John Baldwin AuthorDate: 2024-09-04 13:56:21 +0000 Commit: John Baldwin CommitDate: 2024-09-04 13:56:21 +0000 uart: Use uintptr_t instead of vm_offset_t for pointer arithmetic Reviewed by: imp Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D46490 --- sys/dev/uart/uart_cpu_acpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c index 53fe459e64a1..7892437e11de 100644 --- a/sys/dev/uart/uart_cpu_acpi.c +++ b/sys/dev/uart/uart_cpu_acpi.c @@ -235,10 +235,10 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di) error = ENXIO; - dbg2_dev = (ACPI_DBG2_DEVICE *)((vm_offset_t)dbg2 + dbg2->InfoOffset); + dbg2_dev = (ACPI_DBG2_DEVICE *)((uintptr_t)dbg2 + dbg2->InfoOffset); found = false; - while ((vm_offset_t)dbg2_dev + dbg2_dev->Length <= - (vm_offset_t)dbg2 + dbg2->Header.Length) { + while ((uintptr_t)dbg2_dev + dbg2_dev->Length <= + (uintptr_t)dbg2 + dbg2->Header.Length) { if (dbg2_dev->PortType != ACPI_DBG2_SERIAL_PORT) goto next; @@ -252,7 +252,7 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di) class = cd->cd_class; base_address = (ACPI_GENERIC_ADDRESS *) - ((vm_offset_t)dbg2_dev + dbg2_dev->BaseAddressOffset); + ((uintptr_t)dbg2_dev + dbg2_dev->BaseAddressOffset); error = uart_cpu_acpi_init_devinfo(di, class, base_address); if (error == 0) { @@ -262,7 +262,7 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di) next: dbg2_dev = (ACPI_DBG2_DEVICE *) - ((vm_offset_t)dbg2_dev + dbg2_dev->Length); + ((uintptr_t)dbg2_dev + dbg2_dev->Length); } if (!found) goto out;