Fix WoL support in xl(4). Now works with my hardware (3Com 3c905C).

ok deraadt

2 files changed, 22 insertions, 12 deletions

diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 912db1867fa..d3631653e61 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.102 2011/06/21 16:52:45 tedu Exp $	*/
+/*	$OpenBSD: xl.c,v 1.103 2011/07/08 18:56:47 stsp Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -193,6 +193,7 @@ void xl_miibus_writereg(struct device *, int, int, int);
 void xl_miibus_statchg(struct device *);
 #ifndef SMALL_KERNEL
 int xl_wol(struct ifnet *, int);
+void xl_wol_power(struct xl_softc *);
 #endif
 
 int
@@ -204,6 +205,9 @@ xl_activate(struct device *self, int act)
 
 	switch (act) {
 	case DVACT_QUIESCE:
+#ifndef SMALL_KERNEL
+		xl_wol_power(sc);
+#endif
 		rv = config_activate_children(self, act);
 		break;
 	case DVACT_SUSPEND:
@@ -2371,12 +2375,23 @@ xl_stop(struct xl_softc *sc)
 	xl_freetxrx(sc);
 
 #ifndef SMALL_KERNEL
-	/* Call upper layer WOL power routine if WOL is enabled. */
-	if ((sc->xl_flags & XL_FLAG_WOL) && sc->wol_power)
-		sc->wol_power(sc->wol_power_arg);
+	xl_wol_power(sc);
 #endif
 }
 
+#ifndef SMALL_KERNEL
+void
+xl_wol_power(struct xl_softc *sc)
+{
+	/* Re-enable RX and call upper layer WOL power routine
+	 * if WOL is enabled. */
+	if ((sc->xl_flags & XL_FLAG_WOL) && sc->wol_power) {
+		CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_ENABLE);
+		sc->wol_power(sc->wol_power_arg);
+	}
+}
+#endif
+
 void
 xl_attach(struct xl_softc *sc)
 {
diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c
index ef70bd42c0b..4ce7cb99caa 100644
--- a/sys/dev/pci/if_xl_pci.c
+++ b/sys/dev/pci/if_xl_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl_pci.c,v 1.36 2011/04/17 20:52:43 stsp Exp $	*/
+/*	$OpenBSD: if_xl_pci.c,v 1.37 2011/07/08 18:56:47 stsp Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -273,7 +273,7 @@ xl_pci_attach(struct device *parent, struct device *self, void *aux)
 		 * PCI power state for WOL. It will be invoked when the
 		 * interface stops and WOL was enabled. */
 		command = pci_conf_read(pc, pa->pa_tag, XL_PCI_PWRMGMTCAP);
-		if (command & XL_PME_CAP_D3_HOT) {
+		if ((command >> 16) & XL_PME_CAP_D3_HOT) {
 			sc->wol_power = xl_pci_wol_power;
 			sc->wol_power_arg = psc; 
 		}
@@ -365,13 +365,8 @@ xl_pci_intr_ack(struct xl_softc *sc)
 void
 xl_pci_wol_power(void *ppsc)
 {
-	u_int32_t	command;
 	struct xl_pci_softc *psc = (struct xl_pci_softc*)ppsc;
 
-	/* Make sure power management is enabled, and set the card into
-	 * D3hot power state so it stays active after system shutdown. */
-	command = pci_conf_read(psc->psc_pc, psc->psc_tag, XL_PCI_PWRMGMTCTRL);
-	command |= XL_PME_EN | XL_PSTATE_D3;
-	pci_conf_write(psc->psc_pc, psc->psc_tag, XL_PCI_PWRMGMTCTRL, command);
+	pci_set_powerstate(psc->psc_pc, psc->psc_tag, PCI_PMCSR_STATE_D3);
 }
 #endif