summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2006-07-04 18:26:30 +0000
committerkettenis <kettenis@openbsd.org>2006-07-04 18:26:30 +0000
commit91469f18a75dad3b7b89a8170064efe68c1c84e6 (patch)
tree5dbb41f481e15c3c0848cbd8b57ad4174464014a
parentAdd some more pci ids that I forgot to commit. (diff)
downloadwireguard-openbsd-91469f18a75dad3b7b89a8170064efe68c1c84e6.tar.xz
wireguard-openbsd-91469f18a75dad3b7b89a8170064efe68c1c84e6.zip
Back out the workaround committed in rev 1.13 now that we no longer blindly
enable io and mem space on all matched PCI devices. ok deraadt@
-rw-r--r--sys/dev/pci/ppb.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index 6632931e56a..bd21727ff23 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppb.c,v 1.15 2006/03/19 21:57:55 brad Exp $ */
+/* $OpenBSD: ppb.c,v 1.16 2006/07/04 18:26:30 kettenis Exp $ */
/* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */
/*
@@ -66,13 +66,10 @@ ppbmatch(struct device *parent, void *match, void *aux)
struct pci_attach_args *pa = aux;
/*
- * These devices are mislabeled. They are not PCI bridges.
+ * This device is mislabeled. It is not a PCI bridge.
*/
- if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_VIATECH &&
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VT82C586_PWR) ||
- (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ATI &&
- (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_RS480_PCIE_2 ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_RS480_PCIE_3)))
+ if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_VIATECH &&
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VT82C586_PWR)
return (0);
/*
* Check the ID register to see that it's a PCI bridge.