Module Name: src
Committed By: tnn
Date: Thu Jul 25 08:35:36 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm: change one bus_dmamap_load_mbuf() to bus_dmamap_load() equivalent
This makes wm work on aarch64, where the bus_dma implementation requires
the mbuf data pointer be immutable between bus_dmamap_load_mbuf and
bus_dmamap_sync. Fix suggested by thorpej@
To generate a diff of this commit:
cvs rdiff -u -r1.642 -r1.643 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.642 src/sys/dev/pci/if_wm.c:1.643
--- src/sys/dev/pci/if_wm.c:1.642 Tue Jul 9 08:46:59 2019
+++ src/sys/dev/pci/if_wm.c Thu Jul 25 08:35:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.642 2019/07/09 08:46:59 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.643 2019/07/25 08:35:36 tnn Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.642 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.643 2019/07/25 08:35:36 tnn Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -5141,8 +5141,12 @@ wm_add_rxbuf(struct wm_rxqueue *rxq, int
rxs->rxs_mbuf = m;
m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
- error = bus_dmamap_load_mbuf(sc->sc_dmat, rxs->rxs_dmamap, m,
- BUS_DMA_READ | BUS_DMA_NOWAIT);
+ /*
+ * Cannot use bus_dmamap_load_mbuf() here because m_data may be
+ * sc_align_tweak'd between bus_dmamap_load() and bus_dmamap_sync().
+ */
+ error = bus_dmamap_load(sc->sc_dmat, rxs->rxs_dmamap, m->m_ext.ext_buf,
+ m->m_ext.ext_size, NULL, BUS_DMA_READ | BUS_DMA_NOWAIT);
if (error) {
/* XXX XXX XXX */
aprint_error_dev(sc->sc_dev,
