1 files changed, 82 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index af21306e2ef9..d21658140b6e 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -51,6 +51,13 @@ static struct device ibmebus_bus_device = { /* fake "parent" device */
 
 struct bus_type ibmebus_bus_type;
 
+/* These devices will automatically be added to the bus during init */
+static struct of_device_id builtin_matches[] = {
+        { .compatible = "IBM,lhca" },
+        { .compatible = "IBM,lhea" },
+        {},
+};
+
 static void *ibmebus_alloc_coherent(struct device *dev,
                                     size_t size,
                                     dma_addr_t *dma_handle,
@@ -125,6 +132,67 @@ static struct dma_mapping_ops ibmebus_dma_ops = {
         .dma_supported  = ibmebus_dma_supported,
 };
 
+static int ibmebus_match_path(struct device *dev, void *data)
+{
+        struct device_node *dn = to_of_device(dev)->node;
+        return (dn->full_name &&
+                (strcasecmp((char *)data, dn->full_name) == 0));
+}
+
+static int ibmebus_match_node(struct device *dev, void *data)
+{
+
 *                        defines the generic type and initializers
 *
 *  linux/spinlock_up.h:
 *                        contains the arch_spin_*()/etc. version of UP
 *                        builds. (which are NOPs on non-debug, non-preempt
 *                        builds)
 *
 *   (included on UP-non-debug builds:)
 *
 *  linux/spinlock_api_up.h:
 *                        builds the _spin_*() APIs.
 *
 *  linux/spinlock.h:     builds the final spin_*() APIs.
 */

#include <linux/typecheck.h>
#include <linux/preempt.h>
#include <linux/linkage.h>
#include <linux/compiler.h>
#include <linux/irqflags.h>
#include <linux/thread_info.h>
#include <linux/kernel.h>
#include <linux/stringify.h>
#include <linux/bottom_half.h>
#include <asm/barrier.h>


/*
 * Must define these before including other files, inline functions need them
 */
#define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME

#define LOCK_SECTION_START(extra)               \
        ".subsection 1\n\t"                     \
        extra                                   \
        ".ifndef " LOCK_SECTION_NAME "\n\t"     \
        LOCK_SECTION_NAME ":\n\t"               \
        ".endif\n"

#define LOCK_SECTION_END                        \
        ".previous\n\t"

#define __lockfunc __attribute__((section(".spinlock.text")))

/*
 * Pull the arch_spinlock_t and arch_rwlock_t definitions:
 */
#include <linux/spinlock_types.h>

/*
 * Pull the arch_spin*() functions/declarations (UP-nondebug doesn't need them):
 */
#ifdef CONFIG_SMP
# include <asm/spinlock.h>
#else
# include <linux/spinlock_up.h>
#endif

#ifdef CONFIG_DEBUG_SPINLOCK
  extern void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
				   struct lock_class_key *key);
# define raw_spin_lock_init(lock)				\
do {								\
	static struct lock_class_key __key;			\
								\
	__raw_spin_lock_init((lock), #lock, &__key);		\
} while (0)

#else
# define raw_spin_lock_init(lock)				\
	do { *(lock) = __RAW_SPIN_LOCK_UNLOCKED(lock); } while (0)
#endif

#define raw_spin_is_locked(lock)	arch_spin_is_locked(&(lock)->raw_lock)

#ifdef CONFIG_GENERIC_LOCKBREAK
#define raw_spin_is_contended(lock) ((lock)->break_lock)
#else

#ifdef arch_spin_is_contended
#define raw_spin_is_contended(lock)	arch_spin_is_contended(&(lock)->raw_lock)
#else
#define raw_spin_is_contended(lock)	(((void)(lock), 0))
#endif /*arch_spin_is_contended*/
#endif

/*
 * Despite its name it doesn't necessarily has to be a full barrier.
 * It should only guarantee that a STORE before the critical section
 * can not be reordered with a LOAD inside this section.
 * spin_lock() is the one-way barrier, this LOAD can not escape out
 * of the region. So the default implementation simply ensures that
 * a STORE can not move into the critical section, smp_wmb() should
 * serialize it with another STORE done by spin_lock().
 */
#ifndef smp_mb__before_spinlock
#define smp_mb__before_spinlock()	smp_wmb()
#endif

/**
 * raw_spin_unlock_wait - wait until the spinlock gets unlocked
 * @lock: the spinlock in question.
 */
#define raw_spin_unlock_wait(lock)	arch_spin_unlock_wait(&(lock)->raw_lock)

#ifdef CONFIG_DEBUG_SPINLOCK
 extern void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock);
#define do_raw_spin_lock_flags(lock, flags) do_raw_spin_lock(lock)
 extern int do_raw_spin_trylock(raw_spinlock_t *lock);
 extern void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock);
#else
static inline void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock)
{
	__acquire(lock);
	arch_spin_lock(&lock->raw_lock);
}

