diff for duplicates of <5386026C.1010603@redhat.com> diff --git a/a/1.txt b/N1/1.txt index aec62b5..ea98a06 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,3 +71,10 @@ ahci_platform_resume_host on resume, as is done in the attached patch. Regards, Hans +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-ahci_imx-Fix-oops-on-suspend-resume.patch +Type: text/x-patch +Size: 2809 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140528/36aaedd0/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 43dcc1c..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-patch; - name="0001-ahci_imx-Fix-oops-on-suspend-resume.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename="0001-ahci_imx-Fix-oops-on-suspend-resume.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 2951c7d..0000000 --- a/a/2.txt +++ /dev/null @@ -1,75 +0,0 @@ ->From 2381bd7a615f74e3ada88d6462fbb298b7d0e279 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 28 May 2014 17:33:05 +0200 -Subject: [PATCH resend] ahci_imx: Fix oops on suspend/resume - -Doing suspend/resume on imx6q and imx53 boards with no SATA disk -attached will trigger the following warning. - -------------[ cut here ]------------ -WARNING: CPU: 0 PID: 661 at drivers/ata/libahci.c:224 ahci_enable_ahci+0x74/0x8) -Modules linked in: -CPU: 0 PID: 661 Comm: sh Tainted: G W 3.15.0-rc5-next-20140521-000027 -Backtrace: -[<80011c90>] (dump_backtrace) from [<80011e2c>] (show_stack+0x18/0x1c) - r6:803a22f4 r5:00000000 r4:00000000 r3:00000000 -[<80011e14>] (show_stack) from [<80661e60>] (dump_stack+0x88/0xa4) -[<80661dd8>] (dump_stack) from [<80028fdc>] (warn_slowpath_common+0x70/0x94) - r5:00000009 r4:00000000 -[<80028f6c>] (warn_slowpath_common) from [<80029024>] (warn_slowpath_null+0x24/) - r8:808f68c4 r7:00000000 r6:00000000 r5:00000000 r4:e0810004 -[<80029000>] (warn_slowpath_null) from [<803a22f4>] (ahci_enable_ahci+0x74/0x80) -[<803a2280>] (ahci_enable_ahci) from [<803a2324>] (ahci_reset_controller+0x24/0) - r8:ddcd9410 r7:80351178 r6:ddcd9444 r5:dde8b850 r4:e0810000 r3:ddf35e90 -[<803a2300>] (ahci_reset_controller) from [<803a2c68>] (ahci_platform_resume_ho) - r7:80351178 r6:ddcd9444 r5:dde8b850 r4:ddcd9410 -[<803a2c30>] (ahci_platform_resume_host) from [<803a38f0>] (imx_ahci_resume+0x2) - r5:00000000 r4:ddcd9410 -[<803a38c4>] (imx_ahci_resume) from [<803511ac>] (platform_pm_resume+0x34/0x54) -.... - -This is caused by the unique error handling in ahci_imx which permanently -powers down the achi bits if there is no disk attached on probe. Add a check -for this condition in the suspend / resume handlers to fix this warning. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - drivers/ata/ahci_imx.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c -index 8befeb6..00e6ed8 100644 ---- a/drivers/ata/ahci_imx.c -+++ b/drivers/ata/ahci_imx.c -@@ -215,9 +215,6 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv) - struct device *dev = &imxpriv->ahci_pdev->dev; - int ret; - -- if (imxpriv->no_device) -- return 0; -- - if (hpriv->target_pwr) { - ret = regulator_enable(hpriv->target_pwr); - if (ret) -@@ -453,6 +450,9 @@ static int imx_ahci_suspend(struct device *dev) - struct ahci_host_priv *hpriv = host->private_data; - int ret; - -+ if (imxpriv->no_device) -+ return 0; -+ - ret = ahci_platform_suspend_host(dev); - if (ret) - return ret; -@@ -468,6 +468,9 @@ static int imx_ahci_resume(struct device *dev) - struct ahci_host_priv *hpriv = host->private_data; - int ret; - -+ if (imxpriv->no_device) -+ return 0; -+ - ret = imx_sata_enable(hpriv); - if (ret) - return ret; --- -1.9.3 diff --git a/a/content_digest b/N1/content_digest index 701ab47..9d4313b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\01401289539-3485-1-git-send-email-shawn.guo@freescale.com\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [PATCH] ahci: imx: manage only sata_ref_clk in imx_sata_enable[disable]\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH] ahci: imx: manage only sata_ref_clk in imx_sata_enable[disable]\0" "Date\0Wed, 28 May 2014 17:36:12 +0200\0" - "To\0Shawn Guo <shawn.guo@freescale.com>" - " Tejun Heo <tj@kernel.org>\0" - "Cc\0Fabio Estevam <fabio.estevam@freescale.com>" - Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - linux-ide@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi,\n" "\n" @@ -82,84 +77,13 @@ "\n" "Regards,\n" "\n" - Hans - "\01:2\0" - "fn\00001-ahci_imx-Fix-oops-on-suspend-resume.patch\0" - "b\0" - ">From 2381bd7a615f74e3ada88d6462fbb298b7d0e279 Mon Sep 17 00:00:00 2001\n" - "From: Hans de Goede <hdegoede@redhat.com>\n" - "Date: Wed, 28 May 2014 17:33:05 +0200\n" - "Subject: [PATCH resend] ahci_imx: Fix oops on suspend/resume\n" - "\n" - "Doing suspend/resume on imx6q and imx53 boards with no SATA disk\n" - "attached will trigger the following warning.\n" - "\n" - "------------[ cut here ]------------\n" - "WARNING: CPU: 0 PID: 661 at drivers/ata/libahci.c:224 ahci_enable_ahci+0x74/0x8)\n" - "Modules linked in:\n" - "CPU: 0 PID: 661 Comm: sh Tainted: G W 3.15.0-rc5-next-20140521-000027\n" - "Backtrace:\n" - "[<80011c90>] (dump_backtrace) from [<80011e2c>] (show_stack+0x18/0x1c)\n" - " r6:803a22f4 r5:00000000 r4:00000000 r3:00000000\n" - "[<80011e14>] (show_stack) from [<80661e60>] (dump_stack+0x88/0xa4)\n" - "[<80661dd8>] (dump_stack) from [<80028fdc>] (warn_slowpath_common+0x70/0x94)\n" - " r5:00000009 r4:00000000\n" - "[<80028f6c>] (warn_slowpath_common) from [<80029024>] (warn_slowpath_null+0x24/)\n" - " r8:808f68c4 r7:00000000 r6:00000000 r5:00000000 r4:e0810004\n" - "[<80029000>] (warn_slowpath_null) from [<803a22f4>] (ahci_enable_ahci+0x74/0x80)\n" - "[<803a2280>] (ahci_enable_ahci) from [<803a2324>] (ahci_reset_controller+0x24/0)\n" - " r8:ddcd9410 r7:80351178 r6:ddcd9444 r5:dde8b850 r4:e0810000 r3:ddf35e90\n" - "[<803a2300>] (ahci_reset_controller) from [<803a2c68>] (ahci_platform_resume_ho)\n" - " r7:80351178 r6:ddcd9444 r5:dde8b850 r4:ddcd9410\n" - "[<803a2c30>] (ahci_platform_resume_host) from [<803a38f0>] (imx_ahci_resume+0x2)\n" - " r5:00000000 r4:ddcd9410\n" - "[<803a38c4>] (imx_ahci_resume) from [<803511ac>] (platform_pm_resume+0x34/0x54)\n" - "....\n" - "\n" - "This is caused by the unique error handling in ahci_imx which permanently\n" - "powers down the achi bits if there is no disk attached on probe. Add a check\n" - "for this condition in the suspend / resume handlers to fix this warning.\n" - "\n" - "Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" - "---\n" - " drivers/ata/ahci_imx.c | 9 ++++++---\n" - " 1 file changed, 6 insertions(+), 3 deletions(-)\n" - "\n" - "diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c\n" - "index 8befeb6..00e6ed8 100644\n" - "--- a/drivers/ata/ahci_imx.c\n" - "+++ b/drivers/ata/ahci_imx.c\n" - "@@ -215,9 +215,6 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv)\n" - " \tstruct device *dev = &imxpriv->ahci_pdev->dev;\n" - " \tint ret;\n" - " \n" - "-\tif (imxpriv->no_device)\n" - "-\t\treturn 0;\n" - "-\n" - " \tif (hpriv->target_pwr) {\n" - " \t\tret = regulator_enable(hpriv->target_pwr);\n" - " \t\tif (ret)\n" - "@@ -453,6 +450,9 @@ static int imx_ahci_suspend(struct device *dev)\n" - " \tstruct ahci_host_priv *hpriv = host->private_data;\n" - " \tint ret;\n" - " \n" - "+\tif (imxpriv->no_device)\n" - "+\t\treturn 0;\n" - "+\n" - " \tret = ahci_platform_suspend_host(dev);\n" - " \tif (ret)\n" - " \t\treturn ret;\n" - "@@ -468,6 +468,9 @@ static int imx_ahci_resume(struct device *dev)\n" - " \tstruct ahci_host_priv *hpriv = host->private_data;\n" - " \tint ret;\n" - " \n" - "+\tif (imxpriv->no_device)\n" - "+\t\treturn 0;\n" - "+\n" - " \tret = imx_sata_enable(hpriv);\n" - " \tif (ret)\n" - " \t\treturn ret;\n" - "-- \n" - 1.9.3 + "Hans\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-ahci_imx-Fix-oops-on-suspend-resume.patch\n" + "Type: text/x-patch\n" + "Size: 2809 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140528/36aaedd0/attachment-0001.bin> -6ef521f2a8d5764a82654835d283f338f9c35800fef6aac06dde9471ee6d908e +1ccb861fe3919b5ceb9a0cbc3b49b04e25f5da0c35852c2d93498ab6eefea4bd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.