Author: marius
Date: Mon Apr 2 20:14:32 2012
New Revision: 233811
URL: http://svn.freebsd.org/changeset/base/233811
Log:
MFC: r233701
- Remove erroneous trailing semicolon. [1]
- Correctly determine the maximum payload size for setting the TX link
frequent NACK latency and replay timer thresholds.
Submitted by: stefanf [1]
Modified:
stable/9/sys/sparc64/pci/fire.c
stable/9/sys/sparc64/pci/firereg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/i386/conf/XENHVM (props changed)
Modified: stable/9/sys/sparc64/pci/fire.c
==============================================================================
--- stable/9/sys/sparc64/pci/fire.c Mon Apr 2 20:10:50 2012
(r233810)
+++ stable/9/sys/sparc64/pci/fire.c Mon Apr 2 20:14:32 2012
(r233811)
@@ -443,10 +443,11 @@ fire_attach(device_t dev)
lw = 0;
}
mps = (FIRE_PCI_READ_8(sc, FO_PCI_TLU_CTRL) &
- FO_PCI_TLU_CTRL_CFG_MASK) >> FO_PCI_TLU_CTRL_CFG_SHFT;
+ FO_PCI_TLU_CTRL_CFG_MPS_MASK) >>
+ FO_PCI_TLU_CTRL_CFG_MPS_SHFT;
i = sizeof(fire_freq_nak_tmr_thrs) /
sizeof(*fire_freq_nak_tmr_thrs);
- if (mps >= i);
+ if (mps >= i)
mps = i - 1;
FIRE_PCI_SET(sc, FO_PCI_LPU_TXLNK_FREQ_LAT_TMR_THRS,
(fire_freq_nak_tmr_thrs[mps][lw] <<
Modified: stable/9/sys/sparc64/pci/firereg.h
==============================================================================
--- stable/9/sys/sparc64/pci/firereg.h Mon Apr 2 20:10:50 2012
(r233810)
+++ stable/9/sys/sparc64/pci/firereg.h Mon Apr 2 20:14:32 2012
(r233811)
@@ -345,6 +345,13 @@
#define FO_PCI_TLU_CTRL_CFG_MASK 0x000000000000ffffULL
#define FO_PCI_TLU_CTRL_CFG_SHFT 0
#define FO_PCI_TLU_CTRL_CFG_REMAIN_DETECT_QUIET 0x0000000000000100ULL
+#define FO_PCI_TLU_CTRL_CFG_PAD_LOOPBACK_EN 0x0000000000000080ULL
+#define FO_PCI_TLU_CTRL_CFG_EWRAP_LOOPBACK_EN 0x0000000000000040ULL
+#define FO_PCI_TLU_CTRL_CFG_DIGITAL_LOOPBACK_EN 0x0000000000000020ULL
+#define FO_PCI_TLU_CTRL_CFG_MPS_MASK 0x000000000000001cULL
+#define FO_PCI_TLU_CTRL_CFG_MPS_SHFT 2
+#define FO_PCI_TLU_CTRL_CFG_COMMON_CLK_CFG 0x0000000000000002ULL
+#define FO_PCI_TLU_CTRL_CFG_PORT 0x0000000000000001ULL
/*
* PCI TLU other event interrupt enable, interrupt status and status clear
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
