From nobody Mon Aug 29 07:16:13 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 4MGMDd59d8z4bTZW for ; Mon, 29 Aug 2022 07:16:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 4MGMDc5ZNzz3cml for ; Mon, 29 Aug 2022 07:16:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f52.google.com with SMTP id m16so8965995wru.9 for ; Mon, 29 Aug 2022 00:16:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc; bh=yHdZ16TgZRAvOzWsr+26YbcaOaObfiDq6HVUFC9VD5g=; b=R8ZPuDGluXONw0hmAHCEwOP54FeLMXvSY69hcFKvZIXRyUWcNp3tjkFqc26D8gtw5e T4m6BTzmZ2nDW8NEDNcKjda9zqOrl5T/Nn8o+YRJ5RQlAc18b2InOzWLSvb1MdAZCRSG AuS1IaO6XliQJT2gPNHFTkWi03jIJ4yX0KrC3oTiV1tcEFTLJWXnh12jAXzBnrYmW1c/ yN2tb2fI0N1Tayum0gtjgQcdBjezy+aaHxLvm9XEE4GjdVj5EQZ2f1yc0Xf++UIzggTZ 2HX0jY4mUWICo2q3kPVa06PAwRWQRgX3KX/Fj9R+8uurAWZpHLLYsn/0Y3wLatPQq00C TqTA== X-Gm-Message-State: ACgBeo153tJX7jNh0T8M/zZAw1rLWO+KxSn06vwGV5+k4dL9D5/LdWb3 dtV2RK7ZLyuaWc3wdnFVjTQhSA== X-Google-Smtp-Source: AA6agR7HFsQpC9dkM9VylgawRfLXUoqcWP4B6dc2K2spJCvJij+YxDzmX2IzuHrk+5nwIbjpgJMgiw== X-Received: by 2002:adf:d1c9:0:b0:225:f98:d602 with SMTP id b9-20020adfd1c9000000b002250f98d602mr5625258wrd.419.1661757374800; Mon, 29 Aug 2022 00:16:14 -0700 (PDT) Received: from smtpclient.apple (global-5-141.n-2.net.cam.ac.uk. [131.111.5.141]) by smtp.gmail.com with ESMTPSA id v20-20020a05600c15d400b003a331c6bffdsm7547600wmf.47.2022.08.29.00.16.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Aug 2022 00:16:13 -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: 9e772f203ff2 - main - mana: Fix a couple i386 build errors From: Jessica Clarke In-Reply-To: <202208290635.27T6Zheu028340@gitrepo.freebsd.org> Date: Mon, 29 Aug 2022 08:16:13 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <97404B30-E8BD-4194-8134-B488C0151287@freebsd.org> References: <202208290635.27T6Zheu028340@gitrepo.freebsd.org> To: Wei Hu X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4MGMDc5ZNzz3cml 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.52 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.52:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.52:from] X-ThisMailContainsUnwantedMimeParts: N On 29 Aug 2022, at 07:35, Wei Hu wrote: >=20 > The branch main has been updated by whu: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9e772f203ff2bd296d8ef234681b6db5= d43c7582 >=20 > commit 9e772f203ff2bd296d8ef234681b6db5d43c7582 > Author: Wei Hu > AuthorDate: 2022-08-29 06:30:49 +0000 > Commit: Wei Hu > CommitDate: 2022-08-29 06:35:02 +0000 >=20 > mana: Fix a couple i386 build errors >=20 > Fix a couple i386 build errors >=20 > Fixes: b685df314f138 > Sponsored by: Microsoft > --- > sys/dev/mana/mana_en.c | 6 ++++++ > 1 file changed, 6 insertions(+) >=20 > diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c > index e504df1c8a8d..5e5e3939753f 100644 > --- a/sys/dev/mana/mana_en.c > +++ b/sys/dev/mana/mana_en.c > @@ -1054,8 +1054,11 @@ mana_cfg_vport(struct mana_port_context *apc, = uint32_t protection_dom_id, > apc->tx_shortform_allowed =3D resp.short_form_allowed; > apc->tx_vp_offset =3D resp.tx_vport_offset; >=20 > +#if defined(__amd64__) > if_printf(apc->ndev, "Configured vPort %lu PD %u DB %u\n", > apc->port_handle, protection_dom_id, doorbell_pg_id); > +#endif > + > out: > if (err) > mana_uncfg_vport(apc); > @@ -1124,8 +1127,11 @@ mana_cfg_vport_steering(struct = mana_port_context *apc, > err =3D EPROTO; > } >=20 > +#if defined(__amd64__) > if_printf(ndev, "Configured steering vPort %lu entries %u\n", > apc->port_handle, num_entries); > +#endif > + > out: > free(req, M_DEVBUF); > return err; This is highly dubious. Why not fix the code to work for 32-bit? It seems the only problem is port_handle is a uint64_t not unsigned long, so you either need to use PRIu64 or cast to something like uintmax_t and use %ju. Just closing your eyes and ifdef=E2=80=99ing out printfs = for i386 isn=E2=80=99t the right approach. Jess