git: b94f25eb626f - releng/13.0 - mrsas: unbreak i386 build

Alfredo Dal'Ava Junior alfredo at FreeBSD.org
Fri Feb 5 19:10:32 UTC 2021


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


More information about the dev-commits-src-all mailing list