w1: process w1 netlink commands in w1_process thread

[karo-tx-linux.git] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index ca8081a101d64ac34fadbc872aeaf3e0898c4fc8..a096ef40119e1165ae49f531a32e6f2c73eed50a 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -58,6 +58,7 @@ struct w1_reg_num
 #define W1_RESUME_CMD          0xA5
 
 #define W1_SLAVE_ACTIVE                0
+#define W1_SLAVE_DETACH                1
 
 struct w1_slave
 {
@@ -74,7 +75,6 @@ struct w1_slave
        struct w1_family        *family;
        void                    *family_data;
        struct device           dev;
-       struct completion       released;
 };
 
 typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
@@ -150,23 +150,43 @@ struct w1_bus_master
 
        /** Really nice hardware can handles the different types of ROM search
         *  w1_master* is passed to the slave found callback.
+        *  u8 is search_type, W1_SEARCH or W1_ALARM_SEARCH
         */
        void            (*search)(void *, struct w1_master *,
                u8, w1_slave_found_callback);
 };
 
+/**
+ * enum w1_master_flags - bitfields used in w1_master.flags
+ * @W1_ABORT_SEARCH: abort searching early on shutdown
+ * @W1_WARN_MAX_COUNT: limit warning when the maximum count is reached
+ */
+enum w1_master_flags {
+       W1_ABORT_SEARCH = 0,
+       W1_WARN_MAX_COUNT = 1,
+};
+
 struct w1_master
 {
        struct list_head        w1_master_entry;
        struct module           *owner;
        unsigned char           name[W1_MAXNAMELEN];
+       /* list_mutex protects just slist and async_list so slaves can be
+        * searched for and async commands added while the master has
+        * w1_master.mutex locked and is operating on the bus.
+        * lock order w1_mlock, w1_master.mutex, w1_master_list_mutex
+        */
+       struct mutex            list_mutex;
        struct list_head        slist;
+       struct list_head        async_list;
        int                     max_slave_count, slave_count;
        unsigned long           attempts;
        int                     slave_ttl;
        int                     initialized;
        u32                     id;
        int                     search_count;
+       /* id to start searching on, to continue a search or 0 to restart */
+       u64                     search_id;
 
        atomic_t                refcnt;
 
@@ -178,6 +198,8 @@ struct w1_master
        /** 5V strong pullup duration in milliseconds, zero disabled. */
        int                     pullup_duration;
 
+       long                    flags;
+
        struct task_struct      *thread;
        struct mutex            mutex;
        struct mutex            bus_mutex;
@@ -190,14 +212,34 @@ struct w1_master
        u32                     seq;
 };
 
+/**
+ * struct w1_async_cmd - execute callback from the w1_process kthread
+ * @async_entry: link entry
+ * @cb: callback function, must list_del and destroy this list before
+ * returning
+ *
+ * When inserted into the w1_master async_list, w1_process will execute
+ * the callback.  Embed this into the structure with the command details.
+ */
+struct w1_async_cmd {
+       struct list_head        async_entry;
+       void (*cb)(struct w1_master *dev, struct w1_async_cmd *async_cmd);
+};
+
 int w1_create_master_attributes(struct w1_master *);
 void w1_destroy_master_attributes(struct w1_master *master);
 void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);
 void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);
+/* call w1_unref_slave to release the reference counts w1_search_slave added */
 struct w1_slave *w1_search_slave(struct w1_reg_num *id);
+/* decrements the reference on sl->master and sl, and cleans up if zero
+ * returns the reference count after it has been decremented */
+int w1_unref_slave(struct w1_slave *sl);
 void w1_slave_found(struct w1_master *dev, u64 rn);
 void w1_search_process_cb(struct w1_master *dev, u8 search_type,
        w1_slave_found_callback cb);
+struct w1_slave *w1_slave_search_device(struct w1_master *dev,
+       struct w1_reg_num *rn);
 struct w1_master *w1_search_master_id(u32 id);
 
 /* Disconnect and reconnect devices in the given family.  Used for finding
@@ -206,7 +248,9 @@ struct w1_master *w1_search_master_id(u32 id);
  * has just been registered, to 0 when it has been unregistered.
  */
 void w1_reconnect_slaves(struct w1_family *f, int attach);
-void w1_slave_detach(struct w1_slave *sl);
+int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn);
+/* 0 success, otherwise EBUSY */
+int w1_slave_detach(struct w1_slave *sl);
 
 u8 w1_triplet(struct w1_master *dev, int bdir);
 void w1_write_8(struct w1_master *, u8);
@@ -242,6 +286,8 @@ extern int w1_max_slave_ttl;
 extern struct list_head w1_masters;
 extern struct mutex w1_mlock;
 
+/* returns 1 if there were commands to executed 0 otherwise */
+extern int w1_process_callbacks(struct w1_master *dev);
 extern int w1_process(void *);
 
 #endif /* __KERNEL__ */