Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add pmf(9) suspend, resume to bwi(4) cardbus front end. 

- Apply cardbus code cleanups.
This commit is contained in:
nakayama 2012-04-12 12:52:58 +00:00
parent 53baf6b85e
commit efa37975b6
3 changed files with 78 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
sys/dev/cardbus/if_bwi_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_bwi_cardbus.c,v 1.1 2012/04/08 20:49:29 christos Exp $ */ /* $NetBSD: if_bwi_cardbus.c,v 1.2 2012/04/12 12:52:58 nakayama Exp $ */
/* $OpenBSD: if_bwi_cardbus.c,v 1.13 2010/08/06 05:26:24 mglocker Exp $ */ /* $OpenBSD: if_bwi_cardbus.c,v 1.13 2010/08/06 05:26:24 mglocker Exp $ */
/* /*
@ -19,11 +19,12 @@
*/ */
/* /*
* Cardbus front-end for the Broadcom AirForce * Broadcom AirForce BCM43xx IEEE 802.11b/g wireless network driver
* CardBus front end
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0,"$NetBSD: if_bwi_cardbus.c,v 1.1 2012/04/08 20:49:29 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_bwi_cardbus.c,v 1.2 2012/04/12 12:52:58 nakayama Exp $");
#include "opt_inet.h" #include "opt_inet.h"
@ -51,12 +52,12 @@ __KERNEL_RCSID(0,"$NetBSD: if_bwi_cardbus.c,v 1.1 2012/04/08 20:49:29 christos E
#include <dev/pci/pcireg.h> #include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h> #include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <dev/cardbus/cardbusvar.h> #include <dev/cardbus/cardbusvar.h>
#include <dev/ic/bwireg.h> #include <dev/ic/bwireg.h>
#include <dev/ic/bwivar.h> #include <dev/ic/bwivar.h>
#include <dev/pci/pcidevs.h>
struct bwi_cardbus_softc { struct bwi_cardbus_softc {
struct bwi_softc csc_bwi; struct bwi_softc csc_bwi;
@ -64,27 +65,24 @@ struct bwi_cardbus_softc {
/* cardbus specific goo */ /* cardbus specific goo */
cardbus_devfunc_t csc_ct; cardbus_devfunc_t csc_ct;
pcitag_t csc_tag; pcitag_t csc_tag;
void *csc_ih;
bus_size_t csc_mapsize; bus_size_t csc_mapsize;
pcireg_t csc_bar_val; pcireg_t csc_bar_val;
int csc_intrline;
pci_chipset_tag_t csc_pc;
}; };
int bwi_cardbus_match(device_t, cfdata_t, void*); static int bwi_cardbus_match(device_t, cfdata_t, void *);
void bwi_cardbus_attach(device_t, device_t, void *); static void bwi_cardbus_attach(device_t, device_t, void *);
int bwi_cardbus_detach(device_t, int); static int bwi_cardbus_detach(device_t, int);
void bwi_cardbus_setup(struct bwi_cardbus_softc *); static void bwi_cardbus_setup(struct bwi_cardbus_softc *);
int bwi_cardbus_enable(struct bwi_softc *); static int bwi_cardbus_enable(struct bwi_softc *, int);
void bwi_cardbus_disable(struct bwi_softc *); static void bwi_cardbus_disable(struct bwi_softc *, int);
void bwi_cardbus_conf_write(void *, uint32_t, uint32_t); static void bwi_cardbus_conf_write(void *, uint32_t, uint32_t);
uint32_t bwi_cardbus_conf_read(void *, uint32_t); static uint32_t bwi_cardbus_conf_read(void *, uint32_t);
CFATTACH_DECL_NEW(bwi_cardbus, sizeof (struct bwi_cardbus_softc), CFATTACH_DECL_NEW(bwi_cardbus, sizeof (struct bwi_cardbus_softc),
bwi_cardbus_match, bwi_cardbus_attach, bwi_cardbus_detach, NULL); bwi_cardbus_match, bwi_cardbus_attach, bwi_cardbus_detach, NULL);
int static int
bwi_cardbus_match(device_t parent, cfdata_t match, void *aux) bwi_cardbus_match(device_t parent, cfdata_t match, void *aux)
{ {
struct cardbus_attach_args *ca = aux; struct cardbus_attach_args *ca = aux;
@ -112,7 +110,7 @@ bwi_cardbus_match(device_t parent, cfdata_t match, void *aux)
return (0); return (0);
} }
void static void
bwi_cardbus_attach(device_t parent, device_t self, void *aux) bwi_cardbus_attach(device_t parent, device_t self, void *aux)
{ {
struct bwi_cardbus_softc *csc = device_private(self); struct bwi_cardbus_softc *csc = device_private(self);
@ -123,6 +121,9 @@ bwi_cardbus_attach(device_t parent, device_t self, void *aux)
bus_addr_t base; bus_addr_t base;
int error; int error;
aprint_naive("\n");
aprint_normal(": Broadcom Wireless\n");
sc->sc_dev = self; sc->sc_dev = self;
sc->sc_dmat = ca->ca_dmat; sc->sc_dmat = ca->ca_dmat;
csc->csc_ct = ct; csc->csc_ct = ct;
@ -131,14 +132,13 @@ bwi_cardbus_attach(device_t parent, device_t self, void *aux)
/* power management hooks */ /* power management hooks */
sc->sc_enable = bwi_cardbus_enable; sc->sc_enable = bwi_cardbus_enable;
sc->sc_disable = bwi_cardbus_disable; sc->sc_disable = bwi_cardbus_disable;
//sc->sc_power = bwi_cardbus_power;
/* map control/status registers */ /* map control/status registers */
error = Cardbus_mapreg_map(ct, BWI_PCIR_BAR, error = Cardbus_mapreg_map(ct, BWI_PCIR_BAR,
PCI_MAPREG_TYPE_MEM, 0, &sc->sc_mem_bt, PCI_MAPREG_TYPE_MEM, 0, &sc->sc_mem_bt,
&sc->sc_mem_bh, &base, &csc->csc_mapsize); &sc->sc_mem_bh, &base, &csc->csc_mapsize);
if (error != 0) { if (error != 0) {
printf(": can't map mem space\n"); aprint_error_dev(self, "can't map mem space\n");
return; return;
} }
csc->csc_bar_val = base | PCI_MAPREG_TYPE_MEM; csc->csc_bar_val = base | PCI_MAPREG_TYPE_MEM;
@ -146,8 +146,6 @@ bwi_cardbus_attach(device_t parent, device_t self, void *aux)
/* set up the PCI configuration registers */ /* set up the PCI configuration registers */
bwi_cardbus_setup(csc); bwi_cardbus_setup(csc);
printf(": irq %d", csc->csc_intrline);
/* we need to access Cardbus config space from the driver */ /* we need to access Cardbus config space from the driver */
sc->sc_conf_read = bwi_cardbus_conf_read; sc->sc_conf_read = bwi_cardbus_conf_read;
sc->sc_conf_write = bwi_cardbus_conf_write; sc->sc_conf_write = bwi_cardbus_conf_write;
@ -159,34 +157,38 @@ bwi_cardbus_attach(device_t parent, device_t self, void *aux)
sc->sc_pci_subvid = PCI_VENDOR(reg); sc->sc_pci_subvid = PCI_VENDOR(reg);
sc->sc_pci_subdid = PCI_PRODUCT(reg); sc->sc_pci_subdid = PCI_PRODUCT(reg);
if (pmf_device_register(self, bwi_suspend, bwi_resume))
pmf_class_network_register(self, &sc->sc_if);
else
aprint_error_dev(self, "couldn't establish power handler\n");
error = bwi_attach(sc); error = bwi_attach(sc);
if (error != 0) if (error != 0)
bwi_cardbus_detach(sc->sc_dev, 0); bwi_cardbus_detach(self, 0);
Cardbus_function_disable(ct); Cardbus_function_disable(ct);
} }
int static int
bwi_cardbus_detach(device_t self, int flags) bwi_cardbus_detach(device_t self, int flags)
{ {
struct bwi_cardbus_softc *csc = device_private(self); struct bwi_cardbus_softc *csc = device_private(self);
struct bwi_softc *sc = &csc->csc_bwi; struct bwi_softc *sc = &csc->csc_bwi;
cardbus_devfunc_t ct = csc->csc_ct; cardbus_devfunc_t ct = csc->csc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (ct == NULL) if (ct == NULL)
panic("%s: data structure lacks", device_xname(self)); panic("%s: data structure lacks", device_xname(self));
#endif #endif
pmf_device_deregister(self);
bwi_detach(sc); bwi_detach(sc);
/* unhook the interrupt handler */ /* unhook the interrupt handler */
if (csc->csc_ih != NULL) { if (sc->sc_ih != NULL) {
cardbus_intr_disestablish(cc, cf, csc->csc_ih); Cardbus_intr_disestablish(ct, sc->sc_ih);
csc->csc_ih = NULL; sc->sc_ih = NULL;
} }
/* release bus space and close window */ /* release bus space and close window */
@ -196,92 +198,78 @@ bwi_cardbus_detach(device_t self, int flags)
return (0); return (0);
} }
void static void
bwi_cardbus_setup(struct bwi_cardbus_softc *csc) bwi_cardbus_setup(struct bwi_cardbus_softc *csc)
{ {
cardbus_devfunc_t ct = csc->csc_ct; cardbus_devfunc_t ct = csc->csc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
pci_chipset_tag_t pc = csc->csc_pc;
cardbus_function_tag_t cf = ct->ct_cf;
pcireg_t reg; pcireg_t reg;
/* program the BAR */ /* program the BAR */
cardbus_conf_write(cc, cf, csc->csc_tag, BWI_PCIR_BAR, Cardbus_conf_write(ct, csc->csc_tag, BWI_PCIR_BAR, csc->csc_bar_val);
csc->csc_bar_val);
/* make sure the right access type is on the cardbus bridge */
(*cf->cardbus_ctrl)(cc, CARDBUS_MEM_ENABLE);
(*cf->cardbus_ctrl)(cc, CARDBUS_BM_ENABLE);
/* enable the appropriate bits in the PCI CSR */ /* enable the appropriate bits in the PCI CSR */
reg = pci_conf_read(pc, csc->csc_tag, reg = Cardbus_conf_read(ct, csc->csc_tag, PCI_COMMAND_STATUS_REG);
PCI_COMMAND_STATUS_REG);
reg |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE; reg |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE;
Cardbus_conf_write(ct, csc->csc_tag, PCI_COMMAND_STATUS_REG, Cardbus_conf_write(ct, csc->csc_tag, PCI_COMMAND_STATUS_REG, reg);
reg);
} }
int static int
bwi_cardbus_enable(struct bwi_softc *sc) bwi_cardbus_enable(struct bwi_softc *sc, int pmf)
{ {
struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc; struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc;
cardbus_devfunc_t ct = csc->csc_ct; cardbus_devfunc_t ct = csc->csc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
/* power on the socket */ if (!pmf) {
Cardbus_function_enable(ct); /* power on the socket */
Cardbus_function_enable(ct);
/* setup the PCI configuration registers */ /* setup the PCI configuration registers */
bwi_cardbus_setup(csc); bwi_cardbus_setup(csc);
}
/* map and establish the interrupt handler */ /* map and establish the interrupt handler */
csc->csc_ih = cardbus_intr_establish(cc, cf, IPL_NET, sc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, bwi_intr, sc);
bwi_intr, sc); if (sc->sc_ih == NULL) {
if (csc->csc_ih == NULL) {
aprint_error_dev(sc->sc_dev, aprint_error_dev(sc->sc_dev,
"unable to establish interrupt\n"); "unable to establish interrupt\n");
Cardbus_function_disable(ct); if (!pmf)
return false; Cardbus_function_disable(ct);
return (1);
} }
return (0); return (0);
} }
void static void
bwi_cardbus_disable(struct bwi_softc *sc) bwi_cardbus_disable(struct bwi_softc *sc, int pmf)
{ {
struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc; struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc;
cardbus_devfunc_t ct = csc->csc_ct; cardbus_devfunc_t ct = csc->csc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
/* unhook the interrupt handler */ /* unhook the interrupt handler */
cardbus_intr_disestablish(cc, cf, csc->csc_ih); if (sc->sc_ih != NULL) {
csc->csc_ih = NULL; Cardbus_intr_disestablish(ct, sc->sc_ih);
sc->sc_ih = NULL;
}
/* power down the socket */ if (!pmf) {
Cardbus_function_disable(ct); /* power down the socket */
Cardbus_function_disable(ct);
}
} }
void static void
bwi_cardbus_conf_write(void *self, uint32_t reg, uint32_t val) bwi_cardbus_conf_write(void *sc, uint32_t reg, uint32_t val)
{ {
struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)self; struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc;
cardbus_devfunc_t ct = csc->csc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
cardbus_conf_write(cc, cf, csc->csc_tag, reg, val); Cardbus_conf_write(csc->csc_ct, csc->csc_tag, reg, val);
} }
uint32_t static uint32_t
bwi_cardbus_conf_read(void *self, uint32_t reg) bwi_cardbus_conf_read(void *sc, uint32_t reg)
{ {
struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)self; struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc;
cardbus_devfunc_t ct = csc->csc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
return (cardbus_conf_read(cc, cf, csc->csc_tag, reg)); return Cardbus_conf_read(csc->csc_ct, csc->csc_tag, reg);
} }

