- Add a workaround (change the interrupt map mask to compare the full

  INO) for incorrect interrupt map entries on E250 machines. These
  incorrect entries caused the INO of the on-board HME to be also
  assigned to the second on-board NS16550 and to the on-board printer
  port controller. Further down the road caused hme(4) to fail to attach
  to the on-board HME in FreeBSD 5 and 6 as INTR_FAST and non-INTR_FAST
  handlers can't share the same IRQ there (it's unknown what whould
  happen in -CURRENT now that INTR_FAST and non-INTR_FAST handlers can
  share an IRQ but I'd expect funny problems with uart(4)).
- Make sure there are exactly 4 PCI ranges instead of just checking
  that the bridge has a 'ranges' property in the OFW device tree at all.
  Besides the fact that currently the 64bit memory range isn't used by
  this driver it we can't really work with less than 4 ranges and don't
  have memory for more than 4 bus handles for the ranges in the softc.
- Remove sc_range and sc_nrange from softc; for the bridges supported
  by this driver we no longer need to know the ranges besides the bus
  handles obtained from them once this driver is attached. That way we
  also can free the memory allocated for sc_range during attach again.
- Remove sc_dvmabase from the softc and pass it to psycho_iommu_init()
  via an additional argument as we no longer need to know the DVMA base
  in this driver once the IOMMU is initialized.
- Remove sc_dmatag from the softc, there isn't much sense in keeping
  the nexus dma tag around locally.

PR:		88279 [1]
Info from:	OpenSolaris [1]
Tested by:	kensmith [1]
MFC after:	1 month

2 files changed, 30 insertions, 29 deletions

diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 15a424d..8342e7a 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/ofw_bus.h>
 #include <machine/ofw_upa.h>
 #include <machine/resource.h>
+#include <machine/ver.h>
 
 #include <sys/rman.h>
 
@@ -95,7 +96,7 @@ static void psycho_wakeup(void *);
 #endif
 
 /* IOMMU support */
-static void psycho_iommu_init(struct psycho_softc *, int);
+static void psycho_iommu_init(struct psycho_softc *, int, uint32_t);
 
 /*
  * Methods
@@ -282,13 +283,15 @@ psycho_attach(device_t dev)
 	struct psycho_softc *sc;
 	struct psycho_softc *osc = NULL;
 	struct psycho_softc *asc;
+	struct upa_ranges *range;
 	struct upa_regs *reg;
 	const struct psycho_desc *desc;
 	phandle_t node;
 	uint64_t csr;
+	uint32_t dvmabase;
 	u_long mlen;
 	int psycho_br[2];
-	int n, i, nreg, rid;
+	int n, i, nrange, nreg, rid;
 #ifdef PSYCHO_DEBUG
 	bus_addr_t map, clr;
 	uint64_t mr;
@@ -300,7 +303,6 @@ psycho_attach(device_t dev)
 
 	sc->sc_node = node;
 	sc->sc_dev = dev;
-	sc->sc_dmatag = nexus_get_dmatag(dev);
 	sc->sc_mode = desc->pd_mode;
 
 	/*
@@ -391,9 +393,9 @@ psycho_attach(device_t dev)
 		csr = PCICTL_READ8(sc, PCR_TAS);
 		if (csr == 0)
 			panic("%s: Sabre TAS not initialized.", __func__);
-		sc->sc_dvmabase = (ffs(csr) - 1) << PCITAS_ADDR_SHIFT;
+		dvmabase = (ffs(csr) - 1) << PCITAS_ADDR_SHIFT;
 	} else
-		sc->sc_dvmabase = -1;
+		dvmabase = -1;
 
 	/* Initialize memory and I/O rmans. */
 	sc->sc_pci_io_rman.rm_type = RMAN_ARRAY;
@@ -407,30 +409,27 @@ psycho_attach(device_t dev)
 	    rman_manage_region(&sc->sc_pci_mem_rman, 0, PSYCHO_MEM_SIZE) != 0)
 		panic("%s: failed to set up memory rman", __func__);
 
-	sc->sc_nrange = OF_getprop_alloc(node, "ranges", sizeof(*sc->sc_range),
-	    (void **)&sc->sc_range);
-	if (sc->sc_nrange == -1)
-		panic("%s: could not get Psycho ranges", __func__);
+	nrange = OF_getprop_alloc(node, "ranges", sizeof(*range),
+	    (void **)&range);
+	/*
+	 * Make sure that the expected ranges are present. The PCI_CS_MEM64
+	 * one is not currently used though.
+	 */
+	if (nrange != PSYCHO_NRANGE)
+		panic("%s: unsupported number of ranges", __func__);
 	/*
 	 * Find the addresses of the various bus spaces.
 	 * There should not be multiple ones of one kind.
 	 * The physical start addresses of the ranges are the configuration,
 	 * memory and I/O handles.
 	 */
