diff options
| author |   jmatthew <jmatthew@openbsd.org> | 2019-04-01 03:01:14 +0000 |
|---|---|---|
| committer | jmatthew <jmatthew@openbsd.org> | 2019-04-01 03:01:14 +0000 |
| commit | d9fc4a8d3cb7106609677c9c163931b007f1a4e5 (patch) | |
| tree | f276e25260a351008b9b7ab56f069ac0da04a580 | |
| parent | Don't use a prefetchable mapping for the registers - the controller only (diff) | |
| download | wireguard-openbsd-d9fc4a8d3cb7106609677c9c163931b007f1a4e5.tar.xz wireguard-openbsd-d9fc4a8d3cb7106609677c9c163931b007f1a4e5.zip | |
Enable the full pre-reset code path again, now that we've fixed the cause
of the pcie errors.
ok dlg@
| -rw-r--r-- | sys/dev/pci/if_ixl.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index 88a87bc42e6..ac25b88b9fb 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ixl.c,v 1.33 2019/04/01 02:58:56 jmatthew Exp $ */ +/* $OpenBSD: if_ixl.c,v 1.34 2019/04/01 03:01:14 jmatthew Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -1129,9 +1129,7 @@ struct ixl_softc { #define delaymsec(_ms) delay(1000 * (_ms)) -#ifdef notyet static void ixl_clear_hw(struct ixl_softc *); -#endif static int ixl_pf_reset(struct ixl_softc *); static int ixl_dmamem_alloc(struct ixl_softc *, struct ixl_dmamem *, @@ -1407,10 +1405,7 @@ ixl_attach(struct device *parent, struct device *self, void *aux) I40E_PFLAN_QALLOC_FIRSTQ_MASK) >> I40E_PFLAN_QALLOC_FIRSTQ_SHIFT; -#ifdef notyet ixl_clear_hw(sc); -#endif - if (ixl_pf_reset(sc) == -1) { /* error printed by ixl_pf_reset */ goto unmap; @@ -3993,7 +3988,6 @@ ixl_arq_unfill(struct ixl_softc *sc) } } -#ifdef notyet static void ixl_clear_hw(struct ixl_softc *sc) { @@ -4079,7 +4073,6 @@ ixl_clear_hw(struct ixl_softc *sc) /* short wait for all queue disables to settle */ delaymsec(50); } -#endif static int ixl_pf_reset(struct ixl_softc *sc) |