diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-03-29 12:53:42 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-03-29 12:53:42 +0000 |
| commit | 2d278b45fcc694aac4935bcaddf4197306fcd0b1 (patch) | |
| tree | 765d00dd7f7bca558cb1ba01d44cca7ff2f45e25 /sys | |
| parent | 530bf6026e3fbd190c716945e98b0c454430b513 (diff) | |
Remove holdover XMAC II writes/reads inherited from sk as
they aren't required and cause problems like the 88E8072
hard locking a system when enabling macsec bypass.
Tested on 8053/8072 by me and 8021 by kettenis.
ok kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index e420c075229..78ac4483782 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.73 2009/03/27 10:16:17 jsg Exp $ */ +/* $OpenBSD: if_msk.c,v 1.74 2009/03/29 12:53:41 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2053,7 +2053,6 @@ msk_stop(struct sk_if_softc *sc_if) /* Stop transfer of Rx descriptors */ /* Turn off various components of this interface. */ - SK_XM_SETBIT_2(sc_if, XM_GPIO, XM_GPIO_RESETMAC); SK_IF_WRITE_1(sc_if,0, SK_RXMF1_CTRL_TEST, SK_RFCTL_RESET_SET); SK_IF_WRITE_1(sc_if,0, SK_TXMF1_CTRL_TEST, SK_TFCTL_RESET_SET); SK_IF_WRITE_4(sc_if, 0, SK_RXQ1_BMU_CSR, SK_RXBMU_OFFLINE); @@ -2076,9 +2075,6 @@ msk_stop(struct sk_if_softc *sc_if) sc->sk_intrmask &= ~SK_Y2_INTRS2; CSR_WRITE_4(sc, SK_IMR, sc->sk_intrmask); - SK_XM_READ_2(sc_if, XM_ISR); - SK_XM_WRITE_2(sc_if, XM_IMR, 0xFFFF); - /* Free RX and TX mbufs still in the queues. */ for (i = 0; i < MSK_RX_RING_CNT; i++) { if (sc_if->sk_cdata.sk_rx_chain[i].sk_mbuf != NULL) { |