From owner-dev-commits-src-all@freebsd.org Thu Feb 25 01:35:57 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A488C5520A2; Thu, 25 Feb 2021 01:35:57 +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 4DmFjn4GdDz3CwJ; Thu, 25 Feb 2021 01:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 858086CB9; Thu, 25 Feb 2021 01:35:57 +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 11P1Zvr1045574; Thu, 25 Feb 2021 01:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11P1ZvhN045573; Thu, 25 Feb 2021 01:35:57 GMT (envelope-from git) Date: Thu, 25 Feb 2021 01:35:57 GMT Message-Id: <202102250135.11P1ZvhN045573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: ef567155d35f - main - Fix powerpc build after 6dd69f0064f1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef567155d35fd8f783d9b907e9a2765640a11527 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2021 01:35:57 -0000 The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=ef567155d35fd8f783d9b907e9a2765640a11527 commit ef567155d35fd8f783d9b907e9a2765640a11527 Author: Marcin Wojtas AuthorDate: 2021-02-25 01:29:33 +0000 Commit: Marcin Wojtas CommitDate: 2021-02-25 01:35:41 +0000 Fix powerpc build after 6dd69f0064f1 Commit 6dd69f0064f1 ("iflib: introduce isc_dma_width") failed to build on powerpc due to implicit type conversion error. Fix that. Submitted by: Artur Rojek Obtained from: Semihalf Sponsored by: Amazon, Inc. --- sys/net/iflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 6fd0ee3751f0..a7d5a8c24658 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1390,7 +1390,7 @@ _iflib_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err) } #define DMA_WIDTH_TO_BUS_LOWADDR(width) \ - (((width) == 0) || (width) == flsl(BUS_SPACE_MAXADDR) ? \ + (((width) == 0) || (width) == flsll(BUS_SPACE_MAXADDR) ? \ BUS_SPACE_MAXADDR : (1ULL << (width)) - 1ULL) int @@ -4761,7 +4761,7 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct _iflib_pre_assert(scctx); ctx->ifc_txrx = *scctx->isc_txrx; - MPASS(scctx->isc_dma_width <= flsl(BUS_SPACE_MAXADDR)); + MPASS(scctx->isc_dma_width <= flsll(BUS_SPACE_MAXADDR)); if (sctx->isc_flags & IFLIB_DRIVER_MEDIA) ctx->ifc_mediap = scctx->isc_media;