From 003bb895228da15d63f410a795eccfa240b5fd70 Mon Sep 17 00:00:00 2001 From: Marcus Glocker Date: Sun, 19 Nov 2006 14:20:56 +0000 Subject: Add PCI hookup for malo(4). Tested by Stephane Chausson with a Netgear WG311v3. --- share/man/man4/malo.4 | 3 +- sys/dev/pci/files.pci | 8 ++- sys/dev/pci/if_malo_pci.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 sys/dev/pci/if_malo_pci.c diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4 index a886a0caaac..f33892ed02b 100644 --- a/share/man/man4/malo.4 +++ b/share/man/man4/malo.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: malo.4,v 1.6 2006/11/18 12:59:26 mglocker Exp $ +.\" $OpenBSD: malo.4,v 1.7 2006/11/19 14:20:55 mglocker Exp $ .\" .\" Copyright (c) 2006 Theo de Raadt. .\" @@ -248,6 +248,7 @@ driver: .Bl -column -compact "Microcom Travelcard" "MALO111" "CardBus" "a/b/g" -offset 6n .Em "Card Chip Bus Standard" Netgear WG511v2 88W8335 Cardbus b/g +Netgear WG311v3 88W8335 PCI b/g .El .Sh EXAMPLES The following diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index 2175102f01d..a05da955c0f 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.217 2006/11/17 18:58:30 mglocker Exp $ +# $OpenBSD: files.pci,v 1.218 2006/11/19 14:20:55 mglocker Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -585,6 +585,12 @@ file dev/pci/if_acx_pci.c acx_pci attach pgt at pci with pgt_pci file dev/pci/if_pgt_pci.c pgt_pci +# +# Marvel Libertas Open +# +attach malo at pci with malo_pci +file dev/pci/if_malo_pci.c malo_pci + # # Broadcom BC43xx # diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c new file mode 100644 index 00000000000..7b3f8436af8 --- /dev/null +++ b/sys/dev/pci/if_malo_pci.c @@ -0,0 +1,152 @@ +/* $OpenBSD: if_malo_pci.c,v 1.1 2006/11/19 14:20:55 mglocker Exp $ */ + +/* + * Copyright (c) 2006 Marcus Glocker + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * PCI front-end for the Marvell Libertas + */ + +#include "bpfilter.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include + +#include + +#include +#include +#include + +/* Base Address Register */ +#define MALO_PCI_BAR1 0x10 +#define MALO_PCI_BAR2 0x14 + +int malo_pci_match(struct device *, void *, void *); +void malo_pci_attach(struct device *, struct device *, void *); +int malo_pci_detach(struct device *, int); + +struct malo_pci_softc { + struct malo_softc sc_malo; + + pci_chipset_tag_t sc_pc; + void *sc_ih; + + bus_size_t sc_mapsize1; + bus_size_t sc_mapsize2; +}; + +struct cfattach malo_pci_ca = { + sizeof(struct malo_pci_softc), malo_pci_match, malo_pci_attach, + malo_pci_detach +}; + +const struct pci_matchid malo_pci_devices[] = { + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8335_1 }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8335_2 } +}; + +int +malo_pci_match(struct device *parent, void *match, void *aux) +{ + return (pci_matchbyid((struct pci_attach_args *)aux, malo_pci_devices, + sizeof(malo_pci_devices) / sizeof(malo_pci_devices[0]))); +} + +void +malo_pci_attach(struct device *parent, struct device *self, void *aux) +{ + struct malo_pci_softc *psc = (struct malo_pci_softc *)self; + struct pci_attach_args *pa = aux; + struct malo_softc *sc = &psc->sc_malo; + const char *intrstr = NULL; + pci_intr_handle_t ih; + int error; + + sc->sc_dmat = pa->pa_dmat; + psc->sc_pc = pa->pa_pc; + + /* map control / status registers */ + error = pci_mapreg_map(pa, MALO_PCI_BAR1, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, + &sc->sc_mem1_bt, &sc->sc_mem1_bh, NULL, &psc->sc_mapsize1, 0); + if (error != 0) { + printf(": could not map 1st memory space\n"); + return; + } + + /* map control / status registers */ + error = pci_mapreg_map(pa, MALO_PCI_BAR2, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, + &sc->sc_mem2_bt, &sc->sc_mem2_bh, NULL, &psc->sc_mapsize2, 0); + if (error != 0) { + printf(": could not map 2nd memory space\n"); + return; + } + + /* map interrupt */ + if (pci_intr_map(pa, &ih) != 0) { + printf(": could not map interrupt\n"); + return; + } + + /* establish interrupt */ + intrstr = pci_intr_string(psc->sc_pc, ih); + psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, malo_intr, sc, + sc->sc_dev.dv_xname); + if (psc->sc_ih == NULL) { + printf(": could not establish interrupt"); + if (intrstr != NULL) + printf(" at %s", intrstr); + printf("\n"); + return; + } + printf(": %s\n", intrstr); + + malo_attach(sc); +} + +int +malo_pci_detach(struct device *self, int flags) +{ + struct malo_pci_softc *psc = (struct malo_pci_softc *)self; + struct malo_softc *sc = &psc->sc_malo; + + malo_detach(sc); + pci_intr_disestablish(psc->sc_pc, psc->sc_ih); + + return (0); +} -- cgit v1.2.3