include patch for megaraid_sas driver

see http://www.anchor.com.au/blog/2012/03/bugfixing-the-in-kernel-megaraid_sas-driver-from-crash-to-patch/ for a detailed description

diff --git a/Makefile b/Makefile
index 96df8c2fef8c1fd8be8e7107e073cfd857ecb7d9..d1e20d2378fd0aad5be859ad6f2c7fd6c5ae8f05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=65
+PKGREL=66
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=11
@@ -134,6 +134,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        cd ${KERNEL_SRC}; patch -p1 <../optimize-cfq-parameters.patch
+       cd ${KERNEL_SRC}; patch -p1 <../megaraid_sas-mask-off-flags-in-ioctl-path.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 

diff --git a/changelog.Debian b/changelog.Debian
index 4f3fcf95c4e2a80ef91407a4a4047efc5e2157c9..a335ebb5c6a7c22e3ad63db612ca36f98aed77be 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-66) unstable; urgency=low
+
+  * include patch for megaraid_sas driver: http://www.anchor.com.au/blog/2012/03/bugfixing-the-in-kernel-megaraid_sas-driver-from-crash-to-patch/
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Apr 2012 07:02:48 +0200
+
 pve-kernel-2.6.32 (2.6.32-65) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab053.5.src.rpm

diff --git a/megaraid_sas-mask-off-flags-in-ioctl-path.patch b/megaraid_sas-mask-off-flags-in-ioctl-path.patch
new file mode 100644 (file)
index 0000000..5bbf1fd
--- /dev/null
+++ b/megaraid_sas-mask-off-flags-in-ioctl-path.patch
@@ -0,0 +1,29 @@
+From 882be7c3be72f6d72ae7a81e707154287ea5d289 Mon Sep 17 00:00:00 2001
+From: adam radford <aradford@gmail.com>
+Date: Fri, 6 Jan 2012 17:02:34 -0800
+Subject: [PATCH] [SCSI] megaraid_sas: mask off flags in ioctl path
+
+Mask off flags in the ioctl path to prevent memory scribble with older MegaCLI
+versions.
+
+Signed-off-by: Adam Radford <aradford@gmail.com>
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+---
+ drivers/scsi/megaraid/megaraid_sas_base.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
+index 29a994f..2bdc707 100644
+--- a/drivers/scsi/megaraid/megaraid_sas_base.c
++++ b/drivers/scsi/megaraid/megaraid_sas_base.c
+@@ -4773,6 +4773,8 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
+       memcpy(cmd->frame, ioc->frame.raw, 2 * MEGAMFI_FRAME_SIZE);
+       cmd->frame->hdr.context = cmd->index;
+       cmd->frame->hdr.pad_0 = 0;
++      cmd->frame->hdr.flags &= ~(MFI_FRAME_IEEE | MFI_FRAME_SGL64 |
++                                 MFI_FRAME_SENSE64);
+ 
+       /*
+        * The management interface between applications and the fw uses
+-- 
+1.7.7.6

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index 82866bcbe0f493604953cd462d737a59e3426439..5d3d279561d1a83ee12843cfa5cf48a8d9b61f74 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (2.0-65) unstable; urgency=low
+proxmox-ve-2.6.32 (2.0-66) unstable; urgency=low
 
   * re-package to update version number