From owner-svn-src-projects@FreeBSD.ORG Sat Nov 2 00:35:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DF1D5A46; Sat, 2 Nov 2013 00:35:36 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CD21F2413; Sat, 2 Nov 2013 00:35:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA20ZaW1027157; Sat, 2 Nov 2013 00:35:36 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA20ZacT027156; Sat, 2 Nov 2013 00:35:36 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311020035.rA20ZacT027156@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 2 Nov 2013 00:35:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257536 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2013 00:35:36 -0000 Author: marcel Date: Sat Nov 2 00:35:36 2013 New Revision: 257536 URL: http://svnweb.freebsd.org/changeset/base/257536 Log: Only create a timecounter for the first SHub. Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sat Nov 2 00:11:38 2013 (r257535) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sat Nov 2 00:35:36 2013 (r257536) @@ -454,16 +454,18 @@ sgisn_shub_attach(device_t dev) device_set_ivars(child, (void *)(uintptr_t)~0UL); } - /* Use the SHub's RTC as a time counter. */ - r = ia64_sal_entry(SAL_FREQ_BASE, 2, 0, 0, 0, 0, 0, 0); - if (r.sal_status == 0) { - sc->sc_rtc.tc_get_timecount = sgisn_shub_get_rtc; - sc->sc_rtc.tc_counter_mask = ~0U; - sc->sc_rtc.tc_frequency = r.sal_result[0]; - sc->sc_rtc.tc_name = "SHub RTC"; - sc->sc_rtc.tc_quality = (r.sal_result[0]) ? 1200 : 950; - sc->sc_rtc.tc_priv = sc; - tc_init(&sc->sc_rtc); + if (sc->sc_nasid == 0) { + /* Use the SHub's RTC as a time counter. */ + r = ia64_sal_entry(SAL_FREQ_BASE, 2, 0, 0, 0, 0, 0, 0); + if (r.sal_status == 0) { + sc->sc_rtc.tc_get_timecount = sgisn_shub_get_rtc; + sc->sc_rtc.tc_counter_mask = ~0U; + sc->sc_rtc.tc_frequency = r.sal_result[0]; + sc->sc_rtc.tc_name = "SHub RTC"; + sc->sc_rtc.tc_quality = (r.sal_result[0]) ? 1200 : 950; + sc->sc_rtc.tc_priv = sc; + tc_init(&sc->sc_rtc); + } } for (seg = 0; seg <= sc->sc_fwhub->hub_pci_maxseg; seg++) {