3.6-stable patches

added patches:
	floppy-destroy-floppy-workqueue-before-cleaning-up-the-queue.patch
	mm-dmapool-use-provided-gfp-flags-for-all-dma_alloc_coherent-calls.patch
	x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch

diff --git a/queue-3.6/floppy-destroy-floppy-workqueue-before-cleaning-up-the-queue.patch b/queue-3.6/floppy-destroy-floppy-workqueue-before-cleaning-up-the-queue.patch
new file mode 100644 (file)
index 0000000..c24a312
--- /dev/null
+++ b/queue-3.6/floppy-destroy-floppy-workqueue-before-cleaning-up-the-queue.patch
@@ -0,0 +1,95 @@
+From eac7cc52c6b410e542af431b2ee93f3d7dbfb6af Mon Sep 17 00:00:00 2001
+From: Jiri Kosina <jkosina@suse.cz>
+Date: Tue, 6 Nov 2012 11:47:13 +0100
+Subject: floppy: destroy floppy workqueue before cleaning up the queue
+
+From: Jiri Kosina <jkosina@suse.cz>
+
+commit eac7cc52c6b410e542af431b2ee93f3d7dbfb6af upstream.
+
+We need to first destroy the floppy_wq workqueue before cleaning up
+the queue. Otherwise we might race with still pending work with the
+workqueue, but all the block queue already gone. This might lead to
+various oopses, such as
+
+ CPU 0
+ Pid: 6, comm: kworker/u:0 Not tainted 3.7.0-rc4 #1 Bochs Bochs
+ RIP: 0010:[<ffffffff8134eef5>]  [<ffffffff8134eef5>] blk_peek_request+0xd5/0x1c0
+ RSP: 0000:ffff88000dc7dd88  EFLAGS: 00010092
+ RAX: 0000000000000001 RBX: 0000000000000000 RCX: 0000000000000000
+ RDX: ffff88000f602688 RSI: ffffffff81fd95d8 RDI: 6b6b6b6b6b6b6b6b
+ RBP: ffff88000dc7dd98 R08: ffffffff81fd95c8 R09: 0000000000000000
+ R10: ffffffff81fd9480 R11: 0000000000000001 R12: 6b6b6b6b6b6b6b6b
+ R13: ffff88000dc7dfd8 R14: ffff88000dc7dfd8 R15: 0000000000000000
+ FS:  0000000000000000(0000) GS:ffffffff81e21000(0000) knlGS:0000000000000000
+ CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
+ CR2: 0000000000000000 CR3: 0000000001e11000 CR4: 00000000000006f0
+ DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
+ DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
+ Process kworker/u:0 (pid: 6, threadinfo ffff88000dc7c000, task ffff88000dc5ecc0)
+ Stack:
+  0000000000000000 0000000000000000 ffff88000dc7ddb8 ffffffff8134efee
+  ffff88000dc7ddb8 0000000000000000 ffff88000dc7dde8 ffffffff814aef3c
+  ffffffff81e75d80 ffff88000dc0c640 ffff88000fbfb000 ffffffff814aed90
+ Call Trace:
+  [<ffffffff8134efee>] blk_fetch_request+0xe/0x30
+  [<ffffffff814aef3c>] redo_fd_request+0x1ac/0x400
+  [<ffffffff814aed90>] ? start_motor+0x130/0x130
+  [<ffffffff8106b526>] process_one_work+0x136/0x450
+  [<ffffffff8106af65>] ? manage_workers+0x205/0x2e0
+  [<ffffffff8106bb6d>] worker_thread+0x14d/0x420
+  [<ffffffff8106ba20>] ? rescuer_thread+0x1a0/0x1a0
+  [<ffffffff8107075a>] kthread+0xba/0xc0
+  [<ffffffff810706a0>] ? __kthread_parkme+0x80/0x80
+  [<ffffffff818b553a>] ret_from_fork+0x7a/0xb0
+  [<ffffffff810706a0>] ? __kthread_parkme+0x80/0x80
+ Code: 0f 84 c0 00 00 00 83 f8 01 0f 85 e2 00 00 00 81 4b 40 00 00 80 00 48 89 df e8 58 f8 ff ff be fb ff ff ff
+ fe ff ff <49> 8b 1c 24 49 39 dc 0f 85 2e ff ff ff 41 0f b6 84 24 28 04 00
+ RIP  [<ffffffff8134eef5>] blk_peek_request+0xd5/0x1c0
+  RSP <ffff88000dc7dd88>
+
+Reported-by: Fengguang Wu <fengguang.wu@intel.com>
+Tested-by: Fengguang Wu <fengguang.wu@intel.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/block/floppy.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -4329,6 +4329,7 @@ out_unreg_region:
+ out_unreg_blkdev:
+       unregister_blkdev(FLOPPY_MAJOR, "fd");
+ out_put_disk:
++      destroy_workqueue(floppy_wq);
+       while (dr--) {
+               del_timer_sync(&motor_off_timer[dr]);
+               if (disks[dr]->queue) {
+@@ -4341,7 +4342,6 @@ out_put_disk:
+               }
+               put_disk(disks[dr]);
+       }
+-      destroy_workqueue(floppy_wq);
+       return err;
+ }
+ 
+@@ -4556,6 +4556,8 @@ static void __exit floppy_module_exit(vo
+       unregister_blkdev(FLOPPY_MAJOR, "fd");
+       platform_driver_unregister(&floppy_driver);
+ 
++      destroy_workqueue(floppy_wq);
++
+       for (drive = 0; drive < N_DRIVE; drive++) {
+               del_timer_sync(&motor_off_timer[drive]);
+ 
+@@ -4580,7 +4582,6 @@ static void __exit floppy_module_exit(vo
+ 
+       cancel_delayed_work_sync(&fd_timeout);
+       cancel_delayed_work_sync(&fd_timer);
+-      destroy_workqueue(floppy_wq);
+ 
+       if (atomic_read(&usage_count))
+               floppy_release_irq_and_dma();

diff --git a/queue-3.6/mm-dmapool-use-provided-gfp-flags-for-all-dma_alloc_coherent-calls.patch b/queue-3.6/mm-dmapool-use-provided-gfp-flags-for-all-dma_alloc_coherent-calls.patch
new file mode 100644 (file)
index 0000000..5867b9a
--- /dev/null
+++ b/queue-3.6/mm-dmapool-use-provided-gfp-flags-for-all-dma_alloc_coherent-calls.patch
@@ -0,0 +1,124 @@
+From 387870f2d6d679746020fa8e25ef786ff338dc98 Mon Sep 17 00:00:00 2001
+From: Marek Szyprowski <m.szyprowski@samsung.com>
+Date: Wed, 7 Nov 2012 15:37:07 +0100
+Subject: mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
+
+From: Marek Szyprowski <m.szyprowski@samsung.com>
+
+commit 387870f2d6d679746020fa8e25ef786ff338dc98 upstream.
+
+dmapool always calls dma_alloc_coherent() with GFP_ATOMIC flag,
+regardless the flags provided by the caller. This causes excessive
+pruning of emergency memory pools without any good reason. Additionaly,
+on ARM architecture any driver which is using dmapools will sooner or
+later  trigger the following error:
+"ERROR: 256 KiB atomic DMA coherent pool is too small!
+Please increase it with coherent_pool= kernel parameter!".
+Increasing the coherent pool size usually doesn't help much and only
+delays such error, because all GFP_ATOMIC DMA allocations are always
+served from the special, very limited memory pool.
+
+This patch changes the dmapool code to correctly use gfp flags provided
+by the dmapool caller.
+
+Reported-by: Soeren Moch <smoch@web.de>
+Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
+Tested-by: Andrew Lunn <andrew@lunn.ch>
+Tested-by: Soeren Moch <smoch@web.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/dmapool.c |   31 +++++++------------------------
+ 1 file changed, 7 insertions(+), 24 deletions(-)
+
+--- a/mm/dmapool.c
++++ b/mm/dmapool.c
+@@ -50,7 +50,6 @@ struct dma_pool {            /* the pool */
+       size_t allocation;
+       size_t boundary;
+       char name[32];
+-      wait_queue_head_t waitq;
+       struct list_head pools;
+ };
+ 
+@@ -62,8 +61,6 @@ struct dma_page {            /* cacheable header f
+       unsigned int offset;
+ };
+ 
+-#define       POOL_TIMEOUT_JIFFIES    ((100 /* msec */ * HZ) / 1000)
+-
+ static DEFINE_MUTEX(pools_lock);
+ 
+ static ssize_t
+@@ -172,7 +169,6 @@ struct dma_pool *dma_pool_create(const c
+       retval->size = size;
+       retval->boundary = boundary;
+       retval->allocation = allocation;
+-      init_waitqueue_head(&retval->waitq);
+ 
+       if (dev) {
+               int ret;
+@@ -227,7 +223,6 @@ static struct dma_page *pool_alloc_page(
+               memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
+ #endif
+               pool_initialise_page(pool, page);
+-              list_add(&page->page_list, &pool->page_list);
+               page->in_use = 0;
+               page->offset = 0;
+       } else {
+@@ -315,30 +310,21 @@ void *dma_pool_alloc(struct dma_pool *po
+       might_sleep_if(mem_flags & __GFP_WAIT);
+ 
+       spin_lock_irqsave(&pool->lock, flags);
+- restart:
+       list_for_each_entry(page, &pool->page_list, page_list) {
+               if (page->offset < pool->allocation)
+                       goto ready;
+       }
+-      page = pool_alloc_page(pool, GFP_ATOMIC);
+-      if (!page) {
+-              if (mem_flags & __GFP_WAIT) {
+-                      DECLARE_WAITQUEUE(wait, current);
+ 
+-                      __set_current_state(TASK_UNINTERRUPTIBLE);
+-                      __add_wait_queue(&pool->waitq, &wait);
+-                      spin_unlock_irqrestore(&pool->lock, flags);
++      /* pool_alloc_page() might sleep, so temporarily drop &pool->lock */
++      spin_unlock_irqrestore(&pool->lock, flags);
+ 
+-                      schedule_timeout(POOL_TIMEOUT_JIFFIES);
++      page = pool_alloc_page(pool, mem_flags);
++      if (!page)
++              return NULL;
+ 
+-                      spin_lock_irqsave(&pool->lock, flags);
+-                      __remove_wait_queue(&pool->waitq, &wait);
+-                      goto restart;
+-              }
+-              retval = NULL;
+-              goto done;
+-      }
++      spin_lock_irqsave(&pool->lock, flags);
+ 
++      list_add(&page->page_list, &pool->page_list);
+  ready:
+       page->in_use++;
+       offset = page->offset;
+@@ -348,7 +334,6 @@ void *dma_pool_alloc(struct dma_pool *po
+ #ifdef        DMAPOOL_DEBUG
+       memset(retval, POOL_POISON_ALLOCATED, pool->size);
+ #endif
+- done:
+       spin_unlock_irqrestore(&pool->lock, flags);
+       return retval;
+ }
+@@ -435,8 +420,6 @@ void dma_pool_free(struct dma_pool *pool
+       page->in_use--;
+       *(int *)vaddr = page->offset;
+       page->offset = offset;
+-      if (waitqueue_active(&pool->waitq))
+-              wake_up_locked(&pool->waitq);
+       /*
+        * Resist a temptation to do
+        *    if (!is_page_busy(page)) pool_free_page(pool, page);

diff --git a/queue-3.6/series b/queue-3.6/series
index 414e501153ded6d099dd5b38cc2eb076c16ff9b4..4a37862c22693dc434fae9b500d6c336b1960076 100644 (file)
--- a/queue-3.6/series
+++ b/queue-3.6/series
@@ -10,3 +10,6 @@ edac-fix-the-dimm-filling-for-csrows-based-layouts.patch
 workqueue-convert-bug_on-s-in-__queue_delayed_work-to-warn_on_once-s.patch
 drm-i915-do-not-ignore-edp-bpc-settings-from-vbt.patch
 drm-i915-do-not-default-to-18-bpp-for-edp-if-missing-from-vbt.patch
+mm-dmapool-use-provided-gfp-flags-for-all-dma_alloc_coherent-calls.patch
+x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch
+floppy-destroy-floppy-workqueue-before-cleaning-up-the-queue.patch

diff --git a/queue-3.6/x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch b/queue-3.6/x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch
new file mode 100644 (file)
index 0000000..d407013
--- /dev/null
+++ b/queue-3.6/x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch
@@ -0,0 +1,40 @@
+From 22e32f4f57778ebc6e17812fa3008361c05d64f9 Mon Sep 17 00:00:00 2001
+From: Boris Ostrovsky <boris.ostrovsky@amd.com>
+Date: Wed, 5 Dec 2012 06:12:42 -0500
+Subject: x86,AMD: Power driver support for AMD's family 16h processors
+
+From: Boris Ostrovsky <boris.ostrovsky@amd.com>
+
+commit 22e32f4f57778ebc6e17812fa3008361c05d64f9 upstream.
+
+Add family 16h PCI ID to AMD's power driver to allow it report
+power consumption on these processors.
+
+Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwmon/fam15h_power.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/hwmon/fam15h_power.c
++++ b/drivers/hwmon/fam15h_power.c
+@@ -31,6 +31,9 @@ MODULE_DESCRIPTION("AMD Family 15h CPU p
+ MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>");
+ MODULE_LICENSE("GPL");
+ 
++/* Family 16h Northbridge's function 4 PCI ID */
++#define PCI_DEVICE_ID_AMD_16H_NB_F4   0x1534
++
+ /* D18F3 */
+ #define REG_NORTHBRIDGE_CAP           0xe8
+ 
+@@ -257,6 +260,7 @@ static void __devexit fam15h_power_remov
+ 
+ static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {
+       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
++      { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
+       {}
+ };
+ MODULE_DEVICE_TABLE(pci, fam15h_power_id_table);