From nobody Wed Sep 28 21:06:38 2022 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 4Md8Dt4VDtz4V4bL; Wed, 28 Sep 2022 21:06:38 +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 4Md8Dt3yw1z3CwW; Wed, 28 Sep 2022 21:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664399198; 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=a0ElKoSXJ2ToI7JhdkeCAp5RnvhpBO5exQiigQFlpko=; b=F0ZOCA/yn742xPZIbms8Mihkgzeyog6ZbpAcKErdqQXeZkPa7uSQ7cBPFFNlSZmVpbj/WP wtsSnfMom+FFBnrL4BfVOunvoFM2vVKMwHqvrAKhvJWzGbUxXnNdarkwjxdJM0hozrCYNC DVGouE6XeemFmBOmArxDEFEgwhk7oZIZ71CNWON/KxZuVErdXJQJpVOsgyPlMCCoX1QQwE bZzUpbjM09+3YUGy4sYabs0WVeCQFFd+BkAHyX14ZBQ9rn1nm0A9UMED2yX94aWinV4TkQ HS/6+6P0yscqBxFI++AcZwR5lDs2ZcTMx9EhWby8HZ7pcNfbFzeqqBKjSGwycg== 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 4Md8Dt2znxzbhP; Wed, 28 Sep 2022 21:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28SL6cE4037363; Wed, 28 Sep 2022 21:06:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28SL6cNO037362; Wed, 28 Sep 2022 21:06:38 GMT (envelope-from git) Date: Wed, 28 Sep 2022 21:06:38 GMT Message-Id: <202209282106.28SL6cNO037362@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: 124e46735e07 - main - ntb: Use uintmax_t casts and %j to print physical addresses. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 124e46735e07037afafbf0caa097faafb09c7329 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664399198; 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=a0ElKoSXJ2ToI7JhdkeCAp5RnvhpBO5exQiigQFlpko=; b=iTOhxVmEPJ8ojlCLnGQ/1ryfIOc311Xn+4dzA4IwcV8/jTa6Z/1uK6MQzJDtkIzPkrZ3vK PU0piT0dwQFxBgUDJ6lyQm62JCc6SU0nxzcvPf7GcWQI2XU8vQknTsncRU5ioNl5p3YDuO guX0ldfVXydsjccN/2+C2nycC9wScI+wy7gDYaQb0dofEqCGf4V28yN+cR/8GmNJz3bk6h 1wLQkqlDRJmKZrnz11WfrlOLenXhn9bfCwNkmBu0RwGZ7UsE/Wnr3LTiD7L3ijdJonE7pw DLHksQW5UaAzDQ1bEl+7tepz4QBi0hd3lGJ3QS+aVekZqmEjHHocg8uI/z/E3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664399198; a=rsa-sha256; cv=none; b=RrjO12x6O2yxl+G8MvfBYBH1aixE6SyBF/Xp9gvsTJCLaQdTBvmdHaLRT5jcPyg7pnundo BWs3V5QRrKqGJUR8RuxqFRnrx2pOYzAOBNd0JV4GpM8XEINrUfJq2rSWcLbAo7hdHQ1DOj TDJWYurVyjsBoBAk4ePrxffmG55DhiAOCSd3XMA1qvdNe8x8xqoECHRTv2kRTCvF2n8IaR WCKh5wQAdqrsFdQIBc2NdSzz3sTnive0a3VQwCvs2a9RAjfrMAXRoY9D3NedJjQFpVr1Cp OH6QkDtpXSuQ2blwNdtOIpYI/UHHIXOHQCvBA2jB57Jo7I4vIdS8gKk1NNKvTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=124e46735e07037afafbf0caa097faafb09c7329 commit 124e46735e07037afafbf0caa097faafb09c7329 Author: John Baldwin AuthorDate: 2022-09-28 20:56:31 +0000 Commit: John Baldwin CommitDate: 2022-09-28 20:56:31 +0000 ntb: Use uintmax_t casts and %j to print physical addresses. This fixes -Wint-to-pointer-cast errors with GCC when compiling on i386 where physical addresses are not the same size as pointers. Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D36751 --- sys/dev/ntb/ntb_hw/ntb_hw_amd.c | 6 +++--- sys/dev/ntb/ntb_hw/ntb_hw_intel.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c index 94cfba2bfe72..eef4f7ca463a 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c @@ -1112,10 +1112,10 @@ static void print_map_success(struct amd_ntb_softc *ntb, struct amd_ntb_pci_bar_info *bar, const char *kind) { - amd_ntb_printf(0, "Mapped BAR%d v:[%p-%p] p:[%p-%p] (0x%jx bytes) (%s)\n", + amd_ntb_printf(0, "Mapped BAR%d v:[%p-%p] p:[0x%jx-0x%jx] (0x%jx bytes) (%s)\n", PCI_RID2BAR(bar->pci_resource_id), bar->vbase, - (char *)bar->vbase + bar->size - 1, (void *)bar->pbase, - (void *)(bar->pbase + bar->size - 1), (uintmax_t)bar->size, kind); + (char *)bar->vbase + bar->size - 1, (uintmax_t)bar->pbase, + (uintmax_t)(bar->pbase + bar->size - 1), (uintmax_t)bar->size, kind); } static void diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c index 774bb14fea0f..a6c71935665b 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c @@ -925,10 +925,10 @@ print_map_success(struct ntb_softc *ntb, struct ntb_pci_bar_info *bar, { device_printf(ntb->device, - "Mapped BAR%d v:[%p-%p] p:[%p-%p] (0x%jx bytes) (%s)\n", + "Mapped BAR%d v:[%p-%p] p:[0x%jx-0x%jx] (0x%jx bytes) (%s)\n", PCI_RID2BAR(bar->pci_resource_id), bar->vbase, (char *)bar->vbase + bar->size - 1, - (void *)bar->pbase, (void *)(bar->pbase + bar->size - 1), + (uintmax_t)bar->pbase, (uintmax_t)(bar->pbase + bar->size - 1), (uintmax_t)bar->size, kind); } @@ -1012,19 +1012,21 @@ map_memory_window_bar(struct ntb_softc *ntb, struct ntb_pci_bar_info *bar) if (rc == 0) { bar->map_mode = mapmode; device_printf(ntb->device, - "Marked BAR%d v:[%p-%p] p:[%p-%p] as " + "Marked BAR%d v:[%p-%p] p:[0x%jx-0x%jx] as " "%s.\n", PCI_RID2BAR(bar->pci_resource_id), bar->vbase, (char *)bar->vbase + bar->size - 1, - (void *)bar->pbase, (void *)(bar->pbase + bar->size - 1), + (uintmax_t)bar->pbase, + (uintmax_t)(bar->pbase + bar->size - 1), intel_ntb_vm_memattr_to_str(mapmode)); } else device_printf(ntb->device, - "Unable to mark BAR%d v:[%p-%p] p:[%p-%p] as " + "Unable to mark BAR%d v:[%p-%p] p:[0x%jx-0x%jx] as " "%s: %d\n", PCI_RID2BAR(bar->pci_resource_id), bar->vbase, (char *)bar->vbase + bar->size - 1, - (void *)bar->pbase, (void *)(bar->pbase + bar->size - 1), + (uintmax_t)bar->pbase, + (uintmax_t)(bar->pbase + bar->size - 1), intel_ntb_vm_memattr_to_str(mapmode), rc); /* Proceed anyway */ return (0);