From a50af7416b2d24f9deb7a21889ada4fee13e0cfe Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 May 2013 19:30:20 -0700 Subject: [PATCH] 3.4-stable patches 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 --- ...x-typo-in-restart-code-panic-message.patch | 29 +++++++++++++ ...ion-after-calling-pci_disable_device.patch | 39 +++++++++++++++++ ...ion-instead-of-a-pci_release_regions.patch | 37 ++++++++++++++++ .../powerpc-add-isync-to-copy_and_flush.patch | 43 +++++++++++++++++++ ...alise-inode-i_ino-in-spufs_new_inode.patch | 34 +++++++++++++++ queue-3.4/series | 5 +++ 6 files changed, 187 insertions(+) create mode 100644 queue-3.4/arm-at91-fix-typo-in-restart-code-panic-message.patch create mode 100644 queue-3.4/mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch create mode 100644 queue-3.4/mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch create mode 100644 queue-3.4/powerpc-add-isync-to-copy_and_flush.patch create mode 100644 queue-3.4/powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch 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 index 00000000000..cb49ceac688 --- /dev/null +++ b/queue-3.4/arm-at91-fix-typo-in-restart-code-panic-message.patch @@ -0,0 +1,29 @@ +From e7619459d47a673af3433208a42f583af920e9db Mon Sep 17 00:00:00 2001 +From: Maxime Ripard +Date: Sat, 23 Mar 2013 10:58:57 +0100 +Subject: ARM: at91: Fix typo in restart code panic message + +From: Maxime Ripard + +commit e7619459d47a673af3433208a42f583af920e9db upstream. + +Signed-off-by: Maxime Ripard +Acked-by: Jean-Christophe PLAGNIOL-VILLARD +Signed-off-by: Nicolas Ferre +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..7465a917e13 --- /dev/null +++ b/queue-3.4/mwifiex-call-pci_release_region-after-calling-pci_disable_device.patch @@ -0,0 +1,39 @@ +From 5b0d9b218b74042ff72bf4bfda6eeb2e4bf98397 Mon Sep 17 00:00:00 2001 +From: Yogesh Ashok Powar +Date: Tue, 23 Apr 2013 16:49:48 -0700 +Subject: mwifiex: Call pci_release_region after calling pci_disable_device + +From: Yogesh Ashok Powar + +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 +Signed-off-by: Amitkumar Karwar +Signed-off-by: Yogesh Ashok Powar +Signed-off-by: Bing Zhao +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..f4e8fd40ec4 --- /dev/null +++ b/queue-3.4/mwifiex-use-pci_release_region-instead-of-a-pci_release_regions.patch @@ -0,0 +1,37 @@ +From c380aafb77b7435d010698fe3ca6d3e1cd745fde Mon Sep 17 00:00:00 2001 +From: Yogesh Ashok Powar +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 + +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 +Signed-off-by: Amitkumar Karwar +Signed-off-by: Avinash Patil +Signed-off-by: Bing Zhao +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..a9377cc775c --- /dev/null +++ b/queue-3.4/powerpc-add-isync-to-copy_and_flush.patch @@ -0,0 +1,43 @@ +From 29ce3c5073057991217916abc25628e906911757 Mon Sep 17 00:00:00 2001 +From: Michael Neuling +Date: Wed, 24 Apr 2013 00:30:09 +0000 +Subject: powerpc: Add isync to copy_and_flush + +From: Michael Neuling + +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 +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..0924ef4b20c --- /dev/null +++ b/queue-3.4/powerpc-spufs-initialise-inode-i_ino-in-spufs_new_inode.patch @@ -0,0 +1,34 @@ +From 6747e83235caecd30b186d1282e4eba7679f81b7 Mon Sep 17 00:00:00 2001 +From: Michael Ellerman +Date: Tue, 23 Apr 2013 15:13:14 +0000 +Subject: powerpc/spufs: Initialise inode->i_ino in spufs_new_inode() + +From: Michael Ellerman + +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 +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + 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(); diff --git a/queue-3.4/series b/queue-3.4/series index 451b06f0a0f..e5e4be23577 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -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 -- 2.47.3