1. Add ofw_pci.h with definitions for the OpenFirmware PCI bindings

2. Add OF_getprop_alloc(), a helper function that will malloc() a sufficient
   amount of memory and then retrieve a property value into it.

Approved by:	benno
Obtained from:	NetBSD (1)

3 files changed, 143 insertions, 0 deletions

diff --git a/sys/dev/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h
new file mode 100644
index 0000000..f810be9
--- /dev/null
+++ b/sys/dev/ofw/ofw_pci.h
@@ -0,0 +1,110 @@
+/*-
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	from: NetBSD: ofw_pci.h,v 1.3 2001/02/16 14:16:30 mrg Exp
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _DEV_OFW_OFW_PCI_H_
+#define	_DEV_OFW_OFW_PCI_H_
+
+/*
+ * PCI Bus Binding to:
+ *
+ * IEEE Std 1275-1994
+ * Standard for Boot (Initialization Configuration) Firmware
+ *
+ * Revision 2.1
+ */
+
+/*
+ * Section 2.2.1. Physical Address Formats
+ *
+ * A PCI physical address is represented by 3 address cells:
+ *
+ *	phys.hi cell:	npt000ss bbbbbbbb dddddfff rrrrrrrr
+ *	phys.mid cell:	hhhhhhhh hhhhhhhh hhhhhhhh hhhhhhhh
+ *	phys.lo cell:	llllllll llllllll llllllll llllllll
+ *
+ *	n	nonrelocatable
+ *	p	prefectable
+ *	t	aliased below 1MB (memory) or 64k (i/o)
+ *	ss	space code
+ *	b	bus number
+ *	d	device number
+ *	f	function number
+ *	r	register number
+ *	h	high 32-bits of PCI address
+ *	l	low 32-bits of PCI address
+ */
+
+#define	OFW_PCI_PHYS_HI_NONRELOCATABLE	0x80000000
+#define	OFW_PCI_PHYS_HI_PREFETCHABLE	0x40000000
+#define	OFW_PCI_PHYS_HI_ALIASED		0x20000000
+#define	OFW_PCI_PHYS_HI_SPACEMASK	0x03000000
+#define	OFW_PCI_PHYS_HI_BUSMASK		0x00ff0000
+#define	OFW_PCI_PHYS_HI_BUSSHIFT	16
+#define	OFW_PCI_PHYS_HI_DEVICEMASK	0x0000f800
+#define	OFW_PCI_PHYS_HI_DEVICESHIFT	11
+#define	OFW_PCI_PHYS_HI_FUNCTIONMASK	0x00000700
+#define	OFW_PCI_PHYS_HI_FUNCTIONSHIFT	8
+#define	OFW_PCI_PHYS_HI_REGISTERMASK	0x000000ff
+
+#define	OFW_PCI_PHYS_HI_SPACE_CONFIG	0x00000000
+#define	OFW_PCI_PHYS_HI_SPACE_IO	0x01000000
+#define	OFW_PCI_PHYS_HI_SPACE_MEM32	0x02000000
+#define	OFW_PCI_PHYS_HI_SPACE_MEM64	0x03000000
+
+#define OFW_PCI_PHYS_HI_BUS(hi) \
+	(((hi) & OFW_PCI_PHYS_HI_BUSMASK) >> OFW_PCI_PHYS_HI_BUSSHIFT)
+#define OFW_PCI_PHYS_HI_DEVICE(hi) \
+	(((hi) & OFW_PCI_PHYS_HI_DEVICEMASK) >> OFW_PCI_PHYS_HI_DEVICESHIFT)
+#define OFW_PCI_PHYS_HI_FUNCTION(hi) \
+	(((hi) & OFW_PCI_PHYS_HI_FUNCTIONMASK) >> OFW_PCI_PHYS_HI_FUNCTIONSHIFT)
+
+/*
+ * This has the 3 32bit cell values, plus 2 more to make up a 64-bit size.
+ */
+struct ofw_pci_register {
+	u_int32_t	phys_hi;
+	u_int32_t	phys_mid;
+	u_int32_t	phys_lo;
+	u_int32_t	size_hi;
+	u_int32_t	size_lo;
+};
+
+#endif /* _DEV_OFW_OFW_PCI_H_ */
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index 61b6391..7704109 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -58,12 +58,16 @@
  */
 
 #include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/systm.h>
 
 #include <machine/stdarg.h>
 
 #include <dev/ofw/openfirm.h>
 
+MALLOC_DEFINE(M_OFWPROP, "openfirm", "OpenFirmware properties");
+
 static ihandle_t stdin;
 static ihandle_t stdout;
 
@@ -286,6 +290,30 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen)
 	return args.size;
 }
 
+/*
+ * Store the value of a property of a package into newly allocated memory (using
+ * the M_OFWPROP malloc pool and M_WAITOK). elsz is the size of a single element,
+ * the number of elements is return in number.
+ */
+int
+OF_getprop_alloc(phandle_t package, char *propname, int elsz, void **buf)
+{
+	int len;
+
+	*buf = NULL;
+	if ((len = OF_getproplen(package, propname)) == -1 ||
+	    len % elsz != 0)
+		return (-1);
+
+	*buf = malloc(len, M_OFWPROP, M_WAITOK);
+	if (OF_getprop(package, propname, *buf, len) == -1) {
+		free(*buf, M_OFWPROP);
+		*buf = NULL;
+		return (-1);
+	}
+	return (len / elsz);
+}
+
 /* Get the next property of a package. */
 int
 OF_nextprop(phandle_t package, char *previous, char *buf)
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index d3760a9..f02a42c 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -66,6 +66,9 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#include <sys/malloc.h>
+
+MALLOC_DECLARE(M_OFWPROP);
 
 typedef unsigned long cell_t;
 
@@ -96,6 +99,8 @@ phandle_t	OF_parent(phandle_t);
 phandle_t	OF_instance_to_package(ihandle_t);
 int		OF_getproplen(phandle_t, char *);
 int		OF_getprop(phandle_t, char *, void *, int);
+int		OF_getprop_alloc(phandle_t package, char *propname, int elsz,
+    void **buf);
 int		OF_nextprop(phandle_t, char *, char *);
 int		OF_setprop(phandle_t, char *, void *, int);
 int		OF_canon(const char *, char *, int);