From owner-dev-commits-src-all@freebsd.org Fri Feb 5 19:10:32 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 E0B0F54F4E7 for ; Fri, 5 Feb 2021 19:10:32 +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 4DXQ3r64SWz3vhX; Fri, 5 Feb 2021 19:10:32 +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 C37CF23F0D; Fri, 5 Feb 2021 19:10:32 +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 115JAWi1027863; Fri, 5 Feb 2021 19:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 115JAWJH027862; Fri, 5 Feb 2021 19:10:32 GMT (envelope-from git) Date: Fri, 5 Feb 2021 19:10:32 GMT Message-Id: <202102051910.115JAWJH027862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: b94f25eb626f - releng/13.0 - mrsas: unbreak i386 build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: b94f25eb626fadba144e9b9e8d08b83ba22134d7 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: Fri, 05 Feb 2021 19:10:32 -0000 The branch releng/13.0 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=b94f25eb626fadba144e9b9e8d08b83ba22134d7 commit b94f25eb626fadba144e9b9e8d08b83ba22134d7 Author: Alfredo Dal'Ava Junior AuthorDate: 2021-02-05 18:43:48 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2021-02-05 22:07:28 +0000 mrsas: unbreak i386 build Fix build regression introduced by e34a057ca6ebdf8e30ec8b0dc21d18eb450bf36a Approved by: re (gjb) Reviewed by: jhibbits Sponsored by: Eldorado Research Institute (eldorado.org.br) Differential Revision: https://reviews.freebsd.org/D28494 (cherry picked from commit 59fffbcf46ba6369420e655ff9173571410c643d) (cherry picked from commit 6bf9668d9d02bdf3e0dafc4ba1010ef6a9b12247) --- sys/dev/mrsas/mrsas.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index f4c34e237fc4..01173387c8d4 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -2782,9 +2782,7 @@ mrsas_ioc_init(struct mrsas_softc *sc) init_frame->queue_info_new_phys_addr_lo = htole32(phys_addr); init_frame->data_xfer_len = htole32(sizeof(Mpi2IOCInitRequest_t)); - req_desc.addr.u.low = htole32((bus_addr_t)sc->ioc_init_phys_mem & 0xFFFFFFFF); - req_desc.addr.u.high = htole32((bus_addr_t)sc->ioc_init_phys_mem >> 32); - + req_desc.addr.Words = htole64((bus_addr_t)sc->ioc_init_phys_mem); req_desc.MFAIo.RequestFlags = (MRSAS_REQ_DESCRIPT_FLAGS_MFA << MRSAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);