[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by c...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d57aa182b3a1
branches:  netbsd-6
changeset: 775485:d57aa182b3a1
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Nov 22 00:42:59 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #685):
        sys/dev/pci/if_nfe.c: revision 1.57
use 64-bit DMA where possible.

diffstat:

 sys/dev/pci/if_nfe.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 16793d00fa0e -r d57aa182b3a1 sys/dev/pci/if_nfe.c
--- a/sys/dev/pci/if_nfe.c      Thu Nov 22 00:40:51 2012 +0000
+++ b/sys/dev/pci/if_nfe.c      Thu Nov 22 00:42:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_nfe.c,v 1.55 2012/01/30 19:41:20 drochner Exp $     */
+/*     $NetBSD: if_nfe.c,v 1.55.2.1 2012/11/22 00:42:59 riz Exp $      */
 /*     $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $        */
 
 /*-
@@ -21,7 +21,7 @@
 /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.55 2012/01/30 19:41:20 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.55.2.1 2012/11/22 00:42:59 riz Exp $");
 
 #include "opt_inet.h"
 #include "vlan.h"
@@ -255,8 +255,6 @@
        }
        aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 
-       sc->sc_dmat = pa->pa_dmat;
-
        csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
        csr |= PCI_COMMAND_MASTER_ENABLE;
        pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr);
@@ -324,6 +322,11 @@
                break;
        }
 
+       if (pci_dma64_available(pa) && (sc->sc_flags & NFE_40BIT_ADDR) != 0)
+               sc->sc_dmat = pa->pa_dmat64;
+       else
+               sc->sc_dmat = pa->pa_dmat;
+
        nfe_poweron(self);
 
 #ifndef NFE_NO_JUMBO