From owner-dev-commits-src-all@freebsd.org Fri Feb 5 16:56:02 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 6D12B54C7B4; Fri, 5 Feb 2021 16:56:02 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DXM4d5wx9z3ljc; Fri, 5 Feb 2021 16:56:01 +0000 (UTC) (envelope-from avg@FreeBSD.org) X-Originating-IP: 195.64.148.76 Received: from [192.168.0.88] (unknown [195.64.148.76]) (Authenticated sender: andriy.gapon@uabsd.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id E4D4DC0012; Fri, 5 Feb 2021 16:55:58 +0000 (UTC) Subject: Re: git: 6bf9668d9d02 - stable/13 - mrsas: unbreak i386 build To: Alfredo Dal'Ava Junior , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202102051652.115GqYVS049749@gitrepo.freebsd.org> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; keydata= mDMEX1iFDhYJKwYBBAHaRw8BAQdAiu8JG/oLFkVkOAJqJc7Dx5KI/Q6C3SBI20EQm+DXnAu0 HkFuZHJpeSBHYXBvbiA8YXZnQEZyZWVCU0Qub3JnPoiWBBMWCAA+FiEEyCHHZM09l0OE3Ir/ 1A1+Gq8+L1EFAl9YhQ4CGwMFCQeEzgAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ1A1+ Gq8+L1Fc0wD/ZjmhHfbCJywZU3aOxXIPjcz73FYEGMvqMCCLAWyLbSABALFL+1ZNrjV3BGjq 889cOYFuboA/Yn3eWezS+tfqYBsGuDgEX1iFDhIKKwYBBAGXVQEFAQEHQL6B20Xi600TrkpG P9fWjl7JtHNxqrHKhX6Kg7kgb4ILAwEIB4h+BBgWCAAmFiEEyCHHZM09l0OE3Ir/1A1+Gq8+ L1EFAl9YhQ4CGwwFCQeEzgAACgkQ1A1+Gq8+L1F3cgEAktp4h+IJUJxL1vn6zMOt//znni/J TanKfQuA8wGXcGkBAKpZJhqMkg+pKk7MGvJhgJ6nCpTZ+rMK6vZVZLUWc3QF Message-ID: <9f35a234-4c6f-7c86-523f-824dc52656aa@FreeBSD.org> Date: Fri, 5 Feb 2021 18:55:57 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Firefox/60.0 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <202102051652.115GqYVS049749@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DXM4d5wx9z3ljc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 16:56:02 -0000 On 05/02/2021 18:52, Alfredo Dal'Ava Junior wrote: > The branch stable/13 has been updated by alfredo: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6bf9668d9d02bdf3e0dafc4ba1010ef6a9b12247 > > commit 6bf9668d9d02bdf3e0dafc4ba1010ef6a9b12247 > Author: Alfredo Dal'Ava Junior > AuthorDate: 2021-02-05 18:43:48 +0000 > Commit: Alfredo Dal'Ava Junior > CommitDate: 2021-02-05 19:50:21 +0000 > > mrsas: unbreak i386 build > > Fix build regression introduced by > e34a057ca6ebdf8e30ec8b0dc21d18eb450bf36a > > Reviewed by: jhibbits Was it? I do not see an approval in the review request. > Sponsored by: Eldorado Research Institute (eldorado.org.br) > Differential Revision: https://reviews.freebsd.org/D28494 > > (cherry picked from commit 59fffbcf46ba6369420e655ff9173571410c643d) Why the insta-MFC _again_? Especially while there is still a discussion in the review request. > 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); > > -- Andriy Gapon