From owner-svn-src-projects@FreeBSD.ORG Tue Jul 10 00:58:41 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AE91106566C; Tue, 10 Jul 2012 00:58:41 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C9538FC0C; Tue, 10 Jul 2012 00:58:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6A0wfBl050132; Tue, 10 Jul 2012 00:58:41 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A0wfjs050130; Tue, 10 Jul 2012 00:58:41 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201207100058.q6A0wfjs050130@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 10 Jul 2012 00:58:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238324 - projects/altix2/sys/ia64/sgisn X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 10 Jul 2012 00:58:41 -0000 Author: marcel Date: Tue Jul 10 00:58:40 2012 New Revision: 238324 URL: http://svn.freebsd.org/changeset/base/238324 Log: Remove the hack used by sncon0 to acknowledge the console interrupt by writing an IVAR. It's now done directly by the interrupt code and by calling shub_iack(). Also remove shub_conf_final() -- we do not have to ack any pending interrupts as a way to make interrupts working. They just work... 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 Tue Jul 10 00:55:41 2012 (r238323) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c Tue Jul 10 00:58:40 2012 (r238324) @@ -503,19 +503,8 @@ sgisn_shub_read_ivar(device_t dev, devic static int sgisn_shub_write_ivar(device_t dev, device_t child, int which, uintptr_t value) { - struct sgisn_shub_softc *sc = device_get_softc(dev); - uint64_t ev; - - if (which != SHUB_IVAR_EVENT) - return (ENOENT); - ev = bus_space_read_8(sc->sc_tag, sc->sc_hndl, SHUB_MMR_EVENT); - if (ev & value) - bus_space_write_8(sc->sc_tag, sc->sc_hndl, SHUB_MMR_EVENT_WR, - value); - device_printf(dev, "XXX: %s: child=%p, event=%lx, mask=%lx\n", - __func__, child, ev, value); - return (0); + return (ENOENT); } static int @@ -561,20 +550,13 @@ sgisn_shub_iommu_map(device_t dev, busdm void shub_iack(const char *f, u_int xiv) { - uintptr_t mask; - - printf("%s(%u) -- ", f, xiv); - mask = (xiv == 0xe9) ? SHUB_EVENT_CONSOLE : 0x670000000; - sgisn_shub_write_ivar(shub_dev, NULL, SHUB_IVAR_EVENT, mask); -} + struct sgisn_shub_softc *sc = device_get_softc(shub_dev); + uint64_t ev; -static void -shub_conf_final(void *arg) -{ + ev = bus_space_read_8(sc->sc_tag, sc->sc_hndl, SHUB_MMR_EVENT); + ev &= (xiv == 0xe9) ? SHUB_EVENT_CONSOLE : (0x3UL << 33); + if (!ev) + return; - if (shub_dev != NULL) - sgisn_shub_write_ivar(shub_dev, NULL, SHUB_IVAR_EVENT, - 0x670000000); + bus_space_write_8(sc->sc_tag, sc->sc_hndl, SHUB_MMR_EVENT_WR, ev); } -SYSINIT(shub_configure, SI_SUB_CONFIGURE, SI_ORDER_ANY, shub_conf_final, NULL); -