From: Greg Kroah-Hartman Date: Wed, 30 Sep 2009 23:29:31 +0000 (-0700) Subject: .31 patches X-Git-Tag: v2.6.27.36~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68fa5b500c710b6f3b9b16421e250313e6dc68fe;p=thirdparty%2Fkernel%2Fstable-queue.git .31 patches --- diff --git a/queue-2.6.31/ahci-restore-pci_intx-handling.patch b/queue-2.6.31/ahci-restore-pci_intx-handling.patch new file mode 100644 index 00000000000..137b8429596 --- /dev/null +++ b/queue-2.6.31/ahci-restore-pci_intx-handling.patch @@ -0,0 +1,45 @@ +From 31b239ad1ba7225435e13f5afc47e48eb674c0cc Mon Sep 17 00:00:00 2001 +From: Tejun Heo +Date: Thu, 17 Sep 2009 00:34:39 +0900 +Subject: ahci: restore pci_intx() handling + +From: Tejun Heo + +commit 31b239ad1ba7225435e13f5afc47e48eb674c0cc upstream. + +Commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 dropped explicit +pci_intx() manipulation from ahci because it seemed unnecessary and +ahci doesn't seem to be the right place to be tweaking it if it were. +This was largely okay but there are exceptions. There was one on an +embedded platform which was fixed via firmware and now bko#14124 +reports it on a HP DL320. + + http://bugzilla.kernel.org/show_bug.cgi?id=14124 + +I still think this isn't something libata drivers should be caring +about (the only ones which are calling pci_intx() explicitly are +libata ones and one other driver) but for now reverting the change +seems to be the right thing to do. + +Signed-off-by: Tejun Heo +Reported-by: Thomas Jarosch +Signed-off-by: Jeff Garzik +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/ahci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -2861,8 +2861,8 @@ static int ahci_init_one(struct pci_dev + if (ahci_asus_m2a_vm_32bit_only(pdev)) + hpriv->flags |= AHCI_HFLAG_32BIT_ONLY; + +- if (!(hpriv->flags & AHCI_HFLAG_NO_MSI)) +- pci_enable_msi(pdev); ++ if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev)) ++ pci_intx(pdev, 1); + + /* save initial config */ + ahci_save_initial_config(pdev, hpriv); diff --git a/queue-2.6.31/pxa-sharpsl_pm-zaurus-c3000-aka-spitz-fix-resume.patch b/queue-2.6.31/pxa-sharpsl_pm-zaurus-c3000-aka-spitz-fix-resume.patch new file mode 100644 index 00000000000..52c5d745de7 --- /dev/null +++ b/queue-2.6.31/pxa-sharpsl_pm-zaurus-c3000-aka-spitz-fix-resume.patch @@ -0,0 +1,38 @@ +From 99f329a2ba3c2d07cc90ca9309babf27ddf98bff Mon Sep 17 00:00:00 2001 +From: Pavel Machek +Date: Sun, 6 Sep 2009 07:28:40 +0200 +Subject: [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume + +From: Pavel Machek + +commit 99f329a2ba3c2d07cc90ca9309babf27ddf98bff upstream. + +sharpsl_pm.c code tries to read battery state very early during +resume, but those battery meters are connected on SPI and that's only +resumed way later. + +Replace the check with simple checking of battery fatal signal, that +actually works at this stage. + +Signed-off-by: Pavel Machek +Tested-by: Stanislav Brabec +Signed-off-by: Eric Miao +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-pxa/sharpsl_pm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/mach-pxa/sharpsl_pm.c ++++ b/arch/arm/mach-pxa/sharpsl_pm.c +@@ -678,8 +678,8 @@ static int corgi_enter_suspend(unsigned + dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n"); + } + +- if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || (sharpsl_fatal_check() < 0) ) +- { ++ if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || ++ (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL))) { + dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n"); + corgi_goto_sleep(alarm_time, alarm_enable, state); + return 1; diff --git a/queue-2.6.31/series b/queue-2.6.31/series index d419e7f3b11..ff6c6fa1955 100644 --- a/queue-2.6.31/series +++ b/queue-2.6.31/series @@ -65,3 +65,5 @@ drm-i915-fix-tiling-on-igdng.patch agp-intel-fix-the-pre-9xx-chipset-flush.patch nfsd4-fix-null-dereference-creating-nfsv4-callback-client.patch can-fix-nohz-local_softirq_pending-08-warning.patch +ahci-restore-pci_intx-handling.patch +pxa-sharpsl_pm-zaurus-c3000-aka-spitz-fix-resume.patch