svn commit: r224384 - stable/7/sys/sparc64/pci

[Marius Strobl]

Author: marius
Date: Mon Jul 25 18:59:43 2011
New Revision: 224384
URL: http://svn.freebsd.org/changeset/base/224384

Log:
  MFC: r223959
  
  - Add a missing shift in schizo_get_timecount(). This happened to be non-fatal
    as STX_CTRL_PERF_CNT_CNT0_SHIFT actually is zero, if we were using the
    second counter in the upper 32 bits this would be required though as the MI
    timecounter code doesn't support 64-bit counters/counter registers.
  - Remove a redundant NULL assignment from the timecounter initialization.

Modified:
  stable/7/sys/sparc64/pci/schizo.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/pci/schizo.c
==============================================================================
--- stable/7/sys/sparc64/pci/schizo.c	Mon Jul 25 18:57:50 2011	(r224383)
+++ stable/7/sys/sparc64/pci/schizo.c	Mon Jul 25 18:59:43 2011	(r224384)
@@ -482,7 +482,6 @@ schizo_attach(device_t dev)
 		if (tc == NULL)
 			panic("%s: could not malloc timecounter", __func__);
 		tc->tc_get_timecount = schizo_get_timecount;
-		tc->tc_poll_pps = NULL;
 		tc->tc_counter_mask = STX_CTRL_PERF_CNT_MASK;
 		if (OF_getprop(OF_peer(0), "clock-frequency", &prop,
 		    sizeof(prop)) == -1)
@@ -1521,6 +1520,7 @@ schizo_get_timecount(struct timecounter 
 	struct schizo_softc *sc;
 
 	sc = tc->tc_priv;
-	return (SCHIZO_CTRL_READ_8(sc, STX_CTRL_PERF_CNT) &
-	    (STX_CTRL_PERF_CNT_MASK << STX_CTRL_PERF_CNT_CNT0_SHIFT));
+	return ((SCHIZO_CTRL_READ_8(sc, STX_CTRL_PERF_CNT) &
+	    (STX_CTRL_PERF_CNT_MASK << STX_CTRL_PERF_CNT_CNT0_SHIFT)) >>
+	    STX_CTRL_PERF_CNT_CNT0_SHIFT);
 }