3 more patches for .27

diff --git a/queue-2.6.27/ath5k-fix-suspend-related-oops-on-rmmod.patch b/queue-2.6.27/ath5k-fix-suspend-related-oops-on-rmmod.patch
new file mode 100644 (file)
index 0000000..545b6ed
--- /dev/null
+++ b/queue-2.6.27/ath5k-fix-suspend-related-oops-on-rmmod.patch
@@ -0,0 +1,147 @@
+From jejb@kernel.org  Thu Oct 23 20:53:38 2008
+From: Bob Copeland <me@bobcopeland.com>
+Date: Fri, 24 Oct 2008 02:50:07 GMT
+Subject: ath5k: fix suspend-related oops on rmmod
+To: jejb@kernel.org, stable@kernel.org
+Message-ID: <200810240250.m9O2o7pk015148@hera.kernel.org>
+
+From: Bob Copeland <me@bobcopeland.com>
+
+commit 8bdd5b9c6bd53add260756b6673a0545fbdbba21 upstream
+
+Based on a patch by Elias Oltmanns, we call ath5k_init in resume even
+if we didn't previously open the device.  Besides starting up the
+device unnecessarily, this also causes an oops on rmmod because
+mac80211 will not invoke ath5k_stop and softirqs are left running after
+the module has been unloaded.  Add a new state bit, ATH_STAT_STARTED,
+to indicate that we have been started up.
+
+Reported-by: Toralf Förster <toralf.foerster@gmx.de>
+Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
+Signed-off-by: Bob Copeland <me@bobcopeland.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/wireless/ath5k/base.c |   28 ++++++++++++++++++++--------
+ drivers/net/wireless/ath5k/base.h |    3 ++-
+ 2 files changed, 22 insertions(+), 9 deletions(-)
+
+--- a/drivers/net/wireless/ath5k/base.c
++++ b/drivers/net/wireless/ath5k/base.c
+@@ -294,9 +294,9 @@ static inline u64 ath5k_extend_tsf(struc
+ }
+ 
+ /* Interrupt handling */
+-static int    ath5k_init(struct ath5k_softc *sc);
++static int    ath5k_init(struct ath5k_softc *sc, bool is_resume);
+ static int    ath5k_stop_locked(struct ath5k_softc *sc);
+-static int    ath5k_stop_hw(struct ath5k_softc *sc);
++static int    ath5k_stop_hw(struct ath5k_softc *sc, bool is_suspend);
+ static irqreturn_t ath5k_intr(int irq, void *dev_id);
+ static void   ath5k_tasklet_reset(unsigned long data);
+ 
+@@ -584,7 +584,7 @@ ath5k_pci_suspend(struct pci_dev *pdev, 
+ 
+       ath5k_led_off(sc);
+ 
+-      ath5k_stop_hw(sc);
++      ath5k_stop_hw(sc, true);
+ 
+       free_irq(pdev->irq, sc);
+       pci_save_state(pdev);
+@@ -621,7 +621,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
+               goto err_no_irq;
+       }
+ 
+-      err = ath5k_init(sc);
++      err = ath5k_init(sc, true);
+       if (err)
+               goto err_irq;
+       ath5k_led_enable(sc);
+@@ -2197,12 +2197,17 @@ ath5k_beacon_config(struct ath5k_softc *
+ \********************/
+ 
+ static int
+-ath5k_init(struct ath5k_softc *sc)
++ath5k_init(struct ath5k_softc *sc, bool is_resume)
+ {
+       int ret;
+ 
+       mutex_lock(&sc->lock);
+ 
++      if (is_resume && !test_bit(ATH_STAT_STARTED, sc->status))
++              goto out_ok;
++
++      __clear_bit(ATH_STAT_STARTED, sc->status);
++
+       ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "mode %d\n", sc->opmode);
+ 
+       /*
+@@ -2250,12 +2255,16 @@ ath5k_init(struct ath5k_softc *sc)
+               AR5K_INT_MIB;
+ 
+       ath5k_hw_set_intr(sc->ah, sc->imask);
++
++      __set_bit(ATH_STAT_STARTED, sc->status);
++
+       /* Set ack to be sent at low bit-rates */
+       ath5k_hw_set_ack_bitrate_high(sc->ah, false);
+ 
+       mod_timer(&sc->calib_tim, round_jiffies(jiffies +
+                       msecs_to_jiffies(ath5k_calinterval * 1000)));
+ 
++out_ok:
+       ret = 0;
+ done:
+       mmiowb();
+@@ -2310,7 +2319,7 @@ ath5k_stop_locked(struct ath5k_softc *sc
+  * stop is preempted).
+  */
+ static int
+-ath5k_stop_hw(struct ath5k_softc *sc)
++ath5k_stop_hw(struct ath5k_softc *sc, bool is_suspend)
+ {
+       int ret;
+ 
+@@ -2341,6 +2350,9 @@ ath5k_stop_hw(struct ath5k_softc *sc)
+               }
+       }
+       ath5k_txbuf_free(sc, sc->bbuf);
++      if (!is_suspend)
++              __clear_bit(ATH_STAT_STARTED, sc->status);
++
+       mmiowb();
+       mutex_unlock(&sc->lock);
+ 
+@@ -2719,12 +2731,12 @@ err:
+ 
+ static int ath5k_start(struct ieee80211_hw *hw)
+ {
+-      return ath5k_init(hw->priv);
++      return ath5k_init(hw->priv, false);
+ }
+ 
+ static void ath5k_stop(struct ieee80211_hw *hw)
+ {
+-      ath5k_stop_hw(hw->priv);
++      ath5k_stop_hw(hw->priv, false);
+ }
+ 
+ static int ath5k_add_interface(struct ieee80211_hw *hw,
+--- a/drivers/net/wireless/ath5k/base.h
++++ b/drivers/net/wireless/ath5k/base.h
+@@ -132,11 +132,12 @@ struct ath5k_softc {
+       size_t                  desc_len;       /* size of TX/RX descriptors */
+       u16                     cachelsz;       /* cache line size */
+ 
+-      DECLARE_BITMAP(status, 4);
++      DECLARE_BITMAP(status, 5);
+ #define ATH_STAT_INVALID      0               /* disable hardware accesses */
+ #define ATH_STAT_MRRETRY      1               /* multi-rate retry support */
+ #define ATH_STAT_PROMISC      2
+ #define ATH_STAT_LEDSOFT      3               /* enable LED gpio status */
++#define ATH_STAT_STARTED      4               /* opened & irqs enabled */
+ 
+       unsigned int            filter_flags;   /* HW flags, AR5K_RX_FILTER_* */
+       unsigned int            curmode;        /* current phy mode */

diff --git a/queue-2.6.27/pci-hotplug-cpqphp-fix-kernel-null-pointer-dereference.patch b/queue-2.6.27/pci-hotplug-cpqphp-fix-kernel-null-pointer-dereference.patch
new file mode 100644 (file)
index 0000000..2573dfa
--- /dev/null
+++ b/queue-2.6.27/pci-hotplug-cpqphp-fix-kernel-null-pointer-dereference.patch
@@ -0,0 +1,45 @@
+From jejb@kernel.org  Thu Oct 23 20:51:59 2008
+From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
+Date: Fri, 24 Oct 2008 02:50:03 GMT
+Subject: PCI hotplug: cpqphp: fix kernel NULL pointer dereference
+To: jejb@kernel.org, stable@kernel.org
+Message-ID: <200810240250.m9O2o3aV015117@hera.kernel.org>
+
+From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
+
+commit d2174c3c07adad88dd9ba37a731e0b00b746822a upstream
+
+The following patch fixes the regression in 2.6.27 that causes kernel
+NULL pointer dereference at cpqphp driver probe time.  This patch should
+be backported to the .27 stable series.
+
+Seems to have been introduced by
+f46753c5e354b857b20ab8e0fe7b2579831dc369.
+
+The root cause of this problem seems that cpqphp driver calls
+pci_hp_register() wrongly. In current implementation, cpqphp driver
+passes 'ctrl->pci_dev->subordinate' as a second parameter for
+pci_hp_register(). But because hotplug slots and it's hotplug controller
+(exists as a pci funcion) are on the same bus, it should be
+'ctrl->pci_dev->bus' instead.
+
+Tested-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/pci/hotplug/cpqphp_core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/hotplug/cpqphp_core.c
++++ b/drivers/pci/hotplug/cpqphp_core.c
+@@ -435,7 +435,7 @@ static int ctrl_slot_setup(struct contro
+                               slot->number, ctrl->slot_device_offset,
+                               slot_number);
+               result = pci_hp_register(hotplug_slot,
+-                                       ctrl->pci_dev->subordinate,
++                                       ctrl->pci_dev->bus,
+                                        slot->device);
+               if (result) {
+                       err("pci_hp_register failed with error %d\n", result);

diff --git a/queue-2.6.27/scsi-scsi_dh-add-dell-product-information-into-rdac-device-handler.patch b/queue-2.6.27/scsi-scsi_dh-add-dell-product-information-into-rdac-device-handler.patch
new file mode 100644 (file)
index 0000000..c74b99b
--- /dev/null
+++ b/queue-2.6.27/scsi-scsi_dh-add-dell-product-information-into-rdac-device-handler.patch
@@ -0,0 +1,32 @@
+From 650849d71ca05d55a1553fe42fb21af9dce5612b Mon Sep 17 00:00:00 2001
+From: Yanqing_Liu@Dell.com <Yanqing_Liu@Dell.com>
+Date: Thu, 2 Oct 2008 12:18:33 -0500
+Subject: SCSI: scsi_dh: add Dell product information into rdac device handler
+
+From: Yanqing_Liu@Dell.com <Yanqing_Liu@Dell.com>
+
+commit 650849d71ca05d55a1553fe42fb21af9dce5612b upstream.
+
+Add Dell Powervault storage arrays into device list of rdac device
+handler.
+
+Signed-off-by: Yanqing Liu <yanqing_liu@dell.com>
+Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
+Cc: shyam iyer <shyam_iyer@dell.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/scsi/device_handler/scsi_dh_rdac.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
++++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
+@@ -590,6 +590,8 @@ static const struct scsi_dh_devlist rdac
+       {"STK", "OPENstorage D280"},
+       {"SUN", "CSM200_R"},
+       {"SUN", "LCSM100_F"},
++      {"DELL", "MD3000"},
++      {"DELL", "MD3000i"},
+       {NULL, NULL},
+ };
+ 

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index c8e3c4aae1a911b15d60ff9ad758ee618e67dcc9..4a35b358d8674861ab34169dc0a8804c688b78fc 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -22,3 +22,6 @@ acpi-suspend-enable-acpi-during-resume-if-sci_en-is-not-set.patch
 acpi-suspend-blacklist-hp-xw4600-workstation-for-old-code-ordering.patch
 acpi-suspend-always-use-the-32-bit-waking-vector.patch
 proc-fix-vma-display-mismatch-between-proc-pid-maps-smaps.patch
+scsi-scsi_dh-add-dell-product-information-into-rdac-device-handler.patch
+pci-hotplug-cpqphp-fix-kernel-null-pointer-dereference.patch
+ath5k-fix-suspend-related-oops-on-rmmod.patch