From nobody Sat Nov 5 02:45:18 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 4N420p2rpkz4hRPs; Sat, 5 Nov 2022 02:45:30 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N420p2NLDz3Xc6; Sat, 5 Nov 2022 02:45:30 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667616330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qi+aSzdzlvILw7oPi0thpu/Zf/FrWPciYaYDgXa/7iU=; b=mkIw+HaL7VQyeyjT/bTEZQ4OmVnzRiMEjwNP0MB+jQmvrWzJ1mwBoHbKtXEigct51nbcYU CqEcbl2sMvDaXcmgfAY2i4wvrgI2F9EcYBg6QfyVOQQOC8V2m6kTd7w+bgzH0t+Wgunjc7 gZmNObvenGTaIwV7WWZhrvXUZ+QsQLiKO/TFpX6PV5t5AczKZVtwLTJP7CK/DcgnM+v3ps J5YoX8wzY593Me66chtP89JjVROzMzDjYdXwUyC6NHIc8dosGRKoFb1rk/bnhpMmnDAoya 2u7fQmLnZPT9sWwUIguXhrgeWhYsXxAMZEdjqmyfl0D6MliHWGLtgqY0qJnFww== Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4N420p1Hrsz1RkG; Sat, 5 Nov 2022 02:45:30 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f46.google.com with SMTP id ml12so4666040qvb.0; Fri, 04 Nov 2022 19:45:30 -0700 (PDT) X-Gm-Message-State: ACrzQf34wTWVe9nUAYni5guXyefX9sLkt1Qm71J1iUwm9hKATtbgK5B2 vuTpafE/vpaBQF3rLUwC0Q3stSpE47F7PrJXI20= X-Google-Smtp-Source: AMsMyM6IjogTbWPLsaRgPLkzSGRVhYnksRwYslGz4G0ZAAG0fB1juapCa75cH60baBT7bZj+COJyKp+moYjqAA2mqLE= X-Received: by 2002:a05:6214:5609:b0:4bb:cbc5:fe76 with SMTP id mg9-20020a056214560900b004bbcbc5fe76mr32775668qvb.78.1667616329196; Fri, 04 Nov 2022 19:45:29 -0700 (PDT) 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 References: <202211042255.2A4Mtxr8032843@gitrepo.freebsd.org> In-Reply-To: <202211042255.2A4Mtxr8032843@gitrepo.freebsd.org> From: Kyle Evans Date: Fri, 4 Nov 2022 21:45:18 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 75217c2b4700 - main - bnxt: Only build on 64-bit platforms To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667616330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qi+aSzdzlvILw7oPi0thpu/Zf/FrWPciYaYDgXa/7iU=; b=EdYnCa64BsM0h0y9XxPfpPJX+ee5U3sigO4hINIcAa2xUZ92EzCkvvuIA3ZCgY3nh0EqZq TwrK7xBdb/xPNHJayxzJNODJQUQjCZSbbE/DNuB0TnJIBQ8GOjKbM5ffXLpZ9rcUBpkME+ /iW4V3gasgvuScXoOTrBcToRw2w+rot7pk9fmlA5F+WFRnctJzQPV7vVnaLEFi+hpvquWz lO+4BtVM+tEQIiMFpdWMbgCZEStdS92Ue4YRCqRzc/CfvpZXHyoWTQJ1JvULTSMDhGlN0N g9do2cPX7ONGblSCuN78K9GcSjqeJHSktMUzeRl0rn0gwM/pqAsYxaUu33FPgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667616330; a=rsa-sha256; cv=none; b=PcyOVHwO4D+rPHfwrV3aq4lDg9fiKPiuOyz1/z+mV2T0T2PUK24wUY4L4xjJ2zCyWVFS8N jxixV7UzSO5Cnt4BMoyIKsFRLnTJeD2Cv2+zH4CH1/uT+YTbzvcuj2hgnsQe0rmLQzcf1Q HHTwwTW162y5hXTDYNk6170fb8rbAXguXvb0DNFhqXJqYJv6Ssnfp9efKdSCUZRplU95hB HXHQYCIhDEuvTc8CjzXffXEfD7F9eIeTSupfMWIcrlAyosaH8F++UoaRaKMIrtTqNkii/g yTIafY4+ZKLTZYMkqTtzRBJRojfMYBPZQ0AjUXaSxD9RkTLlRTM96j4DZHZIEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Fri, Nov 4, 2022 at 5:56 PM Warner Losh wrote: > > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=75217c2b4700a1954971b1ec3722c39dd934e287 > > commit 75217c2b4700a1954971b1ec3722c39dd934e287 > Author: Warner Losh > AuthorDate: 2022-11-04 22:49:10 +0000 > Commit: Warner Losh > CommitDate: 2022-11-04 22:49:10 +0000 > > bnxt: Only build on 64-bit platforms > > The driver uses bus_space_read_8 and friends, which do not exist on > 32-bit i386 and break the build. > > Sponsored by: Netflix > --- > sys/modules/Makefile | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 3a009f071cab..091fa7543164 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile [ ... skip ...] > @@ -424,6 +424,12 @@ SUBDIR+= dtrace > SUBDIR+= opensolaris > .endif > > +# Requires bus_space_read_8 > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || \ > + ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le" > +_bnxt= bnxt > +.endif > + > .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) > .if exists(${SRCTOP}/sys/opencrypto) > _crypto= crypto It looks like i386 really is the outlier here, any reason not to do this instead? (minor build fix for 32-bit platforms included, I test-built armv6, armv7, powerpc) diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index c362e01a1f8b..28e4ef7201ff 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -1483,7 +1483,7 @@ bnxt_hwrm_l2_filter_alloc(struct bnxt_softc *softc, uint16_t vlan_tag, if (*filter_id != -1) { device_printf(softc->dev, "Attempt to re-allocate l2 ctx " - "filter (fid: 0x%lx)\n", *filter_id); + "filter (fid: 0x%jx)\n", (uintmax_t)*filter_id); return EDOOFUS; } diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 091fa7543164..bd55beb316fc 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -425,8 +425,7 @@ SUBDIR+= opensolaris .endif # Requires bus_space_read_8 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || \ - ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le" +.if ${MACHINE_ARCH} == "i386" _bnxt= bnxt .endif Thanks, Kyle Evans