static inline void
do_raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long *flags) __acquires(lock)
{
	__acquire(lock);
	arch_spin_lock_flags(&lock->raw_lock, *flags);
}                              ibmebus_match_node))
+                        continue;
+
+                ret = ibmebus_create_device(child);
+                if (ret) {
+                        printk(KERN_ERR "%s: failed to create device (%i)",
+                               __FUNCTION__, ret);
+                        of_node_put(child);
+                        break;
+                }
+        }
+
+        of_node_put(root);
+        return ret;
+}
+
 int ibmebus_register_driver(struct ibmebus_driver *drv)
 {
         return 0;
@@ -173,18 +241,6 @@ static struct device_attribute ibmebus_dev_attrs[] = {
         __ATTR_NULL
 };
 
-static int ibmebus_match_path(struct device *dev, void *data)
-{
-        int rc;
-        struct device_node *dn =
-                of_node_get(to_ibmebus_dev(dev)->ofdev.node);
-
-        rc = (dn->full_name && (strcasecmp((char*)data, dn->full_name) == 0));
-
-        of_node_put(dn);
-        return rc;
-}
-
 static char *ibmebus_chomp(const char *in, size_t count)
 {
         char *out = kmalloc(count + 1, GFP_KERNEL);
@@ -204,9 +260,8 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                                    const char *buf, size_t count)
 {
         struct device_node *dn = NULL;
-        struct ibmebus_dev *dev;
         char *path;
-        ssize_t rc;
+        ssize_t rc = 0;
 
         path = ibmebus_chomp(buf, count);
         if (!path)
@@ -221,9 +276,8 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
         }
 
         if ((dn = of_find_node_by_path(path))) {
-/*              dev = ibmebus_register_device_node(dn); */
+                rc = ibmebus_create_device(dn);
                 of_node_put(dn);
-                rc = IS_ERR(dev) ? PTR_ERR(dev) : count;
         } else {
                 printk(KERN_WARNING "%s: no such device node: %s\n",
                        __FUNCTION__, path);
@@ -232,7 +286,9 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
 
 out:
         kfree(path);
-        return rc;
+        if (rc)
+                return rc;
+        return count;
 }
 
 static ssize_t ibmebus_store_remove(struct bus_type *bus,
@@ -247,7 +303,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
 
         if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path,
                                    ibmebus_match_path))) {
-/*              ibmebus_unregister_device(dev); */
+                of_device_unregister(to_of_device(dev));
 
                 kfree(path);
                 return count;
@@ -267,6 +323,7 @@ static struct bus_attribute ibmebus_bus_attrs[] = {
 };
 
 struct bus_type ibmebus_bus_type = {
+        .uevent    = of_device_uevent,
         .dev_attrs = ibmebus_dev_attrs,
         .bus_attrs = ibmebus_bus_attrs
 };
@@ -294,6 +351,13 @@ static int __init ibmebus_bus_init(void)
                 return err;
         }
 
+        err = ibmebus_create_devices(builtin_matches);
+        if (err) {
+                device_unregister(&ibmebus_bus_device);
+                bus_unregister(&ibmebus_bus_type);
+                return err;
+        }
+
         return 0;
 }
 postcore_initcall(ibmebus_bus_init);