git: 6bf9668d9d02 - stable/13 - mrsas: unbreak i386 build

[Justin Hibbits]

Feb 5, 2021 10:56:13 Andriy Gapon <avg at FreeBSD.org>:

> 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 <alfredo at FreeBSD.org>
>> AuthorDate: 2021-02-05 18:43:48 +0000
>> Commit:     Alfredo Dal'Ava Junior <alfredo at FreeBSD.org>
>> 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.

Yes,  it was reviewed by me,  since he took exactly what I suggested, and we discussed over IRC.

>
>>     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.

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)
>>   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

- Justin