svn commit: r233701 - head/sys/sparc64/pci

[Marius Strobl]

Author: marius
Date: Fri Mar 30 15:08:09 2012
New Revision: 233701
URL: http://svn.freebsd.org/changeset/base/233701

Log:
  - 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]
  MFC after:	3 days

Modified:
  head/sys/sparc64/pci/fire.c
  head/sys/sparc64/pci/firereg.h

Modified: head/sys/sparc64/pci/fire.c
==============================================================================
--- head/sys/sparc64/pci/fire.c	Fri Mar 30 12:57:14 2012	(r233700)
+++ head/sys/sparc64/pci/fire.c	Fri Mar 30 15:08:09 2012	(r233701)
@@ -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: head/sys/sparc64/pci/firereg.h
==============================================================================
--- head/sys/sparc64/pci/firereg.h	Fri Mar 30 12:57:14 2012	(r233700)
+++ head/sys/sparc64/pci/firereg.h	Fri Mar 30 15:08:09 2012	(r233701)
@@ -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