Module Name: src
Committed By: martin
Date: Sun Mar 1 12:47:10 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-9]: if_mcx.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #747):
sys/dev/pci/if_mcx.c: revision 1.11
Use the 64-bit PCI DMA tag if available. Otherwise, we are needlessly
allocating (and using) bounce buffers on sytems with >4GB of RAM.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/dev/pci/if_mcx.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_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.1.2.8 src/sys/dev/pci/if_mcx.c:1.1.2.9
--- src/sys/dev/pci/if_mcx.c:1.1.2.8 Fri Jan 31 11:14:50 2020
+++ src/sys/dev/pci/if_mcx.c Sun Mar 1 12:47:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.1.2.8 2020/01/31 11:14:50 martin Exp $ */
+/* $NetBSD: if_mcx.c,v 1.1.2.9 2020/03/01 12:47:10 martin Exp $ */
/* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
/*
@@ -2215,7 +2215,10 @@ mcx_attach(device_t parent, device_t sel
sc->sc_dev = self;
sc->sc_pc = pa->pa_pc;
sc->sc_tag = pa->pa_tag;
- sc->sc_dmat = pa->pa_dmat;
+ if (pci_dma64_available(pa))
+ sc->sc_dmat = pa->pa_dmat64;
+ else
+ sc->sc_dmat = pa->pa_dmat;
/* Map the PCI memory space */
memtype = pci_mapreg_type(sc->sc_pc, sc->sc_tag, MCX_HCA_BAR);