]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 May 2013 02:30:20 +0000 (19:30 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 May 2013 02:30:20 +0000 (19:30 -0700)
added patches:
arm-at91-fix-typo-in-restart-code-panic-message.patch
mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch
mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch
powerpc-add-isync-to-copy_and_flush.patch
powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch

queue-3.4/arm-at91-fix-typo-in-restart-code-panic-message.patch [new file with mode: 0644]
queue-3.4/mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch [new file with mode: 0644]
queue-3.4/mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch [new file with mode: 0644]
queue-3.4/powerpc-add-isync-to-copy_and_flush.patch [new file with mode: 0644]
queue-3.4/powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch [new file with mode: 0644]
queue-3.4/series

diff --git a/queue-3.4/arm-at91-fix-typo-in-restart-code-panic-message.patch b/queue-3.4/arm-at91-fix-typo-in-restart-code-panic-message.patch
new file mode 100644 (file)
index 0000000..cb49cea
--- /dev/null
@@ -0,0 +1,29 @@
+From e7619459d47a673af3433208a42f583af920e9db Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 23 Mar 2013 10:58:57 +0100
+Subject: ARM: at91: Fix typo in restart code panic message
+
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+
+commit e7619459d47a673af3433208a42f583af920e9db upstream.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-at91/setup.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/mach-at91/setup.c
++++ b/arch/arm/mach-at91/setup.c
+@@ -326,7 +326,7 @@ static void at91_dt_rstc(void)
+       of_id = of_match_node(rstc_ids, np);
+       if (!of_id)
+-              panic("AT91: rtsc no restart function availlable\n");
++              panic("AT91: rtsc no restart function available\n");
+       arm_pm_restart = of_id->data;
diff --git a/queue-3.4/mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch b/queue-3.4/mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch
new file mode 100644 (file)
index 0000000..7465a91
--- /dev/null
@@ -0,0 +1,39 @@
+From 5b0d9b218b74042ff72bf4bfda6eeb2e4bf98397 Mon Sep 17 00:00:00 2001
+From: Yogesh Ashok Powar <yogeshp@marvell.com>
+Date: Tue, 23 Apr 2013 16:49:48 -0700
+Subject: mwifiex: Call pci_release_region after calling pci_disable_device
+
+From: Yogesh Ashok Powar <yogeshp@marvell.com>
+
+commit 5b0d9b218b74042ff72bf4bfda6eeb2e4bf98397 upstream.
+
+"drivers should call pci_release_region() AFTER
+calling pci_disable_device()"
+
+Please refer section 3.2 Request MMIO/IOP resources
+in Documentation/PCI/pci.txt
+
+Signed-off-by: Avinash Patil <patila@marvell.com>
+Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
+Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
+Signed-off-by: Bing Zhao <bzhao@marvell.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/mwifiex/pcie.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/mwifiex/pcie.c
++++ b/drivers/net/wireless/mwifiex/pcie.c
+@@ -1828,9 +1828,9 @@ static void mwifiex_pcie_cleanup(struct
+       if (pdev) {
+               pci_iounmap(pdev, card->pci_mmap);
+               pci_iounmap(pdev, card->pci_mmap1);
++              pci_disable_device(pdev);
+               pci_release_region(pdev, 2);
+               pci_release_region(pdev, 0);
+-              pci_disable_device(pdev);
+               pci_set_drvdata(pdev, NULL);
+       }
+ }
diff --git a/queue-3.4/mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch b/queue-3.4/mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch
new file mode 100644 (file)
index 0000000..f4e8fd4
--- /dev/null
@@ -0,0 +1,37 @@
+From c380aafb77b7435d010698fe3ca6d3e1cd745fde Mon Sep 17 00:00:00 2001
+From: Yogesh Ashok Powar <yogeshp@marvell.com>
+Date: Tue, 23 Apr 2013 16:49:47 -0700
+Subject: mwifiex: Use pci_release_region() instead of a pci_release_regions()
+
+From: Yogesh Ashok Powar <yogeshp@marvell.com>
+
+commit c380aafb77b7435d010698fe3ca6d3e1cd745fde upstream.
+
+PCI regions are associated with the device using
+pci_request_region() call. Hence use pci_release_region()
+instead of pci_release_regions().
+
+Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
+Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
+Signed-off-by: Avinash Patil <patila@marvell.com>
+Signed-off-by: Bing Zhao <bzhao@marvell.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/mwifiex/pcie.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/mwifiex/pcie.c
++++ b/drivers/net/wireless/mwifiex/pcie.c
+@@ -1828,8 +1828,8 @@ static void mwifiex_pcie_cleanup(struct
+       if (pdev) {
+               pci_iounmap(pdev, card->pci_mmap);
+               pci_iounmap(pdev, card->pci_mmap1);
+-
+-              pci_release_regions(pdev);
++              pci_release_region(pdev, 2);
++              pci_release_region(pdev, 0);
+               pci_disable_device(pdev);
+               pci_set_drvdata(pdev, NULL);
+       }
diff --git a/queue-3.4/powerpc-add-isync-to-copy_and_flush.patch b/queue-3.4/powerpc-add-isync-to-copy_and_flush.patch
new file mode 100644 (file)
index 0000000..a9377cc
--- /dev/null
@@ -0,0 +1,43 @@
+From 29ce3c5073057991217916abc25628e906911757 Mon Sep 17 00:00:00 2001
+From: Michael Neuling <michael.neuling@au1.ibm.com>
+Date: Wed, 24 Apr 2013 00:30:09 +0000
+Subject: powerpc: Add isync to copy_and_flush
+
+From: Michael Neuling <michael.neuling@au1.ibm.com>
+
+commit 29ce3c5073057991217916abc25628e906911757 upstream.
+
+In __after_prom_start we copy the kernel down to zero in two calls to
+copy_and_flush.  After the first call (copy from 0 to copy_to_here:)
+we jump to the newly copied code soon after.
+
+Unfortunately there's no isync between the copy of this code and the
+jump to it.  Hence it's possible that stale instructions could still be
+in the icache or pipeline before we branch to it.
+
+We've seen this on real machines and it's results in no console output
+after:
+  calling quiesce...
+  returning from prom_init
+
+The below adds an isync to ensure that the copy and flushing has
+completed before any branching to the new instructions occurs.
+
+Signed-off-by: Michael Neuling <mikey@neuling.org>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/kernel/head_64.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/kernel/head_64.S
++++ b/arch/powerpc/kernel/head_64.S
+@@ -489,6 +489,7 @@ _GLOBAL(copy_and_flush)
+       sync
+       addi    r5,r5,8
+       addi    r6,r6,8
++      isync
+       blr
+ .align 8
diff --git a/queue-3.4/powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch b/queue-3.4/powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch
new file mode 100644 (file)
index 0000000..0924ef4
--- /dev/null
@@ -0,0 +1,34 @@
+From 6747e83235caecd30b186d1282e4eba7679f81b7 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <michael@ellerman.id.au>
+Date: Tue, 23 Apr 2013 15:13:14 +0000
+Subject: powerpc/spufs: Initialise inode->i_ino in spufs_new_inode()
+
+From: Michael Ellerman <michael@ellerman.id.au>
+
+commit 6747e83235caecd30b186d1282e4eba7679f81b7 upstream.
+
+In commit 85fe402 (fs: do not assign default i_ino in new_inode), the
+initialisation of i_ino was removed from new_inode() and pushed down
+into the callers. However spufs_new_inode() was not updated.
+
+This exhibits as no files appearing in /spu, because all our dirents
+have a zero inode, which readdir() seems to dislike.
+
+Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/platforms/cell/spufs/inode.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/platforms/cell/spufs/inode.c
++++ b/arch/powerpc/platforms/cell/spufs/inode.c
+@@ -99,6 +99,7 @@ spufs_new_inode(struct super_block *sb,
+       if (!inode)
+               goto out;
++      inode->i_ino = get_next_ino();
+       inode->i_mode = mode;
+       inode->i_uid = current_fsuid();
+       inode->i_gid = current_fsgid();
index 451b06f0a0fcd8c5a0f074b0541285d3aea8652d..e5e4be235777b5cb31408de4ad0f60c0b6352fac 100644 (file)
@@ -1,2 +1,7 @@
 usb-serial-option-added-support-olivetti-olicard-145.patch
 usb-option-add-a-d-link-dwm-156-variant.patch
+arm-at91-fix-typo-in-restart-code-panic-message.patch
+powerpc-add-isync-to-copy_and_flush.patch
+powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch
+mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch
+mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch