[src/trunk]: src/sys/dev/pci No functional change:

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

details:   https://anonhg.NetBSD.org/src/rev/4b625338819b
branches:  trunk
changeset: 785525:4b625338819b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Mar 17 18:46:10 2013 +0000

description:
No functional change:
 - Fix comment
 - Use macro
 - Remove unused macro

diffstat:

 sys/dev/pci/if_bge.c    |  11 ++++++-----
 sys/dev/pci/if_bgereg.h |   8 +-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diffs (61 lines):

diff -r 2bd667092beb -r 4b625338819b sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Sun Mar 17 18:30:00 2013 +0000
+++ b/sys/dev/pci/if_bge.c      Sun Mar 17 18:46:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.216 2013/03/17 04:06:39 msaitoh Exp $     */
+/*     $NetBSD: if_bge.c,v 1.217 2013/03/17 18:46:10 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.216 2013/03/17 04:06:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.217 2013/03/17 18:46:10 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -2940,7 +2940,7 @@
            BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5784 ||
            BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5785 ||
            BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM57780 ||
-           BGE_IS_5717_PLUS(sc)) { /* XXX msaitoh 57765? */
+           BGE_IS_5717_PLUS(sc)) { /* XXX 57765? */
                dmactl = CSR_READ_4(sc, BGE_RDMA_RSRVCTRL);
                /*
                 * Adjust tx margin to prevent TX data corruption and
@@ -4004,8 +4004,9 @@
                uint32_t v;
 
                /* Enable PCI Express bug fix */
-               v = CSR_READ_4(sc, 0x7c00);
-               CSR_WRITE_4(sc, 0x7c00, v | (1<<25));
+               v = CSR_READ_4(sc, BGE_TLP_CONTROL_REG);
+               CSR_WRITE_4(sc, BGE_TLP_CONTROL_REG,
+                   v | BGE_TLP_DATA_FIFO_PROTECT);
        }
 
        if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720)
diff -r 2bd667092beb -r 4b625338819b sys/dev/pci/if_bgereg.h
--- a/sys/dev/pci/if_bgereg.h   Sun Mar 17 18:30:00 2013 +0000
+++ b/sys/dev/pci/if_bgereg.h   Sun Mar 17 18:46:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bgereg.h,v 1.63 2013/03/17 04:06:39 msaitoh Exp $   */
+/*     $NetBSD: if_bgereg.h,v 1.64 2013/03/17 18:46:10 msaitoh Exp $   */
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -1867,12 +1867,6 @@
 #define        BGE_RX_CPU_DRV_EVENT            0x00004000
 
 /*
- * XXX: Those names are made up as I have no documentation about it;
- *      I only know it is only used in the PCI-Express case.
- */
-#define BGE_PCIE_CTL0                  0x7c00
-
-/*
  * NVRAM Control registers
  */
 #define        BGE_NVRAM_CMD                   0x7000