- Introduce an ofw_bus kobj-interface for retrieving the OFW node and a

  subset ("compatible", "device_type", "model" and "name") of the standard
  properties in drivers for devices on Open Firmware supported busses. The
  standard properties "reg", "interrupts" und "address" are not covered by
  this interface because they are only of interest in the respective bridge
  code. There's a remaining standard property "status" which is unclear how
  to support properly but which also isn't used in FreeBSD at present.
  This ofw_bus kobj-interface allows to replace the various (ebus_get_node(),
  ofw_pci_get_node(), etc.) and partially inconsistent (central_get_type()
  vs. sbus_get_device_type(), etc.) existing IVAR ones with a common one.
  This in turn allows to simplify and remove code-duplication in drivers for
  devices that can hang off of more than one OFW supported bus.
- Convert the sparc64 Central, EBus, FHC, PCI and SBus bus drivers and the
  drivers for their children to use the ofw_bus kobj-interface. The IVAR-
  interfaces of the Central, EBus and FHC are entirely replaced by this. The
  PCI bus driver used its own kobj-interface and now also uses the ofw_bus
  one. The IVARs special to the SBus, e.g. for retrieving the burst size,
  remain.
  Beware: this causes an ABI-breakage for modules of drivers which used the
  IVAR-interfaces, i.e. esp(4), hme(4), isp(4) and uart(4), which need to be
  recompiled.
  The style-inconsistencies introduced in some of the bus drivers will be
  fixed by tmm@ in a generic clean-up of the respective drivers later (he
  requested to add the changes in the "new" style).
- Convert the powerpc MacIO bus driver and the drivers for its children to
  use the ofw_bus kobj-interface. This invloves removing the IVARs related
  to the "reg" property which were unused and a leftover from the NetBSD
  origini of the code. There's no ABI-breakage caused by this because none
  of these driver are currently built as modules.
  There are other powerpc bus drivers which can be converted to the ofw_bus
  kobj-interface, e.g. the PCI bus driver, which should be done together
  with converting powerpc to use the OFW PCI code from sparc64.
- Make the SBus and FHC front-end of zs(4) and the sparc64 eeprom(4) take
  advantage of the ofw_bus kobj-interface and simplify them a bit.

Reviewed by:	grehan, tmm
Approved by:	re (scottl)
Discussed with:	tmm
Tested with:	Sun AX1105, AXe, Ultra 2, Ultra 60; PPC cross-build on i386

4 files changed, 75 insertions, 65 deletions

diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c
index def8904..69e7aab 100644
--- a/sys/sparc64/fhc/fhc.c
+++ b/sys/sparc64/fhc/fhc.c
@@ -33,6 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/pcpu.h>
 
+#include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
@@ -56,6 +57,8 @@ struct fhc_clr {
 };
 
 struct fhc_devinfo {
+	char			*fdi_compat;
+	char			*fdi_model;
 	char			*fdi_name;
 	char			*fdi_type;
 	phandle_t		fdi_node;
@@ -127,8 +130,12 @@ fhc_attach(device_t dev)
 			    M_WAITOK | M_ZERO);
 			fdi->fdi_name = name;
 			fdi->fdi_node = child;
+			OF_getprop_alloc(child, "compatible", 1,
+			    (void **)&fdi->fdi_compat);
 			OF_getprop_alloc(child, "device_type", 1,
 			    (void **)&fdi->fdi_type);
+			OF_getprop_alloc(child, "model", 1,
+			    (void **)&fdi->fdi_model);
 			resource_list_init(&fdi->fdi_rl);
 			nreg = OF_getprop_alloc(child, "reg", sizeof(*reg),
 			    (void **)&reg);
@@ -177,47 +184,6 @@ fhc_probe_nomatch(device_t dev, device_t child)
 }
 
 int
