[SPARC64]: Abstract out mdesc accesses for better MD update handling.

Since we have to be able to handle MD updates, having an in-tree
set of data structures representing the MD objects actually makes
things more painful.

The MD itself is easy to parse, and we can implement the existing
interfaces using direct parsing of the MD binary image.

The MD is now reference counted, so accesses have to now take the
form:

	handle = mdesc_grab();

	... operations on MD ...

	mdesc_release(handle);

The only remaining issue are cases where code holds on to references
to MD property values.  mdesc_get_property() returns a direct pointer
to the property value, most cases just pull in the information they
need and discard the pointer, but there are few that use the pointer
directly over a long lifetime.  Those will be fixed up in a subsequent
changeset.

A preliminary handler for MD update events from domain services is
there, it is rudimentry but it works and handles all of the reference
counting.  It does not check the generation number of the MDs,
and it does not generate a "add/delete" list for notification to
interesting parties about MD changes but that will be forthcoming.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 48 insertions, 42 deletions

diff --git a/include/asm-sparc64/mdesc.h b/include/asm-sparc64/mdesc.h
index c6383982b53d..bbb0c0bed486 100644
--- a/include/asm-sparc64/mdesc.h
+++ b/include/asm-sparc64/mdesc.h
@@ -4,36 +4,43 @@
 #include <linux/types.h>
 #include <asm/prom.h>
 
-struct mdesc_node;
-struct mdesc_arc {
-        const char              *name;
-        struct mdesc_node       *arc;
-};
-
-struct mdesc_node {
-        const char              *name;
-        u64                     node;
-        unsigned int            unique_id;
-        unsigned int            num_arcs;
-        unsigned int            irqs[2];
-        struct property         *properties;
-        struct mdesc_node       *hash_next;
-        struct mdesc_node       *allnodes_next;
-        struct mdesc_arc        arcs[0];
-};
-
-extern struct mdesc_node *md_find_node_by_name(struct mdesc_node *from,
-                                               const char *name);
-#define md_for_each_node_by_name(__mn, __name) \
-        for (__mn = md_find_node_by_name(NULL, __name); __mn; \
-             __mn = md_find_node_by_name(__mn, __name))
-
-extern struct property *md_find_property(const struct mdesc_node *mp,
-                                         const char *name,
-                                         int *lenp);
-extern const void *md_get_property(const struct mdesc_node *mp,
-                                   const char *name,
-                                   int *lenp);
+struct mdesc_handle;
+
+/* Machine description operations are to be surrounded by grab and
+ * release calls.  The mdesc_handle returned from the grab is
+ * the first argument to all of the operational calls that work
+ * on mdescs.
+ */
+extern struct mdesc_handle *mdesc_grab(void);
+extern void mdesc_release(struct mdesc_handle *);
+
+#define MDESC_NODE_NULL         (~(u64)0)
+
+extern u64 mdesc_node_by_name(struct mdesc_handle *handle,
+                              u64 from_node, const char *name);
+#define mdesc_for_each_node_by_name(__hdl, __node, __name) \
+        for (__node = mdesc_node_by_name(__hdl, MDESC_NODE_NULL, __name); \
+             (__node) != MDESC_NODE_NULL; \
+             __node = mdesc_node_by_name(__hdl, __node, __name))
+
+extern const void *mdesc_get_property(struct mdesc_handle *handle,
+                                      u64 node, const char *name, int *lenp);
+
+#define MDESC_ARC_TYPE_FWD      "fwd"
+#define MDESC_ARC_TYPE_BACK     "back"
+
+extern u64 mdesc_next_arc(struct mdesc_handle *handle, u64 from,
+                          const char *arc_type);
+#define mdesc_for_each_arc(__arc, __hdl, __node, __type) \
+        for (__arc = mdesc_next_arc(__hdl, __node, __type); \
+             (__arc) != MDESC_NODE_NULL; \
+             __arc = mdesc_next_arc(__hdl, __arc, __type))
+
+extern u64 mdesc_arc_target(struct mdesc_handle *hp, u64 arc);
+
+extern const char *mdesc_node_name(struct mdesc_handle *hp, u64 node);
+
+extern void mdesc_update(void);
 
 extern void sun4v_mdesc_init(void);
 
diff --git a/include/asm-sparc64/vio.h b/include/asm-sparc64/vio.h
index 47c3da76dcb8..a8a53e6fc250 100644
--- a/include/asm-sparc64/vio.h
+++ b/include/asm-sparc64/vio.h
@@ -265,13 +265,18 @@ static inline u32 vio_dring_avail(struct vio_dring_state *dr,
 }
 
 struct vio_dev {
-        struct mdesc_node       *mp;
+        u64                     mp;
         struct device_node      *dp;
 
         const char              *type;
         const char              *compat;
         int                     compat_len;
 
+        unsigned long           channel_id;
+
+        unsigned int            tx_irq;
+        unsigned int            rx_irq;
+
         struct device           dev;
 };
 
@@ -345,16 +350,10 @@ struct vio_driver_state {
 
         struct vio_dev          *vdev;
 
-        unsigned long           channel_id;
-        unsigned int            tx_irq;
-        unsigned int            rx_irq;
-
         struct timer_list       timer;
 
         struct vio_version      ver;
 
-        struct mdesc_node       *endpoint;
-
         struct vio_version      *ver_table;
         int                     ver_table_entries;
 
@@ -365,7 +364,8 @@ struct vio_driver_state {
 
 #define viodbg(TYPE, f, a...) \
 do {    if (vio->debug & VIO_DEBUG_##TYPE) \
-                printk(KERN_INFO "vio: ID[%lu] " f, vio->channel_id, ## a); \
+                printk(KERN_INFO "vio: ID[%lu] " f, \
+                       vio->vdev->channel_id, ## a); \
 } while (0)
 
 extern int vio_register_driver(struct vio_driver *drv);
@@ -392,11 +392,10 @@ extern int vio_ldc_alloc(struct vio_driver_state *vio,
                          struct ldc_channel_config *base_cfg, void *event_arg);
 extern void vio_ldc_free(struct vio_driver_state *vio);
 extern int vio_driver_init(struct vio_driver_state *vio, struct vio_dev *vdev,
-                           u8 dev_class, struct mdesc_node *channel_endpoint,
-                           struct vio_version *ver_table, int ver_table_size,
-                           struct vio_driver_ops *ops, char *name);
+                           u8 dev_class, struct vio_version *ver_table,
+                           int ver_table_size, struct vio_driver_ops *ops,
+                           char *name);
 
-extern struct mdesc_node *vio_find_endpoint(struct vio_dev *vdev);
 extern void vio_port_up(struct vio_driver_state *vio);
 
 #endif /* _SPARC64_VIO_H */