git: e6a3962d7dd7 - stable/14 - hyperv/storvsc: Avoid conditional asserts in storvsc_xferbuf_prepare()

[Mark Johnston]

The branch stable/14 has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e6a3962d7dd7f302c094d5cea68a3d63a1b67eb6

commit e6a3962d7dd7f302c094d5cea68a3d63a1b67eb6
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-03-31 10:45:55 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-04-15 02:25:24 +0000

    hyperv/storvsc: Avoid conditional asserts in storvsc_xferbuf_prepare()
    
    whu@ cannot reproduce the assertion failure which led to these ifdefs
    being added in the first place, and since they appear wrong, i.e., the
    assertions ought to apply to all platforms, let's remove them.
    
    This reverts commits 0af5a0cd2788efce9f444f4f781357d317bb0bb1 and
    6f7b1310b6fe36f9bb653d3e97bc257adced3a2b.
    
    PR:             285681
    Tested by:      whu
    MFC after:      2 weeks
    
    (cherry picked from commit 54a3920dc9b3b5a47cdaaa3132b4fcf1c448a737)
---
 sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c 
b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
index 076b436a2191..70a5f414d986 100644
--- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -1833,7 +1833,6 @@ storvsc_xferbuf_prepare(void *arg, bus_dma_segment_t 
*segs, int nsegs, int error
 
        for (i = 0; i < nsegs; i++) {
 #ifdef INVARIANTS
-#if !defined(__aarch64__)
                if (nsegs > 1) {
                        if (i == 0) {
                                KASSERT((segs[i].ds_addr & PAGE_MASK) +
@@ -1853,7 +1852,6 @@ storvsc_xferbuf_prepare(void *arg, bus_dma_segment_t 
*segs, int nsegs, int error
                                     segs[i].ds_len));
                        }
                }
-#endif
 #endif
                prplist->gpa_page[i] = atop(segs[i].ds_addr);
        }