+ mptsas-add-mptsas_shutdown-to-call-pci_disable_msi.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     mptsas: add mptsas_shutdown to call pci_disable_msi
has been added to the -mm tree.  Its filename is
     mptsas-add-mptsas_shutdown-to-call-pci_disable_msi.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: mptsas: add mptsas_shutdown to call pci_disable_msi
From: Yinghai Lu <yhlu.kernel.send@xxxxxxxxx>

this change

| commit 23a274c8a5adafc74a66f16988776fc7dd6f6e51
| Author: Prakash, Sathya <sathya.prakash@xxxxxxx>
| Date:   Fri Mar 7 15:53:21 2008 +0530
|
|     [SCSI] mpt fusion: Enable MSI by default for SAS controllers
|
|     This patch modifies the driver to enable MSI by default for all SAS chips.
|

causes a kexec of the RHEL 5.1 kernel to fail.

root cause: the rhel 5.1 kernel still use INTx emulation.  and
mptscsih_shutdown doesn't call pci_disable_msi to reenable INTx on kexec path

So try to call mptsas_remove in mptsas_shutdown.  then pci_disable_msi will be
called via mptsas_remove==>mptscih_remove==> mpt_detach.

Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
Cc: Prakash, Sathya <sathya.prakash@xxxxxxx>
Cc: "Moore, Eric" <Eric.Moore@xxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/message/fusion/mptsas.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff -puN drivers/message/fusion/mptsas.c~mptsas-add-mptsas_shutdown-to-call-pci_disable_msi drivers/message/fusion/mptsas.c
--- a/drivers/message/fusion/mptsas.c~mptsas-add-mptsas_shutdown-to-call-pci_disable_msi
+++ a/drivers/message/fusion/mptsas.c
@@ -3326,6 +3326,11 @@ static void __devexit mptsas_remove(stru
 	mptscsih_remove(pdev);
 }
 
+static void mptsas_shutdown(struct pci_dev *pdev)
+{
+	mptsas_remove(pdev);
+}
+
 static struct pci_device_id mptsas_pci_table[] = {
 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
 		PCI_ANY_ID, PCI_ANY_ID },
@@ -3347,7 +3352,7 @@ static struct pci_driver mptsas_driver =
 	.id_table	= mptsas_pci_table,
 	.probe		= mptsas_probe,
 	.remove		= __devexit_p(mptsas_remove),
-	.shutdown	= mptscsih_shutdown,
+	.shutdown	= mptsas_shutdown,
 #ifdef CONFIG_PM
 	.suspend	= mptscsih_suspend,
 	.resume		= mptscsih_resume,
_

Patches currently in -mm which might be from yhlu.kernel.send@xxxxxxxxx are

origin.patch
linux-next.patch
mptsas-add-mptsas_shutdown-to-call-pci_disable_msi.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux