ehci can attach to cardbus too.
This commit is contained in:
augustss
parent
58de8e2de6
commit
cd86b27aad
|
|
@ -0,0 +1,222 @@
|
|||
/* $NetBSD: ehci_cardbus.c,v 1.1 2001/11/06 03:18:53 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Lennart Augustsson (lennart@augustsson.net) at
|
||||
* Carlstedt Research & Technology.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``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 FOUNDATION OR CONTRIBUTORS
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/proc.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#if defined pciinc
|
||||
#include <dev/pci/pcidevs.h>
|
||||
#endif
|
||||
|
||||
#include <dev/cardbus/cardbusvar.h>
|
||||
#include <dev/cardbus/cardbusdevs.h>
|
||||
|
||||
#include <dev/cardbus/usb_cardbus.h>
|
||||
|
||||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbdi.h>
|
||||
#include <dev/usb/usbdivar.h>
|
||||
#include <dev/usb/usb_mem.h>
|
||||
|
||||
#include <dev/usb/ehcireg.h>
|
||||
#include <dev/usb/ehcivar.h>
|
||||
|
||||
int ehci_cardbus_match(struct device *, struct cfdata *, void *);
|
||||
void ehci_cardbus_attach(struct device *, struct device *, void *);
|
||||
int ehci_cardbus_detach(device_ptr_t, int);
|
||||
|
||||
struct ehci_cardbus_softc {
|
||||
ehci_softc_t sc;
|
||||
cardbus_chipset_tag_t sc_cc;
|
||||
cardbus_function_tag_t sc_cf;
|
||||
cardbus_devfunc_t sc_ct;
|
||||
void *sc_ih; /* interrupt vectoring */
|
||||
};
|
||||
|
||||
struct cfattach ehci_cardbus_ca = {
|
||||
sizeof(struct ehci_cardbus_softc), ehci_cardbus_match,
|
||||
ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate
|
||||
};
|
||||
|
||||
#define CARDBUS_INTERFACE_EHCI PCI_INTERFACE_EHCI
|
||||
#define CARDBUS_CBMEM PCI_CBMEM
|
||||
#define cardbus_findvendor pci_findvendor
|
||||
#define cardbus_devinfo pci_devinfo
|
||||
|
||||
static TAILQ_HEAD(, usb_cardbus) ehci_cardbus_alldevs =
|
||||
TAILQ_HEAD_INITIALIZER(ehci_cardbus_alldevs);
|
||||
|
||||
int
|
||||
ehci_cardbus_match(struct device *parent, struct cfdata *match, void *aux)
|
||||
{
|
||||
struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
|
||||
|
||||
if (CARDBUS_CLASS(ca->ca_class) == CARDBUS_CLASS_SERIALBUS &&
|
||||
CARDBUS_SUBCLASS(ca->ca_class) == CARDBUS_SUBCLASS_SERIALBUS_USB &&
|
||||
CARDBUS_INTERFACE(ca->ca_class) == CARDBUS_INTERFACE_EHCI)
|
||||
return (1);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
ehci_cardbus_attach(struct device *parent, struct device *self, void *aux)
|
||||
{
|
||||
struct ehci_cardbus_softc *sc = (struct ehci_cardbus_softc *)self;
|
||||
struct cardbus_attach_args *ca = aux;
|
||||
cardbus_devfunc_t ct = ca->ca_ct;
|
||||
cardbus_chipset_tag_t cc = ct->ct_cc;
|
||||
cardbus_function_tag_t cf = ct->ct_cf;
|
||||
cardbusreg_t csr;
|
||||
char devinfo[256];
|
||||
usbd_status r;
|
||||
char *vendor;
|
||||
const char *devname = sc->sc.sc_bus.bdev.dv_xname;
|
||||
|
||||
cardbus_devinfo(ca->ca_id, ca->ca_class, 0, devinfo);
|
||||
printf(": %s (rev. 0x%02x)\n", devinfo,
|
||||
CARDBUS_REVISION(ca->ca_class));
|
||||
|
||||
/* Map I/O registers */
|
||||
if (Cardbus_mapreg_map(ct, CARDBUS_CBMEM, CARDBUS_MAPREG_TYPE_MEM, 0,
|
||||
&sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
|
||||
printf("%s: can't map mem space\n", devname);
|
||||
return;
|
||||
}
|
||||
|
||||
sc->sc.sc_offs = bus_space_read_1(sc->sc.iot, sc->sc.ioh, EHCI_CAPLENGTH);
|
||||
|
||||
/* Disable interrupts, so we don't get any spurious ones. */
|
||||
EOWRITE2(&sc->sc, EHCI_USBINTR, 0);
|
||||
|
||||
sc->sc_cc = cc;
|
||||
sc->sc_cf = cf;
|
||||
sc->sc_ct = ct;
|
||||
sc->sc.sc_bus.dmatag = ca->ca_dmat;
|
||||
|
||||
#if rbus
|
||||
#else
|
||||
XXX (ct->ct_cf->cardbus_mem_open)(cc, 0, iob, iob + 0x40);
|
||||
#endif
|
||||
(ct->ct_cf->cardbus_ctrl)(cc, CARDBUS_MEM_ENABLE);
|
||||
(ct->ct_cf->cardbus_ctrl)(cc, CARDBUS_BM_ENABLE);
|
||||
|
||||
/* Enable the device. */
|
||||
csr = cardbus_conf_read(cc, cf, ca->ca_tag,
|
||||
CARDBUS_COMMAND_STATUS_REG);
|
||||
cardbus_conf_write(cc, cf, ca->ca_tag, CARDBUS_COMMAND_STATUS_REG,
|
||||
csr | CARDBUS_COMMAND_MASTER_ENABLE
|
||||
| CARDBUS_COMMAND_MEM_ENABLE);
|
||||
|
||||
sc->sc_ih = cardbus_intr_establish(cc, cf, ca->ca_intrline,
|
||||
IPL_USB, ehci_intr, sc);
|
||||
if (sc->sc_ih == NULL) {
|
||||
printf("%s: couldn't establish interrupt\n", devname);
|
||||
return;
|
||||
}
|
||||
printf("%s: interrupting at %d\n", devname, ca->ca_intrline);
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = cardbus_findvendor(ca->ca_id);
|
||||
sc->sc.sc_id_vendor = CARDBUS_VENDOR(ca->ca_id);
|
||||
if (vendor)
|
||||
strncpy(sc->sc.sc_vendor, vendor,
|
||||
sizeof(sc->sc.sc_vendor) - 1);
|
||||
else
|
||||
sprintf(sc->sc.sc_vendor, "vendor 0x%04x",
|
||||
CARDBUS_VENDOR(ca->ca_id));
|
||||
|
||||
r = ehci_init(&sc->sc);
|
||||
if (r != USBD_NORMAL_COMPLETION) {
|
||||
printf("%s: init failed, error=%d\n", devname, r);
|
||||
|
||||
/* Avoid spurious interrupts. */
|
||||
cardbus_intr_disestablish(sc->sc_cc, sc->sc_cf, sc->sc_ih);
|
||||
sc->sc_ih = 0;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/* Attach usb device. */
|
||||
sc->sc.sc_child = config_found((void *)sc, &sc->sc.sc_bus,
|
||||
usbctlprint);
|
||||
}
|
||||
|
||||
int
|
||||
ehci_cardbus_detach(device_ptr_t self, int flags)
|
||||
{
|
||||
struct ehci_cardbus_softc *sc = (struct ehci_cardbus_softc *)self;
|
||||
struct cardbus_devfunc *ct = sc->sc_ct;
|
||||
int rv;
|
||||
|
||||
rv = ehci_detach(&sc->sc, flags);
|
||||
if (rv)
|
||||
return (rv);
|
||||
if (sc->sc_ih != NULL) {
|
||||
cardbus_intr_disestablish(sc->sc_cc, sc->sc_cf, sc->sc_ih);
|
||||
sc->sc_ih = NULL;
|
||||
}
|
||||
if (sc->sc.sc_size) {
|
||||
Cardbus_mapreg_unmap(ct, CARDBUS_CBMEM, sc->sc.iot,
|
||||
sc->sc.ioh, sc->sc.sc_size);
|
||||
sc->sc.sc_size = 0;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
usb_cardbus_add(struct usb_cardbus *up, struct cardbus_attach_args *ca, struct usbd_bus *bu)
|
||||
{
|
||||
TAILQ_INSERT_TAIL(&ehci_cardbus_alldevs, up, next);
|
||||
up->bus = ca->ca_bus;
|
||||
up->device = ca->ca_device;
|
||||
up->function = ca->ca_function;
|
||||
up->usb = bu;
|
||||
}
|
||||
|
||||
void
|
||||
usb_cardbus_rem(struct usb_cardbus *up)
|
||||
{
|
||||
TAILQ_REMOVE(&ehci_cardbus_alldevs, up, next);
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.cardbus,v 1.16 2001/07/06 18:05:59 mcr Exp $
|
||||
# $NetBSD: files.cardbus,v 1.17 2001/11/06 03:18:53 augustss Exp $
|
||||
#
|
||||
# files.cardbus
|
||||
#
|
||||
|
|
@ -46,6 +46,12 @@ file dev/cardbus/if_tlp_cardbus.c tlp_cardbus
|
|||
attach ohci at cardbus with ohci_cardbus
|
||||
file dev/cardbus/ohci_cardbus.c ohci_cardbus
|
||||
|
||||
#
|
||||
# OHCI USB controller
|
||||
#
|
||||
attach ehci at cardbus with ehci_cardbus
|
||||
file dev/cardbus/ehci_cardbus.c ehci_cardbus
|
||||
|
||||
#
|
||||
# OHCI IEEE 1394 controller
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ohci_cardbus.c,v 1.9 2001/05/09 19:33:07 augustss Exp $ */
|
||||
/* $NetBSD: ohci_cardbus.c,v 1.10 2001/11/06 03:18:53 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -44,6 +44,8 @@
|
|||
* USB spec: http://www.teleport.com/cgi-bin/mailmerge.cgi/~usb/cgiform.tpl
|
||||
*/
|
||||
|
||||
#include "ehci.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -59,6 +61,8 @@
|
|||
#include <dev/cardbus/cardbusvar.h>
|
||||
#include <dev/cardbus/cardbusdevs.h>
|
||||
|
||||
#include <dev/cardbus/usb_cardbus.h>
|
||||
|
||||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbdi.h>
|
||||
#include <dev/usb/usbdivar.h>
|
||||
|
|
@ -73,6 +77,9 @@ int ohci_cardbus_detach(device_ptr_t, int);
|
|||
|
||||
struct ohci_cardbus_softc {
|
||||
ohci_softc_t sc;
|
||||
#if NEHCI > 0
|
||||
struct usb_cardbus sc_cardbus;
|
||||
#endif
|
||||
cardbus_chipset_tag_t sc_cc;
|
||||
cardbus_function_tag_t sc_cf;
|
||||
cardbus_devfunc_t sc_ct;
|
||||
|
|
@ -179,6 +186,10 @@ XXX (ct->ct_cf->cardbus_mem_open)(cc, 0, iob, iob + 0x40);
|
|||
return;
|
||||
}
|
||||
|
||||
#if NEHCI > 0
|
||||
usb_cardbus_add(&sc->sc_cardbus, ca, &sc->sc.sc_bus);
|
||||
#endif
|
||||
|
||||
/* Attach usb device. */
|
||||
sc->sc.sc_child = config_found((void *)sc, &sc->sc.sc_bus,
|
||||
usbctlprint);
|
||||
|
|
@ -203,5 +214,8 @@ ohci_cardbus_detach(device_ptr_t self, int flags)
|
|||
sc->sc.ioh, sc->sc.sc_size);
|
||||
sc->sc.sc_size = 0;
|
||||
}
|
||||
#if NEHCI > 0
|
||||
usb_cardbus_rem(&sc->sc_cardbus);
|
||||
#endif
|
||||
return (0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
/* $NetBSD: usb_cardbus.h,v 1.1 2001/11/06 03:18:53 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Lennart Augustsson (lennart@augustsson.net) at
|
||||
* Carlstedt Research & Technology.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``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 FOUNDATION OR CONTRIBUTORS
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* EHCI controllers need a way to find their compainion controllers
|
||||
* so we keep track of them as we attach.
|
||||
*/
|
||||
|
||||
struct usb_cardbus {
|
||||
TAILQ_ENTRY(usb_cardbus) next;
|
||||
u_int bus;
|
||||
u_int device;
|
||||
u_int function;
|
||||
struct usbd_bus *usb;
|
||||
};
|
||||
void usb_cardbus_add(struct usb_cardbus *, struct cardbus_attach_args *,
|
||||
struct usbd_bus *);
|
||||
void usb_cardbus_rem(struct usb_cardbus *);
|
||||
Loading…
Reference in New Issue