summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2010-12-05 15:15:14 +0000
committerkettenis <kettenis@openbsd.org>2010-12-05 15:15:14 +0000
commitd40d850375dd09a7a14cb2bb582cd54f1b254586 (patch)
treeffa05bea08d1dd78c1b5fe14751c6539bdff2cd2
parentRewrite the mbrtowc(3) man page so we can make sense of this function. (diff)
downloadwireguard-openbsd-d40d850375dd09a7a14cb2bb582cd54f1b254586.tar.xz
wireguard-openbsd-d40d850375dd09a7a14cb2bb582cd54f1b254586.zip
PCIe based sparc64 machines have always supported access to the extended PCIe
configuration space. So on pyro(4) and vpci(4) return the size appropriate for the extended PCIe configuration space. ok miod@
-rw-r--r--sys/arch/sparc64/dev/pyro.c4
-rw-r--r--sys/arch/sparc64/dev/vpci.c4
-rw-r--r--sys/dev/pci/pcireg.h3
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/sparc64/dev/pyro.c b/sys/arch/sparc64/dev/pyro.c
index 2e58939deba..aad1360d6e6 100644
--- a/sys/arch/sparc64/dev/pyro.c
+++ b/sys/arch/sparc64/dev/pyro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pyro.c,v 1.19 2010/12/04 17:06:32 miod Exp $ */
+/* $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -276,7 +276,7 @@ pyro_print(void *aux, const char *p)
int
pyro_conf_size(pci_chipset_tag_t pc, pcitag_t tag)
{
- return PCI_CONFIG_SPACE_SIZE;
+ return PCIE_CONFIG_SPACE_SIZE;
}
pcireg_t
diff --git a/sys/arch/sparc64/dev/vpci.c b/sys/arch/sparc64/dev/vpci.c
index ebe37225694..147c3e6a6e4 100644
--- a/sys/arch/sparc64/dev/vpci.c
+++ b/sys/arch/sparc64/dev/vpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vpci.c,v 1.5 2010/12/04 17:06:32 miod Exp $ */
+/* $OpenBSD: vpci.c,v 1.6 2010/12/05 15:15:14 kettenis Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
*
@@ -206,7 +206,7 @@ vpci_print(void *aux, const char *p)
int
vpci_conf_size(pci_chipset_tag_t pc, pcitag_t tag)
{
- return PCI_CONFIG_SPACE_SIZE;
+ return PCIE_CONFIG_SPACE_SIZE;
}
pcireg_t
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 97eeebdc927..507f92e1bea 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcireg.h,v 1.38 2010/12/04 17:06:29 miod Exp $ */
+/* $OpenBSD: pcireg.h,v 1.39 2010/12/05 15:15:14 kettenis Exp $ */
/* $NetBSD: pcireg.h,v 1.26 2000/05/10 16:58:42 thorpej Exp $ */
/*
@@ -41,6 +41,7 @@
*/
#define PCI_CONFIG_SPACE_SIZE 0x100
+#define PCIE_CONFIG_SPACE_SIZE 0x1000
/*
* Device identification register; contains a vendor ID and a device ID.