diff options
| author |   kettenis <kettenis@openbsd.org> | 2014-11-24 22:41:12 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2014-11-24 22:41:12 +0000 |
| commit | f5033b445efe039a8738af4d5ae5af43b2ffdfbc (patch) | |
| tree | 77fe059e3cba11b6d4443b613bbdccb05ae62f4f | |
| parent | Change "will write" back to "writes" in -f description. From jmc@ (diff) | |
| download | wireguard-openbsd-f5033b445efe039a8738af4d5ae5af43b2ffdfbc.tar.xz wireguard-openbsd-f5033b445efe039a8738af4d5ae5af43b2ffdfbc.zip | |
Actually, the previous change didn't quite work on the SPARC T5-2. But if
we change the order of the xxx_setvalidand xxx_setstate hypervisor calls
things actually work.
| -rw-r--r-- | sys/arch/sparc64/dev/vpci.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/sparc64/dev/vpci.c b/sys/arch/sparc64/dev/vpci.c index 1606cfe8bda..6e86ec1b63c 100644 --- a/sys/arch/sparc64/dev/vpci.c +++ b/sys/arch/sparc64/dev/vpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vpci.c,v 1.16 2014/11/24 22:09:32 kettenis Exp $ */ +/* $OpenBSD: vpci.c,v 1.17 2014/11/24 22:41:12 kettenis Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> * @@ -268,15 +268,15 @@ vpci_init_msi(struct vpci_softc *sc, struct vpci_pbm *pbm) IPL_HIGH, 0, vpci_msi_eq_intr, pbm, sc->sc_dv.dv_xname) == NULL) goto disable_queue; - err = hv_pci_msiq_setstate(pbm->vp_devhandle, 0, PCI_MSIQSTATE_IDLE); + err = hv_pci_msiq_setvalid(pbm->vp_devhandle, 0, PCI_MSIQ_VALID); if (err != H_EOK) { - printf("%s: pci_msiq_setstate: err %d\n", __func__, err); + printf("%s: pci_msiq_setvalid: err %d\n", __func__, err); goto disable_queue; } - err = hv_pci_msiq_setvalid(pbm->vp_devhandle, 0, PCI_MSIQ_VALID); + err = hv_pci_msiq_setstate(pbm->vp_devhandle, 0, PCI_MSIQSTATE_IDLE); if (err != H_EOK) { - printf("%s: pci_msiq_setvalid: err %d\n", __func__, err); + printf("%s: pci_msiq_setstate: err %d\n", __func__, err); goto disable_queue; } @@ -544,15 +544,15 @@ vpci_intr_establish(bus_space_tag_t t, bus_space_tag_t t0, int ihandle, return (NULL); } - err = hv_pci_msi_setstate(pbm->vp_devhandle, msinum, PCI_MSISTATE_IDLE); + err = hv_pci_msi_setvalid(pbm->vp_devhandle, msinum, PCI_MSI_VALID); if (err != H_EOK) { - printf("%s: pci_msi_setstate: err %d\n", __func__, err); + printf("%s: pci_msi_setvalid: err %d\n", __func__, err); return (NULL); } - err = hv_pci_msi_setvalid(pbm->vp_devhandle, msinum, PCI_MSI_VALID); + err = hv_pci_msi_setstate(pbm->vp_devhandle, msinum, PCI_MSISTATE_IDLE); if (err != H_EOK) { - printf("%s: pci_msi_setvalid: err %d\n", __func__, err); + printf("%s: pci_msi_setstate: err %d\n", __func__, err); return (NULL); } |