From owner-p4-projects@FreeBSD.ORG Thu Jul 27 03:54:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5262A16A4E2; Thu, 27 Jul 2006 03:54:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5B8A16A4DA for ; Thu, 27 Jul 2006 03:54:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2F0043D8E for ; Thu, 27 Jul 2006 03:54:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6R3sNH9014886 for ; Thu, 27 Jul 2006 03:54:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R3sNL2014883 for perforce@freebsd.org; Thu, 27 Jul 2006 03:54:23 GMT (envelope-from sam@freebsd.org) Date: Thu, 27 Jul 2006 03:54:23 GMT Message-Id: <200607270354.k6R3sNL2014883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 102518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 03:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=102518 Change 102518 by sam@sam_ebb on 2006/07/27 03:53:36 correct start+end order for pci irq's; something doesn't seem right though as the pci irq's overlap the full set of irq's setup elsewhere and we're using the same rman structure--maybe pci has it's own? Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#4 (text+ko) ==== @@ -131,10 +131,11 @@ GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET)); sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs"; + CTASSERT(PCI_INT_D < PCI_INT_A); + /* XXX this overlaps the irq's setup in ixp425_attach */ if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, PCI_INT_A, PCI_INT_D) != 0) + rman_manage_region(&sc->sc_irq_rman, PCI_INT_D, PCI_INT_A) != 0) panic("ixp425_md_attach: failed to set up IRQ rman"); - } #define IXP425_MAX_DEV 4