-	for (n = 0; n < sc->sc_nrange; n++) {
-		i = UPA_RANGE_CS(&sc->sc_range[n]);
+	for (n = 0; n < PSYCHO_NRANGE; n++) {
+		i = UPA_RANGE_CS(&range[n]);
 		if (sc->sc_pci_bh[i] != 0)
 			panic("%s: duplicate range for space %d", __func__, i);
-		sc->sc_pci_bh[i] = UPA_RANGE_PHYS(&sc->sc_range[n]);
-	}
-	/*
-	 * Check that all needed handles are present. The PCI_CS_MEM64 one is
-	 * not currently used.
-	 */
-	for (n = 0; n < 3; n++) {
-		if (sc->sc_pci_bh[n] == 0)
-			panic("%s: range %d missing", __func__, n);
+		sc->sc_pci_bh[i] = UPA_RANGE_PHYS(&range[n]);
 	}
+	free(range, M_OFWPROP);
 
 	/* Register the softc, this is needed for paired Psychos. */
 	SLIST_INSERT_HEAD(&psycho_softcs, sc, sc_link);
@@ -495,7 +494,7 @@ psycho_attach(device_t dev)
 		sc->sc_is->is_sb[1] = 0;
 		if (OF_getproplen(node, "no-streaming-cache") < 0)
 			sc->sc_is->is_sb[0] = sc->sc_pcictl + PCR_STRBUF;
-		psycho_iommu_init(sc, 3);
+		psycho_iommu_init(sc, 3, dvmabase);
 	} else {
 		/* Just copy IOMMU state, config tag and address */
 		sc->sc_is = osc->sc_is;
@@ -508,7 +507,7 @@ psycho_attach(device_t dev)
 	sc->sc_pci_memt = psycho_alloc_bus_tag(sc, PCI_MEMORY_BUS_SPACE);
 	sc->sc_pci_iot = psycho_alloc_bus_tag(sc, PCI_IO_BUS_SPACE);
 	sc->sc_pci_cfgt = psycho_alloc_bus_tag(sc, PCI_CONFIG_BUS_SPACE);
-	if (bus_dma_tag_create(sc->sc_dmatag, 8, 1, 0, 0x3ffffffff,
+	if (bus_dma_tag_create(nexus_get_dmatag(dev), 8, 1, 0, 0x3ffffffff,
 	    NULL, NULL, 0x3ffffffff, 0xff, 0xffffffff, 0, NULL, NULL,
 	    &sc->sc_pci_dmat) != 0)
 		panic("%s: bus_dma_tag_create failed", __func__);
@@ -568,6 +567,13 @@ psycho_attach(device_t dev)
 	    sc->sc_pci_secbus, 1);
 
 	ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(ofw_pci_intr_t));
+	/*
+	 * Workaround for incorrect interrupt map entries on E250.
+	 */
+	if (strcmp(sparc64_model, "SUNW,Ultra-250") == 0 &&
+	    sc->sc_pci_iinfo.opi_imapmsk != NULL)
+		*(ofw_pci_intr_t *)(&sc->sc_pci_iinfo.opi_imapmsk[
+		    sc->sc_pci_iinfo.opi_addrc]) = INTMAP_INO_MASK;
 
 	device_add_child(dev, "pci", sc->sc_pci_secbus);
 	return (bus_generic_attach(dev));
@@ -732,7 +738,7 @@ psycho_wakeup(void *arg)
 #endif /* PSYCHO_MAP_WAKEUP */
 
 static void
-psycho_iommu_init(struct psycho_softc *sc, int tsbsize)
+psycho_iommu_init(struct psycho_softc *sc, int tsbsize, uint32_t dvmabase)
 {
 	char *name;
 	struct iommu_state *is = sc->sc_is;
@@ -753,7 +759,7 @@ psycho_iommu_init(struct psycho_softc *sc, int tsbsize)
 		panic("%s: could not malloc iommu name", __func__);
 	snprintf(name, 32, "%s dvma", device_get_nameunit(sc->sc_dev));
 
-	iommu_init(name, is, tsbsize, sc->sc_dvmabase, 0);
+	iommu_init(name, is, tsbsize, dvmabase, 0);
 }
 
 static int
diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h
index b2d7d24..52f9f22 100644
--- a/sys/sparc64/pci/psychovar.h
+++ b/sys/sparc64/pci/psychovar.h
@@ -47,7 +47,6 @@ struct psycho_softc {
 	/* Our tags (from parent) */
 	bus_space_tag_t			sc_bustag;
 	bus_space_handle_t		sc_bushandle;
-	bus_dma_tag_t			sc_dmatag;
 
 	bus_addr_t			sc_pcictl;
 
@@ -60,7 +59,6 @@ struct psycho_softc {
 	int				sc_half;
 
 	struct iommu_state		*sc_is;
-	uint32_t			sc_dvmabase;
 
 	struct resource			*sc_mem_res;
 	struct resource			*sc_irq_res[PSYCHO_NINTR];
@@ -68,9 +66,6 @@ struct psycho_softc {
 
 	struct ofw_bus_iinfo		sc_pci_iinfo;
 
-	struct upa_ranges		*sc_range;
-	int				sc_nrange;
-
 	/* Tags for PCI access */
 	bus_space_tag_t			sc_pci_cfgt;
 	bus_space_tag_t			sc_pci_memt;