summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-10-21 12:43:26 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-10-21 12:43:26 +0000
commitc68f32e747f94f99acd731da4ce88128f3a3f708 (patch)
tree29b156cd950372ee6a9123f2ab44174f8e9510d9
parentb0690652c0162f80e4f038c62342f61912eba959 (diff)
bring device back from power save mode if needed. fixes a problem reported
by Rodolfo Gouveia <rgouveia at cosmico dot net> on bugs@
-rw-r--r--sys/dev/pci/cs4280.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index cd2b61a0fb4..baefecfbf41 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4280.c,v 1.26 2007/08/01 21:37:21 miod Exp $ */
+/* $OpenBSD: cs4280.c,v 1.27 2007/10/21 12:43:25 fgsch Exp $ */
/* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */
/*
@@ -604,6 +604,8 @@ cs4280_attach(parent, self, aux)
char const *intrstr;
pci_intr_handle_t ih;
u_int32_t mem;
+ pcireg_t pmode;
+ int pmreg;
/* Map I/O register */
if (pci_mapreg_map(pa, CSCC_PCI_BA0,
@@ -621,6 +623,16 @@ cs4280_attach(parent, self, aux)
sc->sc_dmatag = pa->pa_dmat;
+ /* Get out of power save mode if needed. */
+ if (pci_get_capability(pc, pa->pa_tag, PCI_CAP_PWRMGMT, &pmreg, 0)) {
+ pmode = pci_conf_read(pc, pa->pa_tag, pmreg + PCI_PMCSR);
+ if ((pmode & PCI_PMCSR_STATE_MASK) != PCI_PMCSR_STATE_D0) {
+ pci_conf_write(pc, pa->pa_tag, pmreg + PCI_PMCSR,
+ (pmode & ~PCI_PMCSR_STATE_MASK) |
+ PCI_PMCSR_STATE_D0);
+ }
+ }
+
/* LATENCY_TIMER setting */
mem = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_BHLC_REG);
if ( PCI_LATTIMER(mem) < 32 ) {