Date: Thu, 27 Jul 2006 11:23:04 GMT From: Olivier Houchard <cognet@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 102546 for review Message-ID: <200607271123.k6RBN4Uv064767@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607271123.k6RBN4Uv064767>