From owner-p4-projects@FreeBSD.ORG Thu Jul 27 11:23:07 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 8232B16A4E6; Thu, 27 Jul 2006 11:23:07 +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 5DA7A16A4E1 for ; Thu, 27 Jul 2006 11:23:07 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7728343D72 for ; Thu, 27 Jul 2006 11:23:04 +0000 (GMT) (envelope-from cognet@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 k6RBN4of064770 for ; Thu, 27 Jul 2006 11:23:04 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RBN4Uv064767 for perforce@freebsd.org; Thu, 27 Jul 2006 11:23:04 GMT (envelope-from cognet@freebsd.org) Date: Thu, 27 Jul 2006 11:23:04 GMT Message-Id: <200607271123.k6RBN4Uv064767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 102546 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 11:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102546 Change 102546 by cognet@cognet on 2006/07/27 11:22:09 Erm. Get this right, and manage the IRQ rman entry in the pci softc, NOT the ixp425 entry... Pointy hat to: cognet Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#5 (text+ko) ==== @@ -55,6 +55,7 @@ ixp425_md_attach(device_t dev) { struct ixp425_softc *sc = device_get_softc(device_get_parent(dev)); + struct ixppcib_softc *pci_sc = device_get_softc(dev); uint32_t reg; @@ -133,8 +134,8 @@ 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_D, PCI_INT_A) != 0) + if (rman_init(&pci_sc->sc_irq_rman) != 0 || + rman_manage_region(&pci_sc->sc_irq_rman, PCI_INT_D, PCI_INT_A) != 0) panic("ixp425_md_attach: failed to set up IRQ rman"); } ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 (text+ko) ==== @@ -70,22 +70,6 @@ #define PCI_CONF_LOCK(s) (s) = disable_interrupts(I32_bit) #define PCI_CONF_UNLOCK(s) restore_interrupts((s)) -struct ixppcib_softc { - device_t sc_dev; - - u_int sc_bus; - - struct resource *sc_csr; - struct resource *sc_mem; - - struct rman sc_io_rman; - struct rman sc_mem_rman; - struct rman sc_irq_rman; - - struct bus_space sc_pci_memt; - struct bus_space sc_pci_iot; -}; - static device_probe_t ixppcib_probe; static device_attach_t ixppcib_attach; static bus_read_ivar_t ixppcib_read_ivar; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#5 (text+ko) ==== @@ -65,6 +65,22 @@ struct rman sc_mem_rman; }; +struct ixppcib_softc { + device_t sc_dev; + + u_int sc_bus; + + struct resource *sc_csr; + struct resource *sc_mem; + + struct rman sc_io_rman; + struct rman sc_mem_rman; + struct rman sc_irq_rman; + + struct bus_space sc_pci_memt; + struct bus_space sc_pci_iot; +}; + extern struct bus_space ixpsip_bs_tag; extern struct bus_space ixp425_bs_tag; extern struct bus_space ixp425_a4x_bs_tag;