From nobody Sat Nov 05 02:46:00 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 4N421c1sXDz4hRjh; Sat, 5 Nov 2022 02:46:12 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4N421c1JvRz3YB2; Sat, 5 Nov 2022 02:46:12 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667616372; 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=8fvy3AZc3tsk9zWB7Xq2UbocDUeQ760/84NkBdsZi3Y=; b=l0+0lwSEMEx+aqFZ9WELm6SI1JCsM2F+Dmr8MxKdcG/VjoOW+7/P3cKUSWfvglAR5k19Uf mZ8WW81Gt/dO9kEI3vg3dimqYPCW8Hp+R7tYt2RQWa92enoU7mtjD+edQVccwQcp3XgN3h Qf1bTHAwlP1DQ2Fp1mxGuNeuYt+ssWtwzhnpZgSeoJFrx0nivZ26nwbhNLOOjPqI+5DRub DWJk737dqx1Uf1LKcswo16QkR7KukMiJG/gkYt7d3Ls2jKfPS4KA8srUYKZbsY5n+uAKTV jDfj7LTDSah/rOx9xdq4lpFOxnZnOPVQ6q7sW2hr6ZzjM1izRK+O1qY07RljDQ== Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 4N421c0MF3z1RkH; Sat, 5 Nov 2022 02:46:12 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f44.google.com with SMTP id e15so4640025qvo.4; Fri, 04 Nov 2022 19:46:12 -0700 (PDT) X-Gm-Message-State: ACrzQf2pkeCoIVYcwOdyqyJMuO6sX2qTWjTLlyc7VdseCXXQldE+5AeZ hWsG2blWS5AA1yCffX4qxD55VEX+hwvZT98DpUA= X-Google-Smtp-Source: AMsMyM6Bx2tkb9DDqDgrzdAxk+QuvHBUj56xUuwiJuhFDgqtBTiYV8xhiqfbbEAEhin3MhBVohr0MQKfJAPjAVCxr9o= X-Received: by 2002:a05:6214:c47:b0:4bb:b957:cd38 with SMTP id r7-20020a0562140c4700b004bbb957cd38mr35233329qvj.124.1667616371184; Fri, 04 Nov 2022 19:46:11 -0700 (PDT) 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 References: <202211042255.2A4Mtxr8032843@gitrepo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Fri, 4 Nov 2022 21:46:00 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 75217c2b4700 - main - bnxt: Only build on 64-bit platforms To: Kyle Evans Cc: Warner Losh , 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=1667616372; 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=8fvy3AZc3tsk9zWB7Xq2UbocDUeQ760/84NkBdsZi3Y=; b=h+sPnTr9Z4OAGh4gou4srYpPVHwYNZnXzze69YL/NYgrbJqeVildCXXnjeDOOf61c52KBD mXH+f4s3QEUZi4CivzMElLq80OpQeG0anvi0eoOBWtPBX/4yeLcscApo7WxcZNS3lOT25v 9yw6hsMYQ7zpMNA3c/3MwoETETb/7D8IInZ+eBlO7NDnrb1DjNPXdLootl1+MqCG5g5t0Q axuI7AqC9XKerZLmVFni/Zdtn5CaMMtcFX8ryMfl3FCGd48nvmapJxpnmyu5PywkaNgKlR bMnjNyq+xIRVbEQI5D/Ncn0/p4qc7vx66mr+5a0qW6LVRH6Nfey3HrVZfyw2QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667616372; a=rsa-sha256; cv=none; b=bD3tZoVH9anJaeWA45G5GuC0oHpJ7wCiDOda/yFQvSsyvK7bN46DG+AbRwMdnOU7TmjKtg KSZNnsNCUZq8afbWuPFDBpJGv/jT3djzkyc050YrW9U0tSZhNLpF30FOJUii/ch33eYblH lZt8lBTpQGLX5YiZd0em+vT8ckoj/id/LoOevlWZHcWOeY9AVGGW/FiLvl2Smk0O7xHiMZ WROhL2+YvKSpKd/NuHhhjGGNTKljDr5oLVmv6bGsuNMjzIcdLQScfaLoLcZVnsano+pPKX hKRcAXDlSoxYbT7jqE6XfFDcv9zxZnU9AQGV0wk1mzaXojvtSOAzycQAe98Mxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Fri, Nov 4, 2022 at 9:45 PM Kyle Evans wrote: > > 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 > Modulo the inverted conditional...