[gentoo-commits] linux-patches r1579 - genpatches-2.6/trunk/2.6.29

[Markos Chandras (hwoarang)]

Author: hwoarang
Date: 2009-06-23 19:55:11 +0000 (Tue, 23 Jun 2009)
New Revision: 1579

Added:
   genpatches-2.6/trunk/2.6.29/2900_bluetooth-fix-sysfs.patch
Modified:
   genpatches-2.6/trunk/2.6.29/0000_README
Log:
Fix hard lock with bluetooth connections


Modified: genpatches-2.6/trunk/2.6.29/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.29/0000_README	2009-06-22 19:27:41 UTC (rev 1578)
+++ genpatches-2.6/trunk/2.6.29/0000_README	2009-06-23 19:55:11 UTC (rev 1579)
@@ -83,6 +83,10 @@
 From:   http://bugs.gentoo.org/show_bug.cgi?id=251237
 Desc:   usblp: continuously poll for status
 
+Patch:	2900_bluetooth-fix-sysfs.patch
+From:	http://bugs.gentoo.org/show_bug.cgi?id=274007
+Desc:	Fix hard lock with bluetooth connections
+
 Patch:	4100_dm-bbr.patch
 From:	EVMS 2.5.2
 Desc:	Bad block relocation support for LiveCD users

