From owner-dev-commits-src-branches@freebsd.org Fri Feb 5 17:12:59 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 B0BF454CBFA; Fri, 5 Feb 2021 17:12:59 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DXMSC3yn4z3nGk; Fri, 5 Feb 2021 17:12:59 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-io1-xd34.google.com with SMTP id n201so7815552iod.12; Fri, 05 Feb 2021 09:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=8mOdqa7kHQu3XbuZn0Eda5R7aV0IVQCQCG8vRfzSva4=; b=gC/ebv+gsV13wmVOCvJE+IVu2ichfIcoPbYDM3NNv/MSoxWVUyqsMc//poPBF8EXhc 7NUCfN15KPA9PVT3eF5J8AWdMBMiXkhj9CnCwFuHnfhjcgQBRqG5NrNcFbtpBRpHGDDk EsmyCVD4RCQThllORVE/mJ3t5NBbd37sp3XtOldnpD0EgfSEfav5jfrlhnkO2kgx7y0i nV23V7qhGXn7V5em63t3cgZMQinQ24xgPOgorbC0H5grOr+1GBVZhwJHFQpULAjn/GKG 0sjyvh01KTlfgn8ptd83qAO0DZpFz54pOVMhPU/tvT3AxMkBbIqRcsG6IFxuOVOsRB/g InKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=8mOdqa7kHQu3XbuZn0Eda5R7aV0IVQCQCG8vRfzSva4=; b=YL4ZI2GYs3G+spiEP2PEFrhGmf58z9VabIx7lKvvOe/G7C0JyTuRxMzbc0jtSC+zue izkf1IZrUNRb5TIXkA42Z+t7Lzrec1UK59EQB86a+vyUN58jmIn2zlM/YyU3YkCT8tuT phXVkrtmyqGVS/J4Ym+Pe4qzURQpvyxEN+TUwJ1mY08Z5QVkOQ3DOzxbPOLL/64+jy3g /O0tp/1qdS3RHvS9fnFuaNmbt0yF0jcJk5OB5hLihETiDn6hL6I4GgziaW7EZyZSkfwI lEvAPjUchJeifmNUdJ8ffNzy/DuM5cUI7XrWo9wUIBFiCAf78Vn8ADiWX6yIBSsIGAXm a7NA== X-Gm-Message-State: AOAM532kItfE4UQdkBihSc7F02nrRM5mkZW1NG9llFHeyHu3xYJs4BdS AFSa2F2bv1UmWZ+1voUitv+c5YyYu9GYaQ== X-Google-Smtp-Source: ABdhPJxazJkwoQhjV5zFfANKq+ubO9+6/bhoeDDPyzlvjqZKRWnm1fpQTaSVAhVNzw1aq3jMx4McaQ== X-Received: by 2002:a05:6638:a36:: with SMTP id 22mr6074822jao.109.1612545178156; Fri, 05 Feb 2021 09:12:58 -0800 (PST) Received: from [127.0.0.1] (173-18-9-215.client.mchsi.com. [173.18.9.215]) by smtp.gmail.com with ESMTPSA id f16sm4594967iob.16.2021.02.05.09.12.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Feb 2021 09:12:57 -0800 (PST) Date: Fri, 5 Feb 2021 17:12:50 +0000 (UTC) From: Justin Hibbits To: Andriy Gapon Cc: Alfredo Dal'Ava Junior , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Message-ID: <5066e1e2-e4ce-48c3-8015-74810e7b727c@gmail.com> In-Reply-To: <9f35a234-4c6f-7c86-523f-824dc52656aa@FreeBSD.org> References: <202102051652.115GqYVS049749@gitrepo.freebsd.org> <9f35a234-4c6f-7c86-523f-824dc52656aa@FreeBSD.org> Subject: Re: git: 6bf9668d9d02 - stable/13 - mrsas: unbreak i386 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Correlation-ID: <5066e1e2-e4ce-48c3-8015-74810e7b727c@gmail.com> X-Rspamd-Queue-Id: 4DXMSC3yn4z3nGk 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-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2021 17:12:59 -0000 Feb 5, 2021 10:56:13 Andriy Gapon : > 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=3D6bf9668d9d02bdf3e0dafc4ba= 1010ef6a9b12247 >> >> commit 6bf9668d9d02bdf3e0dafc4ba1010ef6a9b12247 >> Author:=C2=A0=C2=A0=C2=A0=C2=A0 Alfredo Dal'Ava Junior >> AuthorDate: 2021-02-05 18:43:48 +0000 >> Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Alfredo Dal'Ava Junior >> CommitDate: 2021-02-05 19:50:21 +0000 >> >> =C2=A0=C2=A0=C2=A0 mrsas: unbreak i386 build >> =C2=A0=C2=A0=C2=A0 >> =C2=A0=C2=A0=C2=A0 Fix build regression introduced by >> =C2=A0=C2=A0=C2=A0 e34a057ca6ebdf8e30ec8b0dc21d18eb450bf36a >> =C2=A0=C2=A0=C2=A0 >> =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 jhibbits > > Was it?=C2=A0 I do not see an approval in the review request. Yes,=C2=A0 it was reviewed by me,=C2=A0 since he took exactly what I sugges= ted, and we discussed over IRC. > >> =C2=A0=C2=A0=C2=A0 Sponsored by:=C2=A0=C2=A0 Eldorado Research Institute= (eldorado.org.br) >> =C2=A0=C2=A0=C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd.= org/D28494 >> =C2=A0=C2=A0=C2=A0 >> =C2=A0=C2=A0=C2=A0 (cherry picked from commit 59fffbcf46ba6369420e655ff9= 173571410c643d) > > Why the insta-MFC _again_? > Especially while there is still a discussion in the review request. Agree here, but not sure the best resolution for the breakage in this case. > >> 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) >> =C2=A0 init_frame->queue_info_new_phys_addr_lo =3D htole32(phys_addr); >> =C2=A0 init_frame->data_xfer_len =3D htole32(sizeof(Mpi2IOCInitRequest_t= )); >> >> - req_desc.addr.u.low =3D htole32((bus_addr_t)sc->ioc_init_phys_mem & 0x= FFFFFFFF); >> - req_desc.addr.u.high =3D htole32((bus_addr_t)sc->ioc_init_phys_mem >> = 32); >> - >> + req_desc.addr.Words =3D htole64((bus_addr_t)sc->ioc_init_phys_mem); >> =C2=A0 req_desc.MFAIo.RequestFlags =3D >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (MRSAS_REQ_DESCRIPT_FLAGS_MFA << MRSAS_RE= Q_DESCRIPT_FLAGS_TYPE_SHIFT); >> >> > > > -- > Andriy Gapon - Justin