-fhc_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
-{
-	struct fhc_devinfo *fdi;
-
-	if ((fdi = device_get_ivars(child)) == 0)
-		return (ENOENT);
-	switch (which) {
-	case FHC_IVAR_NAME:
-		*result = (uintptr_t)fdi->fdi_name;
-		break;
-	case FHC_IVAR_NODE:
-		*result = fdi->fdi_node;
-		break;
-	case FHC_IVAR_TYPE:
-		*result = (uintptr_t)fdi->fdi_type;
-		break;
-	default:
-		return (ENOENT);
-	}
-	return (0);
-}
-
-int
-fhc_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
-{
-	struct fhc_devinfo *fdi;
-
-	if ((fdi = device_get_ivars(child)) == 0)
-		return (ENOENT);
-	switch (which) {
-	case FHC_IVAR_NAME:
-	case FHC_IVAR_NODE:
-	case FHC_IVAR_TYPE:
-		return (EINVAL);
-	default:
-		return (ENOENT);
-	}
-	return (0);
-}
-
-int
 fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags,
     driver_intr_t *func, void *arg, void **cookiep)
 {
@@ -372,3 +338,48 @@ fhc_release_resource(device_t bus, device_t child, int type, int rid,
 	rle->res = NULL;
 	return (error);
 }
+
+const char *
+fhc_get_compat(device_t bus, device_t dev)
+{   
+	struct fhc_devinfo *dinfo;
+
+	dinfo = device_get_ivars(dev);
+	return (dinfo->fdi_compat);
+}
+
+const char *
+fhc_get_model(device_t bus, device_t dev)
+{
+	struct fhc_devinfo *dinfo;
+
+	dinfo = device_get_ivars(dev);
+	return (dinfo->fdi_model);
+}
+
+const char *
+fhc_get_name(device_t bus, device_t dev)
+{
+	struct fhc_devinfo *dinfo;
+
+	dinfo = device_get_ivars(dev);
+	return (dinfo->fdi_name);
+}
+
+phandle_t
+fhc_get_node(device_t bus, device_t dev)
+{
+	struct fhc_devinfo *dinfo;
+
+	dinfo = device_get_ivars(dev);
+	return (dinfo->fdi_node);
+}
+
+const char *
+fhc_get_type(device_t bus, device_t dev)
+{
+	struct fhc_devinfo *dinfo;
+
+	dinfo = device_get_ivars(dev);
+	return (dinfo->fdi_type);
+}
diff --git a/sys/sparc64/fhc/fhc_central.c b/sys/sparc64/fhc/fhc_central.c
index ce35c0d..50dc669 100644
--- a/sys/sparc64/fhc/fhc_central.c
+++ b/sys/sparc64/fhc/fhc_central.c
@@ -33,6 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 
+#include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
@@ -40,7 +41,6 @@
 
 #include <sys/rman.h>
 
-#include <sparc64/central/centralvar.h>
 #include <sparc64/fhc/fhcreg.h>
 #include <sparc64/fhc/fhcvar.h>
 #include <sparc64/sbus/ofw_sbus.h>
@@ -56,8 +56,6 @@ static device_method_t fhc_central_methods[] = {
 	/* Bus interface. */
 	DEVMETHOD(bus_print_child,	fhc_print_child),
 	DEVMETHOD(bus_probe_nomatch,	fhc_probe_nomatch),
-	DEVMETHOD(bus_read_ivar,	fhc_read_ivar),
-	DEVMETHOD(bus_write_ivar,	fhc_write_ivar),
 	DEVMETHOD(bus_setup_intr,	fhc_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	fhc_teardown_intr),
 	DEVMETHOD(bus_alloc_resource,	fhc_alloc_resource),
@@ -65,6 +63,13 @@ static device_method_t fhc_central_methods[] = {
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_compat,	fhc_get_compat),
+	DEVMETHOD(ofw_bus_get_model,	fhc_get_model),
+	DEVMETHOD(ofw_bus_get_name,	fhc_get_name),
+	DEVMETHOD(ofw_bus_get_node,	fhc_get_node),
+	DEVMETHOD(ofw_bus_get_type,	fhc_get_type),
+
 	{ NULL, NULL }
 };
 
@@ -82,7 +87,7 @@ static int
 fhc_central_probe(device_t dev)
 {
 
-	if (strcmp(central_get_name(dev), "fhc") == 0) {
+	if (strcmp(ofw_bus_get_name(dev), "fhc") == 0) {
 		device_set_desc(dev, "fhc");
 		return (fhc_probe(dev));
 	}
@@ -103,7 +108,7 @@ fhc_central_attach(device_t dev)
 	int i;
 
 	sc = device_get_softc(dev);
-	node = central_get_node(dev);
+	node = ofw_bus_get_node(dev);
 	sc->sc_node = node;
 	sc->sc_flags |= FHC_CENTRAL;
 
diff --git a/sys/sparc64/fhc/fhc_nexus.c b/sys/sparc64/fhc/fhc_nexus.c
index f5d0951..4943329 100644
--- a/sys/sparc64/fhc/fhc_nexus.c
+++ b/sys/sparc64/fhc/fhc_nexus.c
@@ -33,6 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 
+#include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
@@ -56,8 +57,6 @@ static device_method_t fhc_nexus_methods[] = {
 	/* Bus interface. */
 	DEVMETHOD(bus_print_child,	fhc_print_child),
 	DEVMETHOD(bus_probe_nomatch,	fhc_probe_nomatch),
-	DEVMETHOD(bus_read_ivar,	fhc_read_ivar),
-	DEVMETHOD(bus_write_ivar,	fhc_write_ivar),
 	DEVMETHOD(bus_setup_intr,	fhc_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	fhc_teardown_intr),
 	DEVMETHOD(bus_alloc_resource,	fhc_alloc_resource),
@@ -65,6 +64,13 @@ static device_method_t fhc_nexus_methods[] = {
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 
+        /* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_compat,	fhc_get_compat),
+	DEVMETHOD(ofw_bus_get_model,	fhc_get_model),
+	DEVMETHOD(ofw_bus_get_name,	fhc_get_name),
+	DEVMETHOD(ofw_bus_get_node,	fhc_get_node),
+	DEVMETHOD(ofw_bus_get_type,	fhc_get_type),
+
 	{ NULL, NULL }
 };
 
diff --git a/sys/sparc64/fhc/fhcvar.h b/sys/sparc64/fhc/fhcvar.h
index ad4a72d..5566565 100644
--- a/sys/sparc64/fhc/fhcvar.h
+++ b/sys/sparc64/fhc/fhcvar.h
@@ -29,12 +29,6 @@
 #ifndef _SPARC64_FHC_FHCVAR_H_
 #define	_SPARC64_FHC_FHCVAR_H_
 
-enum fhc_device_ivars {
-	FHC_IVAR_NAME,
-	FHC_IVAR_NODE,
-	FHC_IVAR_TYPE
-};
-
 #define	FHC_CENTRAL		(1<<0)
 
 struct fhc_softc {
@@ -54,22 +48,16 @@ int fhc_attach(device_t dev);
 
 int fhc_print_child(device_t dev, device_t child);
 void fhc_probe_nomatch(device_t dev, device_t child);
-int fhc_read_ivar(device_t, device_t, int, uintptr_t *);
-int fhc_write_ivar(device_t, device_t, int, uintptr_t);
 int fhc_setup_intr(device_t, device_t, struct resource *, int, driver_intr_t *,
     void *, void **);
 int fhc_teardown_intr(device_t, device_t, struct resource *, void *);
 struct resource *fhc_alloc_resource(device_t, device_t, int, int *, u_long,
     u_long, u_long, u_int);
 int fhc_release_resource(device_t, device_t, int, int, struct resource *);
-
-#define	FHC_ACCESSOR(var, ivar, type) \
-	__BUS_ACCESSOR(fhc, var, FHC, ivar, type)
-
-FHC_ACCESSOR(name,	NAME,	char *)
-FHC_ACCESSOR(node,	NODE,	phandle_t)
-FHC_ACCESSOR(type,	TYPE,	char *)
-
-#undef FHC_ACCESSOR
+ofw_bus_get_compat_t fhc_get_compat;
+ofw_bus_get_model_t fhc_get_model;
+ofw_bus_get_name_t fhc_get_name;
+ofw_bus_get_node_t fhc_get_node;
+ofw_bus_get_type_t fhc_get_type;
 
 #endif