Added: genpatches-2.6/trunk/2.6.29/2900_bluetooth-fix-sysfs.patch
===================================================================
--- genpatches-2.6/trunk/2.6.29/2900_bluetooth-fix-sysfs.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.29/2900_bluetooth-fix-sysfs.patch	2009-06-23 19:55:11 UTC (rev 1579)
@@ -0,0 +1,454 @@
+From: Cornelia Huck <cornelia.huck@××××××.com>
+Date: Wed, 4 Mar 2009 11:44:00 +0000 (+0100)
+Subject: Driver core: Fix device_move() vs. dpm list ordering, v2
+X-Git-Tag: v2.6.30-rc1~671^2~7
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.30.y.git;a=commitdiff_plain;h=ffa6a7054d172a2f57248dff2de600ca795c5656;hp=60530afe1ee8a5532cb09d0ab5bc3f1a6495b780
+
+Driver core: Fix device_move() vs. dpm list ordering, v2
+
+dpm_list currently relies on the fact that child devices will
+be registered after their parents to get a correct suspend
+order. Using device_move() however destroys this assumption, as
+an already registered device may be moved under a newly registered
+one.
+
+This patch adds a new argument to device_move(), allowing callers
+to specify how dpm_list should be adapted.
+
+Signed-off-by: Cornelia Huck <cornelia.huck@××××××.com>
+Acked-by: Alan Stern <stern@×××××××××××××××.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@××××.de>
+---
+
+Index: linux-2.6.29.2/drivers/base/core.c
+===================================================================
+--- linux-2.6.29.2.orig/drivers/base/core.c
++++ linux-2.6.29.2/drivers/base/core.c
+@@ -1545,8 +1545,10 @@ out:
+  * device_move - moves a device to a new parent
+  * @dev: the pointer to the struct device to be moved
+  * @new_parent: the new parent of the device (can by NULL)
++ * @dpm_order: how to reorder the dpm_list
+  */
+-int device_move(struct device *dev, struct device *new_parent)
++int device_move(struct device *dev, struct device *new_parent,
++		enum dpm_order dpm_order)
+ {
+ 	int error;
+ 	struct device *old_parent;
+@@ -1556,6 +1558,7 @@ int device_move(struct device *dev, stru
+ 	if (!dev)
+ 		return -EINVAL;
+ 
++	device_pm_lock();
+ 	new_parent = get_device(new_parent);
+ 	new_parent_kobj = get_device_parent(dev, new_parent);
+ 
+@@ -1596,9 +1599,23 @@ int device_move(struct device *dev, stru
+ 		put_device(new_parent);
+ 		goto out;
+ 	}
++	switch (dpm_order) {
++	case DPM_ORDER_NONE:
++		break;
++	case DPM_ORDER_DEV_AFTER_PARENT:
++		device_pm_move_after(dev, new_parent);
++		break;
++	case DPM_ORDER_PARENT_BEFORE_DEV:
++		device_pm_move_before(new_parent, dev);
++		break;
++	case DPM_ORDER_DEV_LAST:
++		device_pm_move_last(dev);
++		break;
++	}
+ out_put:
+ 	put_device(old_parent);
+ out:
++	device_pm_unlock();
+ 	put_device(dev);
+ 	return error;
+ }
+Index: linux-2.6.29.2/drivers/base/power/main.c
+===================================================================
+--- linux-2.6.29.2.orig/drivers/base/power/main.c
++++ linux-2.6.29.2/drivers/base/power/main.c
+@@ -107,6 +107,50 @@ void device_pm_remove(struct device *dev
+ }
+ 
+ /**
++ *	device_pm_move_before - move device in dpm_list
++ *	@deva:  Device to move in dpm_list
++ *	@devb:  Device @deva should come before
++ */
++void device_pm_move_before(struct device *deva, struct device *devb)
++{
++	pr_debug("PM: Moving %s:%s before %s:%s\n",
++		 deva->bus ? deva->bus->name : "No Bus",
++		 kobject_name(&deva->kobj),
++		 devb->bus ? devb->bus->name : "No Bus",
++		 kobject_name(&devb->kobj));
++	/* Delete deva from dpm_list and reinsert before devb. */
++	list_move_tail(&deva->power.entry, &devb->power.entry);
++}
++
++/**
++ *	device_pm_move_after - move device in dpm_list
++ *	@deva:  Device to move in dpm_list
++ *	@devb:  Device @deva should come after
++ */
++void device_pm_move_after(struct device *deva, struct device *devb)
++{
++	pr_debug("PM: Moving %s:%s after %s:%s\n",
++		 deva->bus ? deva->bus->name : "No Bus",
++		 kobject_name(&deva->kobj),
++		 devb->bus ? devb->bus->name : "No Bus",
++		 kobject_name(&devb->kobj));
++	/* Delete deva from dpm_list and reinsert after devb. */
++	list_move(&deva->power.entry, &devb->power.entry);
++}
++
++/**
++ * 	device_pm_move_last - move device to end of dpm_list
++ * 	@dev:   Device to move in dpm_list
++ */
++void device_pm_move_last(struct device *dev)
++{
++	pr_debug("PM: Moving %s:%s to end of list\n",
++		 dev->bus ? dev->bus->name : "No Bus",
++		 kobject_name(&dev->kobj));
++	list_move_tail(&dev->power.entry, &dpm_list);
++}
++
++/**
+  *	pm_op - execute the PM operation appropiate for given PM event
+  *	@dev:	Device.
+  *	@ops:	PM operations to choose from.
+Index: linux-2.6.29.2/drivers/base/power/power.h
+===================================================================
+--- linux-2.6.29.2.orig/drivers/base/power/power.h
++++ linux-2.6.29.2/drivers/base/power/power.h
+@@ -18,11 +18,19 @@ static inline struct device *to_device(s
+ 
+ extern void device_pm_add(struct device *);
+ extern void device_pm_remove(struct device *);
++extern void device_pm_move_before(struct device *, struct device *);
++extern void device_pm_move_after(struct device *, struct device *);
++extern void device_pm_move_last(struct device *);
+ 
+ #else /* CONFIG_PM_SLEEP */
+ 
+ static inline void device_pm_add(struct device *dev) {}
+ static inline void device_pm_remove(struct device *dev) {}
++static inline void device_pm_move_before(struct device *deva,
++					 struct device *devb) {}
++static inline void device_pm_move_after(struct device *deva,
++					struct device *devb) {}
++static inline void device_pm_move_last(struct device *dev) {}
+ 
+ #endif
+ 
+Index: linux-2.6.29.2/drivers/s390/cio/device.c
+===================================================================
+--- linux-2.6.29.2.orig/drivers/s390/cio/device.c
++++ linux-2.6.29.2/drivers/s390/cio/device.c
+@@ -799,7 +799,7 @@ static void sch_attach_disconnected_devi
+ 		return;
+ 	other_sch = to_subchannel(cdev->dev.parent);
+ 	/* Note: device_move() changes cdev->dev.parent */
+-	ret = device_move(&cdev->dev, &sch->dev);
++	ret = device_move(&cdev->dev, &sch->dev, DPM_ORDER_PARENT_BEFORE_DEV);
+ 	if (ret) {
+ 		CIO_MSG_EVENT(0, "Moving disconnected device 0.%x.%04x failed "
+ 			      "(ret=%d)!\n", cdev->private->dev_id.ssid,
+@@ -830,7 +830,7 @@ static void sch_attach_orphaned_device(s
+ 	 * Try to move the ccw device to its new subchannel.
+ 	 * Note: device_move() changes cdev->dev.parent
+ 	 */
+-	ret = device_move(&cdev->dev, &sch->dev);
++	ret = device_move(&cdev->dev, &sch->dev, DPM_ORDER_PARENT_BEFORE_DEV);
+ 	if (ret) {
+ 		CIO_MSG_EVENT(0, "Moving device 0.%x.%04x from orphanage "
+ 			      "failed (ret=%d)!\n",
+@@ -897,7 +897,8 @@ void ccw_device_move_to_orphanage(struct
+ 	 * ccw device can take its place on the subchannel.
+ 	 * Note: device_move() changes cdev->dev.parent
+ 	 */
+-	ret = device_move(&cdev->dev, &css->pseudo_subchannel->dev);
++	ret = device_move(&cdev->dev, &css->pseudo_subchannel->dev,
++		DPM_ORDER_NONE);
+ 	if (ret) {
+ 		CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to orphanage failed "
+ 			      "(ret=%d)!\n", cdev->private->dev_id.ssid,
+@@ -1129,7 +1130,7 @@ static void ccw_device_move_to_sch(struc
+ 	 * Try to move the ccw device to its new subchannel.
+ 	 * Note: device_move() changes cdev->dev.parent
+ 	 */
+-	rc = device_move(&cdev->dev, &sch->dev);
++	rc = device_move(&cdev->dev, &sch->dev, DPM_ORDER_PARENT_BEFORE_DEV);
+ 	mutex_unlock(&sch->reg_mutex);
+ 	if (rc) {
+ 		CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to subchannel "
+Index: linux-2.6.29.2/include/linux/device.h
+===================================================================
+--- linux-2.6.29.2.orig/include/linux/device.h
++++ linux-2.6.29.2/include/linux/device.h
+@@ -483,7 +483,8 @@ extern int device_for_each_child(struct 
+ extern struct device *device_find_child(struct device *dev, void *data,
+ 				int (*match)(struct device *dev, void *data));
+ extern int device_rename(struct device *dev, char *new_name);
+-extern int device_move(struct device *dev, struct device *new_parent);
++extern int device_move(struct device *dev, struct device *new_parent,
++		       enum dpm_order dpm_order);
+ 
+ /*
+  * Root device objects for grouping under /sys/devices
+Index: linux-2.6.29.2/include/linux/pm.h
+===================================================================
+--- linux-2.6.29.2.orig/include/linux/pm.h
++++ linux-2.6.29.2/include/linux/pm.h
+@@ -400,6 +400,9 @@ extern void __suspend_report_result(cons
+ 
+ #else /* !CONFIG_PM_SLEEP */
+ 
++#define device_pm_lock() do {} while (0)
++#define device_pm_unlock() do {} while (0)
++
+ static inline int device_suspend(pm_message_t state)
+ {
+ 	return 0;
+@@ -409,6 +412,14 @@ static inline int device_suspend(pm_mess
+ 
+ #endif /* !CONFIG_PM_SLEEP */
+ 
++/* How to reorder dpm_list after device_move() */
++enum dpm_order {
++	DPM_ORDER_NONE,
++	DPM_ORDER_DEV_AFTER_PARENT,
++	DPM_ORDER_PARENT_BEFORE_DEV,
++	DPM_ORDER_DEV_LAST,
++};
++
+ /*
+  * Global Power Management flags
+  * Used to keep APM and ACPI from both being active
+Index: linux-2.6.29.2/net/bluetooth/hci_sysfs.c
+===================================================================
+--- linux-2.6.29.2.orig/net/bluetooth/hci_sysfs.c
++++ linux-2.6.29.2/net/bluetooth/hci_sysfs.c
+@@ -9,8 +9,7 @@
+ struct class *bt_class = NULL;
+ EXPORT_SYMBOL_GPL(bt_class);
+ 
+-static struct workqueue_struct *btaddconn;
+-static struct workqueue_struct *btdelconn;
++static struct workqueue_struct *bt_workq;
+ 
+ static inline char *link_typetostr(int type)
+ {
+@@ -88,35 +87,17 @@ static struct device_type bt_link = {
+ 
+ static void add_conn(struct work_struct *work)
+ {
+-	struct hci_conn *conn = container_of(work, struct hci_conn, work);
++	struct hci_conn *conn = container_of(work, struct hci_conn, work_add);
++	struct hci_dev *hdev = conn->hdev;
+ 
+-	flush_workqueue(btdelconn);
++	dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
+ 
+ 	if (device_add(&conn->dev) < 0) {
+ 		BT_ERR("Failed to register connection device");
+ 		return;
+ 	}
+-}
+-
+-void hci_conn_add_sysfs(struct hci_conn *conn)
+-{
+-	struct hci_dev *hdev = conn->hdev;
+-
+-	BT_DBG("conn %p", conn);
+-
+-	conn->dev.type = &bt_link;
+-	conn->dev.class = bt_class;
+-	conn->dev.parent = &hdev->dev;
+ 
+-	dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
+-
+-	dev_set_drvdata(&conn->dev, conn);
+-
+-	device_initialize(&conn->dev);
+-
+-	INIT_WORK(&conn->work, add_conn);
+-
+-	queue_work(btaddconn, &conn->work);
++	hci_dev_hold(hdev);
+ }
+ 
+ /*
+@@ -131,34 +112,58 @@ static int __match_tty(struct device *de
+ 
+ static void del_conn(struct work_struct *work)
+ {
+-	struct hci_conn *conn = container_of(work, struct hci_conn, work);
++	struct hci_conn *conn = container_of(work, struct hci_conn, work_del);
+ 	struct hci_dev *hdev = conn->hdev;
+ 
++	if (!device_is_registered(&conn->dev))
++		return;
++
+ 	while (1) {
+ 		struct device *dev;
+ 
+ 		dev = device_find_child(&conn->dev, NULL, __match_tty);
+ 		if (!dev)
+ 			break;
+-		device_move(dev, NULL);
++		device_move(dev, NULL, DPM_ORDER_DEV_LAST);
+ 		put_device(dev);
+ 	}
+ 
+ 	device_del(&conn->dev);
+ 	put_device(&conn->dev);
++
+ 	hci_dev_put(hdev);
+ }
+ 
+-void hci_conn_del_sysfs(struct hci_conn *conn)
++void hci_conn_init_sysfs(struct hci_conn *conn)
+ {
++	struct hci_dev *hdev = conn->hdev;
++
+ 	BT_DBG("conn %p", conn);
+ 
+-	if (!device_is_registered(&conn->dev))
+-		return;
++	conn->dev.type = &bt_link;
++	conn->dev.class = bt_class;
++	conn->dev.parent = &hdev->dev;
+ 
+-	INIT_WORK(&conn->work, del_conn);
++	dev_set_drvdata(&conn->dev, conn);
++
++	device_initialize(&conn->dev);
+ 
+-	queue_work(btdelconn, &conn->work);
++	INIT_WORK(&conn->work_add, add_conn);
++	INIT_WORK(&conn->work_del, del_conn);
++}
++
++void hci_conn_add_sysfs(struct hci_conn *conn)
++{
++	BT_DBG("conn %p", conn);
++
++	queue_work(bt_workq, &conn->work_add);
++}
++
++void hci_conn_del_sysfs(struct hci_conn *conn)
++{
++	BT_DBG("conn %p", conn);
++
++	queue_work(bt_workq, &conn->work_del);
+ }
+ 
+ static inline char *host_typetostr(int type)
+@@ -435,20 +440,13 @@ void hci_unregister_sysfs(struct hci_dev
+ 
+ int __init bt_sysfs_init(void)
+ {
+-	btaddconn = create_singlethread_workqueue("btaddconn");
+-	if (!btaddconn)
++	bt_workq = create_singlethread_workqueue("bluetooth");
++	if (!bt_workq)
+ 		return -ENOMEM;
+ 
+-	btdelconn = create_singlethread_workqueue("btdelconn");
+-	if (!btdelconn) {
+-		destroy_workqueue(btaddconn);
+-		return -ENOMEM;
+-	}
+-
+ 	bt_class = class_create(THIS_MODULE, "bluetooth");
+ 	if (IS_ERR(bt_class)) {
+-		destroy_workqueue(btdelconn);
+-		destroy_workqueue(btaddconn);
++		destroy_workqueue(bt_workq);
+ 		return PTR_ERR(bt_class);
+ 	}
+ 
+@@ -457,8 +455,7 @@ int __init bt_sysfs_init(void)
+ 
+ void bt_sysfs_cleanup(void)
+ {
+-	destroy_workqueue(btaddconn);
+-	destroy_workqueue(btdelconn);
++	destroy_workqueue(bt_workq);
+ 
+ 	class_destroy(bt_class);
+ }
+Index: linux-2.6.29.2/net/bluetooth/rfcomm/tty.c
+===================================================================
+--- linux-2.6.29.2.orig/net/bluetooth/rfcomm/tty.c
++++ linux-2.6.29.2/net/bluetooth/rfcomm/tty.c
+@@ -731,7 +731,8 @@ static int rfcomm_tty_open(struct tty_st
+ 	remove_wait_queue(&dev->wait, &wait);
+ 
+ 	if (err == 0)
+-		device_move(dev->tty_dev, rfcomm_get_device(dev));
++		device_move(dev->tty_dev, rfcomm_get_device(dev),
++			    DPM_ORDER_DEV_AFTER_PARENT);
+ 
+ 	rfcomm_tty_copy_pending(dev);
+ 
+@@ -751,7 +752,7 @@ static void rfcomm_tty_close(struct tty_
+ 
+ 	if (atomic_dec_and_test(&dev->opened)) {
+ 		if (dev->tty_dev->parent)
+-			device_move(dev->tty_dev, NULL);
++			device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST);
+ 
+ 		/* Close DLC and dettach TTY */
+ 		rfcomm_dlc_close(dev->dlc, 0);
+Index: linux-2.6.29.2/include/net/bluetooth/hci_core.h
+===================================================================
+--- linux-2.6.29.2.orig/include/net/bluetooth/hci_core.h
++++ linux-2.6.29.2/include/net/bluetooth/hci_core.h
+@@ -179,7 +179,8 @@ struct hci_conn {
+ 	struct timer_list disc_timer;
+ 	struct timer_list idle_timer;
+ 
+-	struct work_struct work;
++	struct work_struct work_add;
++	struct work_struct work_del;
+ 
+ 	struct device	dev;
+ 
+@@ -455,6 +456,7 @@ int hci_recv_fragment(struct hci_dev *hd
+ 
+ int hci_register_sysfs(struct hci_dev *hdev);
+ void hci_unregister_sysfs(struct hci_dev *hdev);
++void hci_conn_init_sysfs(struct hci_conn *conn);
+ void hci_conn_add_sysfs(struct hci_conn *conn);
+ void hci_conn_del_sysfs(struct hci_conn *conn);
+ 
+Index: linux-2.6.29.2/net/bluetooth/hci_conn.c
+===================================================================
+--- linux-2.6.29.2.orig/net/bluetooth/hci_conn.c
++++ linux-2.6.29.2/net/bluetooth/hci_conn.c
+@@ -240,6 +240,8 @@ struct hci_conn *hci_conn_add(struct hci
+ 	if (hdev->notify)
+ 		hdev->notify(hdev, HCI_NOTIFY_CONN_ADD);
+ 
++	hci_conn_init_sysfs(conn);
++
+ 	tasklet_enable(&hdev->tx_task);
+ 
+ 	return conn;
+@@ -280,6 +282,8 @@ int hci_conn_del(struct hci_conn *conn)
+ 
+ 	skb_queue_purge(&conn->data_q);
+ 
++	hci_dev_put(hdev);
++
+ 	return 0;
+ }
+