14
sys/dev/ic/bwi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bwi.c,v 1.19 2012/03/15 18:34:40 bouyer Exp $ */ /* $NetBSD: bwi.c,v 1.20 2012/04/12 12:52:58 nakayama Exp $ */
/* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */ /* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */
/* /*
@ -48,7 +48,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.19 2012/03/15 18:34:40 bouyer Exp $"); __KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.20 2012/04/12 12:52:58 nakayama Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/callout.h> #include <sys/callout.h>
@ -7176,7 +7176,7 @@ bwi_init_statechg(struct bwi_softc *sc, int statechg)
/* power on cardbus socket */ /* power on cardbus socket */
if (sc->sc_enable != NULL) if (sc->sc_enable != NULL)
(sc->sc_enable)(sc); (sc->sc_enable)(sc, 0);
bwi_bbp_power_on(sc, BWI_CLOCK_MODE_FAST); bwi_bbp_power_on(sc, BWI_CLOCK_MODE_FAST);
@ -7556,8 +7556,8 @@ bwi_stop(struct ifnet *ifp, int state_chg)
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
/* power off cardbus socket */ /* power off cardbus socket */
if (sc->sc_disable) if (sc->sc_disable != NULL)
(sc->sc_disable)(sc); (sc->sc_disable)(sc, 0);
return; return;
} }
@ -9711,6 +9711,8 @@ bwi_suspend(device_t dv, const pmf_qual_t *qual)
struct bwi_softc *sc = device_private(dv); struct bwi_softc *sc = device_private(dv);
bwi_power_off(sc, 0); bwi_power_off(sc, 0);
if (sc->sc_disable != NULL)
(sc->sc_disable)(sc, 1);
return true; return true;
} }
@ -9720,6 +9722,8 @@ bwi_resume(device_t dv, const pmf_qual_t *qual)
{ {
struct bwi_softc *sc = device_private(dv); struct bwi_softc *sc = device_private(dv);
if (sc->sc_enable != NULL)
(sc->sc_enable)(sc, 1);
bwi_power_on(sc, 1); bwi_power_on(sc, 1);
return true; return true;

6
sys/dev/ic/bwivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bwivar.h,v 1.8 2011/10/15 19:50:20 dholland Exp $ */ /* $NetBSD: bwivar.h,v 1.9 2012/04/12 12:52:58 nakayama Exp $ */
/* $OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $ */ /* $OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $ */
/* /*
@ -620,8 +620,8 @@ struct bwi_softc {
void (*sc_txeof_status)(struct bwi_softc *); void (*sc_txeof_status)(struct bwi_softc *);
int (*sc_enable)(struct bwi_softc *); int (*sc_enable)(struct bwi_softc *, int);
void (*sc_disable)(struct bwi_softc *); void (*sc_disable)(struct bwi_softc *, int);
void (*sc_conf_write)(void *, uint32_t, uint32_t); void (*sc_conf_write)(void *, uint32_t, uint32_t);
uint32_t (*sc_conf_read)(void *, uint32_t); uint32_t (*sc_conf_read)(void *, uint32_t);