From owner-svn-src-projects@FreeBSD.ORG Thu Feb 9 05:43:50 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 B80B21065670; Thu, 9 Feb 2012 05:43:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A75918FC14; Thu, 9 Feb 2012 05:43:50 +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 q195hos4083699; Thu, 9 Feb 2012 05:43:50 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q195hoQT083697; Thu, 9 Feb 2012 05:43:50 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201202090543.q195hoQT083697@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 9 Feb 2012 05:43:50 +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: r231246 - projects/armv6/sys/arm/ti 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: Thu, 09 Feb 2012 05:43:50 -0000 Author: gonzo Date: Thu Feb 9 05:43:50 2012 New Revision: 231246 URL: http://svn.freebsd.org/changeset/base/231246 Log: - Fix priority/target CPU setting code - Some minor style fixes Modified: projects/armv6/sys/arm/ti/gic.c Modified: projects/armv6/sys/arm/ti/gic.c ============================================================================== --- projects/armv6/sys/arm/ti/gic.c Thu Feb 9 04:57:32 2012 (r231245) +++ projects/armv6/sys/arm/ti/gic.c Thu Feb 9 05:43:50 2012 (r231246) @@ -49,10 +49,9 @@ __FBSDID("$FreeBSD$"); #include #include +/* We are using GICv2 register naming */ - /* We are using GICv2 register naming */ - - /* Distributor Registers */ +/* Distributor Registers */ #define GICD_CTLR 0x000 /* v1 ICDDCR */ #define GICD_TYPER 0x004 /* v1 ICDICTR */ #define GICD_IIDR 0x008 /* v1 ICDIIDR */ @@ -67,7 +66,7 @@ __FBSDID("$FreeBSD$"); #define GICD_ICFGR(n) (0x0C00 + ((n) * 4)) /* v1 ICDICFR */ #define GICD_SGIR(n) (0x0F00 + ((n) * 4)) /* v1 ICDSGIR */ - /* CPU Registers */ +/* CPU Registers */ #define GICC_CTLR 0x0000 /* v1 ICCICR */ #define GICC_PMR 0x0004 /* v1 ICCPMR */ #define GICC_BPR 0x0008 /* v1 ICCBPR */ @@ -78,8 +77,6 @@ __FBSDID("$FreeBSD$"); #define GICC_ABPR 0x001C /* v1 ICCABPR */ #define GICC_IIDR 0x00FC /* v1 ICCIIDR*/ - - struct arm_gic_softc { struct resource * gic_res[3]; bus_space_tag_t gic_c_bst; @@ -95,7 +92,6 @@ static struct resource_spec arm_gic_spec { -1, 0 } }; - static struct arm_gic_softc *arm_gic_sc = NULL; #define gic_c_read_4(reg) \ @@ -107,7 +103,6 @@ static struct arm_gic_softc *arm_gic_sc #define gic_d_write_4(reg, val) \ bus_space_write_4(arm_gic_sc->gic_d_bst, arm_gic_sc->gic_d_bsh, reg, val) - static int arm_gic_probe(device_t dev) { @@ -166,9 +161,9 @@ arm_gic_attach(device_t dev) } /* Route all interrupts to CPU0 and set priority to 0 */ - for (i = 32; i < nirqs; i += 32) { - gic_d_write_4(GICD_IPRIORITYR(i >> 5), 0x00000000); - gic_d_write_4(GICD_ITARGETSR(i >> 5), 0x01010101); + for (i = 32; i < nirqs; i += 4) { + gic_d_write_4(GICD_IPRIORITYR(i >> 2), 0x00000000); + gic_d_write_4(GICD_ITARGETSR(i >> 2), 0x01010101); } /* Enable CPU interface */