From nobody Wed May 25 02:01:31 2022 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 B90641B5530E for ; Wed, 25 May 2022 02:01:40 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L7Dnv6RHrz4cBk for ; Wed, 25 May 2022 02:01:39 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f54.google.com with SMTP id k30so28092080wrd.5 for ; Tue, 24 May 2022 19:01:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=dN8+9j+enZpbz8FbyTOqejgD6xTEe9JwvMPqql6imo4=; b=IO5NGxE3XIaV0pyAPXSMUW8ABRRCZ6I3QsRoTFlJ7NLMc17jNeF0UQ3zj+h//mQCp9 8wOL7MAFaLcpRMdG5FsTNJXrSygOeDoZmPF4fZZRHV64kCIomxNUKD2tH8lfD58vdWBR woH2gXx2EdE4uZLLKKJiWXXZjyqAIfoX7Of2EivjJfGowi1B0pWUczD6DexXm6iOSDPy zJtXhJXYDQ7LuTwIA/7S9cpyTZveabVBova4UvPlxiglRkK/vSEeqGvp68aGIMlNpu1F GIrISQSrOTbF1oN3tScuxiw2BdsMOpllBaKVnBnURcpIPpCBhPCPsPbpTa4BtMyre39X zfyw== X-Gm-Message-State: AOAM533xWhtPAtchQfgOtNlaR/3jsAMpuS7d/yizJfz68GDnadjdJCWO BM7zKY8gJ0iyrkzDFzLCZKY3Pw== X-Google-Smtp-Source: ABdhPJz5NYMH9uXsVnu1yoeaF141XAAdlgR3Oln2VM/siXtnEbu5JvilCMIGgsMQQvp6RpKHb6yDNg== X-Received: by 2002:a5d:424f:0:b0:20d:11cf:caeb with SMTP id s15-20020a5d424f000000b0020d11cfcaebmr25440629wrr.173.1653444092837; Tue, 24 May 2022 19:01:32 -0700 (PDT) Received: from smtpclient.apple (global-5-141.nat-2.net.cam.ac.uk. [131.111.5.141]) by smtp.gmail.com with ESMTPSA id e12-20020a056000178c00b0020c5253d8besm798871wrg.10.2022.05.24.19.01.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2022 19:01:32 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.80.82.1.1\)) Subject: Re: git: e602a30bb9fc - main - irdma(4): Fix compile error on powerpc64 From: Jessica Clarke In-Reply-To: <202205250030.24P0UqLa029123@gitrepo.freebsd.org> Date: Tue, 24 May 2022 20:01:31 -0600 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <2BC7CBC1-6A6A-4D89-9A26-98EF76539EEA@freebsd.org> References: <202205250030.24P0UqLa029123@gitrepo.freebsd.org> To: Eric Joyner X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4L7Dnv6RHrz4cBk X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-0.997]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.54:from]; MLMMJ_DEST(0.00)[dev-commits-src-all]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.54:from]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 25 May 2022, at 01:30, Eric Joyner wrote: >=20 > The branch main has been updated by erj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3De602a30bb9fc7ee041a0e629d0fd2db7= 933ffa32 >=20 > commit e602a30bb9fc7ee041a0e629d0fd2db7933ffa32 > Author: Eric Joyner > AuthorDate: 2022-05-25 00:27:29 +0000 > Commit: Eric Joyner > CommitDate: 2022-05-25 00:30:46 +0000 >=20 > irdma(4): Fix compile error on powerpc64 >=20 > Jenkins reports that the type used in a printf() specifier is > incorrect, so fix it in order to use the appropriate type. >=20 > Signed-off-by: Eric Joyner >=20 > Reported by: Jenkins CI > MFC after: 6 days > MFC-with: cdcd52d41e246ba1c0fcfad0769bd691487355ef > Sponsored by: Intel Corporation > --- > sys/dev/irdma/icrdma.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/sys/dev/irdma/icrdma.c b/sys/dev/irdma/icrdma.c > index 7cf441b37648..6867274d1cb8 100644 > --- a/sys/dev/irdma/icrdma.c > +++ b/sys/dev/irdma/icrdma.c > @@ -499,7 +499,7 @@ irdma_probe(struct ice_rdma_peer *peer) > struct irdma_handler *hdl; > int err =3D 0; >=20 > - irdma_pr_info("probe: irdma-%s peer=3D%p, peer->pf_id=3D%d, = peer->ifp=3D%p, peer->ifp->if_dunit=3D%d, = peer->pci_mem->r_bustag=3D%lx\n", > + irdma_pr_info("probe: irdma-%s peer=3D%p, peer->pf_id=3D%d, = peer->ifp=3D%p, peer->ifp->if_dunit=3D%d, peer->pci_mem->r_bustag=3D%p\n",= > irdma_driver_version, peer, peer->pf_id, = peer->ifp, > pf_if_d(peer), peer->pci_mem->r_bustag); It=E2=80=99s an int on i386, a uint64_t on amd64 and a struct bus_space = * on all other architectures, so this just trades breaking non-x86 for breaking x86. You probably want something like (void *)(uintptr_t)peer->pci_mem->r_bustag as something that=E2=80=99ll work everywhere, that or take it the other direction and forcefully cast it down to an integer type and print that like (uintmax_t)(uintptr_t)peer->pci_mem->r_bustag with %jx or just (uintptr_t)peer->pci_mem->r_bustag with PRIxPTR, but we rarely use those macros. Jess