Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci - split siop_pci in attachements vs helper funct...
details: https://anonhg.NetBSD.org/src/rev/2a1f19a0095d
branches: trunk
changeset: 486204:2a1f19a0095d
user: bouyer <bouyer%NetBSD.org@localhost>
date: Mon May 15 07:53:17 2000 +0000
description:
- split siop_pci in attachements vs helper functions, for comming esiop
- add a reset callback to enable PCI-specific features. This improve bandwith
by a factor of 2 on my alpha with a 875 !
- sync copyrigth notice
diffstat:
sys/dev/pci/siop_pci.c | 251 +--------------------------------
sys/dev/pci/siop_pci_common.c | 304 ++++++++++++++++++++++++++++++++++++++++++
sys/dev/pci/siop_pci_common.h | 59 ++++++++
3 files changed, 377 insertions(+), 237 deletions(-)
diffs (truncated from 661 to 300 lines):
diff -r c727ee36c2b3 -r 2a1f19a0095d sys/dev/pci/siop_pci.c
--- a/sys/dev/pci/siop_pci.c Mon May 15 07:50:44 2000 +0000
+++ b/sys/dev/pci/siop_pci.c Mon May 15 07:53:17 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci.c,v 1.7 2000/05/10 17:22:46 thorpej Exp $ */
+/* $NetBSD: siop_pci.c,v 1.8 2000/05/15 07:53:17 bouyer Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -17,17 +17,16 @@
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
@@ -35,166 +34,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
#include <sys/kernel.h>
-#include <machine/endian.h>
-
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipiconf.h>
#include <dev/ic/siopvar.h>
-
-/* structure describing each chip */
-struct siop_product_desc {
- u_int32_t product;
- int revision;
- const char *name;
- int features; /* features are defined in siopvar.h */
- u_int8_t maxburst;
- u_int8_t maxoff; /* maximum supported offset */
- u_int8_t clock_div; /* clock divider to use for async. logic */
- u_int8_t clock_period; /* clock period (ns * 10) */
-};
-
-/* List (array, really :) of chips we know how to handle */
-const struct siop_product_desc siop_products[] = {
- { PCI_PRODUCT_SYMBIOS_810,
- 0x00,
- "Symbios Logic 53c810 (fast scsi)",
- SF_PCI_RL,
- 4, 8, 3, 250
- },
- { PCI_PRODUCT_SYMBIOS_810,
- 0x10,
- "Symbios Logic 53c810a (fast scsi)",
- SF_PCI_RL | SF_PCI_BOF | SF_CHIP_PF,
- 4, 8, 3, 250
- },
- { PCI_PRODUCT_SYMBIOS_815,
- 0x00,
- "Symbios Logic 53c815 (fast scsi)",
- SF_PCI_RL | SF_PCI_BOF,
- 4, 8, 3, 250
- },
- { PCI_PRODUCT_SYMBIOS_820,
- 0x00,
- "Symbios Logic 53c820 (fast wide scsi)",
- SF_PCI_RL | SF_BUS_WIDE,
- 4, 8, 3, 250
- },
- { PCI_PRODUCT_SYMBIOS_825,
- 0x00,
- "Symbios Logic 53c825 (fast wide scsi)",
- SF_PCI_RL | SF_PCI_BOF | SF_BUS_WIDE,
- 4, 8, 3, 250
- },
- { PCI_PRODUCT_SYMBIOS_825,
- 0x10,
- "Symbios Logic 53c825a (fast wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM |
- SF_BUS_WIDE,
- 7, 8, 3, 250
- },
- { PCI_PRODUCT_SYMBIOS_860,
- 0x00,
- "Symbios Logic 53c860 (ultra scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_PF |
- SF_BUS_ULTRA,
- 4, 8, 5, 125
- },
- { PCI_PRODUCT_SYMBIOS_875,
- 0x00,
- "Symbios Logic 53c875 (ultra-wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM |
- SF_BUS_ULTRA | SF_BUS_WIDE,
- 7, 16, 5, 125
- },
- { PCI_PRODUCT_SYMBIOS_875,
- 0x02,
- "Symbios Logic 53c875 (ultra-wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM | SF_CHIP_DBLR |
- SF_BUS_ULTRA | SF_BUS_WIDE,
- 7, 16, 5, 125
- },
- { PCI_PRODUCT_SYMBIOS_875J,
- 0x00,
- "Symbios Logic 53c875j (ultra-wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM | SF_CHIP_DBLR |
- SF_BUS_ULTRA | SF_BUS_WIDE,
- 7, 16, 5, 125
- },
- { PCI_PRODUCT_SYMBIOS_885,
- 0x00,
- "Symbios Logic 53c885 (ultra-wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM | SF_CHIP_DBLR |
- SF_BUS_ULTRA | SF_BUS_WIDE,
- 7, 16, 5, 125
- },
- { PCI_PRODUCT_SYMBIOS_895,
- 0x00,
- "Symbios Logic 53c895 (ultra2-wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM | SF_CHIP_QUAD |
- SF_BUS_ULTRA2 | SF_BUS_WIDE,
- 7, 31, 7, 62
- },
- { PCI_PRODUCT_SYMBIOS_896,
- 0x00,
- "Symbios Logic 53c896 (ultra2-wide scsi)",
- SF_PCI_RL | SF_PCI_CLS | SF_PCI_WRI | SF_PCI_RM |
- SF_CHIP_FIFO | SF_CHIP_PF | SF_CHIP_RAM | SF_CHIP_QUAD |
- SF_BUS_ULTRA2 | SF_BUS_WIDE,
- 7, 31, 7, 62
- },
- { 0,
- 0x00,
- NULL,
- 0x00,
- 0, 0, 0, 0
- },
-};
-
-const struct siop_product_desc * siop_lookup_product __P((u_int32_t, int));
-
-const struct siop_product_desc *
-siop_lookup_product(id, rev)
- u_int32_t id;
- int rev;
-{
- const struct siop_product_desc *pp;
- const struct siop_product_desc *rp = NULL;
-
- if (PCI_VENDOR(id) != PCI_VENDOR_SYMBIOS)
- return NULL;
-
- for (pp = siop_products; pp->name != NULL; pp++) {
- if (PCI_PRODUCT(id) == pp->product && pp->revision <= rev)
- if (rp == NULL || pp->revision > rp->revision)
- rp = pp;
- }
- return rp;
-}
-
-/* Driver internal state */
-struct siop_pci_softc {
- struct siop_softc siop;
- pci_chipset_tag_t sc_pc; /* PCI registers info */
- pcitag_t sc_tag;
- void *sc_ih; /* PCI interrupt handle */
- const struct siop_product_desc *sc_pp; /* Adapter description */
-};
+#include <dev/pci/siop_pci_common.h>
int siop_pci_match __P((struct device *, struct cfdata *, void *));
void siop_pci_attach __P((struct device *, struct device *, void *));
@@ -225,82 +74,10 @@
void *aux;
{
struct pci_attach_args *pa = aux;
- pci_chipset_tag_t pc = pa->pa_pc;
- pcitag_t tag = pa->pa_tag;
struct siop_pci_softc *sc = (struct siop_pci_softc *)self;
- const char *intrstr;
- pci_intr_handle_t intrhandle;
- bus_space_tag_t iot, memt;
- bus_space_handle_t ioh, memh;
- pcireg_t memtype;
- int memh_valid, ioh_valid;
- bus_addr_t ioaddr, memaddr;
-
- sc->sc_pp = siop_lookup_product(pa->pa_id, PCI_REVISION(pa->pa_class));
- if (sc->sc_pp == NULL) {
- printf("sym: broken match/attach!!\n");
- return;
- }
- printf(": %s\n", sc->sc_pp->name);
- sc->sc_pc = pc;
- sc->sc_tag = tag;
- sc->siop.sc_dmat = pa->pa_dmat;
-
- memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, 0x14);
- switch (memtype) {
- case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
- case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
- memh_valid = (pci_mapreg_map(pa, 0x14, memtype, 0,
- &memt, &memh, &memaddr, NULL) == 0);
- break;
- default:
- memh_valid = 0;
- }
-
- ioh_valid = (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_IO, 0,
- &iot, &ioh, &ioaddr, NULL) == 0);
- if (memh_valid) {
- sc->siop.sc_rt = memt;
- sc->siop.sc_rh = memh;
- sc->siop.sc_raddr = memaddr;
- } else if (ioh_valid) {
- sc->siop.sc_rt = iot;
- sc->siop.sc_rh = ioh;
- sc->siop.sc_raddr = ioaddr;
- } else {
- printf("%s: unable to map device registers\n",
- sc->siop.sc_dev.dv_xname);
- return;
- }
-
- if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
- pa->pa_intrline, &intrhandle) != 0) {
- printf("%s: couldn't map interrupt\n",
- sc->siop.sc_dev.dv_xname);
+ if (siop_pci_attach_common(sc, pa) == 0)
return;
- }
- intrstr = pci_intr_string(pa->pa_pc, intrhandle);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO,
- siop_intr, &sc->siop);
- if (sc->sc_ih != NULL) {
- printf("%s: interrupting at %s\n",
- sc->siop.sc_dev.dv_xname,
- intrstr ? intrstr : "unknown interrupt");
- } else {
- printf("%s: couldn't establish interrupt",
- sc->siop.sc_dev.dv_xname);
- if (intrstr != NULL)
- printf(" at %s", intrstr);
- printf("\n");
- return;
- }
- /* copy interesting infos about the chip */
- sc->siop.features = sc->sc_pp->features;
- sc->siop.maxburst = sc->sc_pp->maxburst;
- sc->siop.maxoff = sc->sc_pp->maxoff;
- sc->siop.clock_div = sc->sc_pp->clock_div;
- sc->siop.clock_period = sc->sc_pp->clock_period;
- /* attach generic code */
+
siop_attach(&sc->siop);
}
diff -r c727ee36c2b3 -r 2a1f19a0095d sys/dev/pci/siop_pci_common.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/pci/siop_pci_common.c Mon May 15 07:53:17 2000 +0000
@@ -0,0 +1,304 @@
+/* $NetBSD: siop_pci_common.c,v 1.1 2000/05/15 07:53:18 bouyer Exp $ */
+
+/*
+ * Copyright (c) 2000 Manuel Bouyer.
+ *
+ * Redistribution and use in source and binary forms, with or without
Home |
Main Index |
Thread Index |
Old Index