[kernel] r5045 - in dists/sid/linux-2.6/debian: . patches-debian
patches-debian/series
Frederik Schüler
fschueler-guest at costa.debian.org
Mon Dec 19 13:58:42 UTC 2005
Author: fschueler-guest
Date: Mon Dec 19 13:58:41 2005
New Revision: 5045
Added:
dists/sid/linux-2.6/debian/patches-debian/ppc64-thermal-overtemp.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch
dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-6
Log:
* Add updated drivers-scsi-megaraid_splitup.patch.
* Add ppc64-thermal-overtemp.patch to fix a thermal control bug in G5 machines.
* de-apply the following patches which are included in 2.6.14.4:
- setkeys-needs-root-1.patch
- setkeys-needs-root-2.patch
- mm-invalidate_inode_pages2-overflow.patch
- net-bonding-consolidation-fix.patch
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Mon Dec 19 13:58:41 2005
@@ -30,10 +30,15 @@
- ACPI: fix HP nx8220 boot hang regression
[ Norbert Tretkowski ]
- * [alpha] Removed conflict with initramfs-tools, thanks vorlon for finding
- the klibc bug!
+ * [alpha] Removed conflict with initramfs-tools, thanks vorlon for finding
+ the klibc bug!
- -- Norbert Tretkowski <nobse at debian.org> Fri, 16 Dec 2005 22:10:28 +0100
+ [ Frederik Schüler ]
+ * Add updated drivers-scsi-megaraid_splitup.patch. (Closes: #317258)
+ * Add ppc64-thermal-overtemp.patch to fix a thermal control bug in G5
+ machines. (Closes: #343980)
+
+ -- Frederik Schüler <fs at debian.org> Mon, 19 Dec 2005 14:09:14 +0100
linux-2.6 (2.6.14-5) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch (original)
+++ dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch Mon Dec 19 13:58:41 2005
@@ -1,25 +1,30 @@
-# From Fabio M. Di Nitto <fabbione at ubuntu.com>
-# Date 27th May 2005
-# Source Ubuntu kernel-team baz-archive
-# http://people.u.c/~lamont/Archives/kernel-team@ubuntu.com--2005/
-# kernel-debian--pre1,2--2.6.11.93
-#
-# * The megaraid legacy driver is around only to support AMI megaraid 1 and 2.
-# All the other controllers are supported (according to the code) by the
-# new megaraid driver:
-# - Add patch drivers-scsi-megaraid_spiltup.dpatch:
-# . Split PCI ID's properly between the 2 drivers.
-# . Allow compilation of both drivers at the same time.
-# . Update Kconfig.megaraid to reflect the new changes in the help.
-# . Rename a few things in the old megaraid driver to avoid possible
-# conflicts with the new drivers (NOTE: there might be more that needs
-# to be changed given that now the 2 modules can be loaded at the same
-# time).
+# drivers-scsi-megaraid_splitup.patch by Frederik Schüler <fs at debian.org>
+# Patch author: Ben Collins <bcollins at ubuntu.com>
+# Upstream status: not submitted
+# Description: Support megaraid legacy and megraid newgen, side-by-side
+# Source: ubuntu-2.6 git
+# diff from ca0e9390e01be69893d78bf9576d63ec85a6965e to 03bba4e0c091909e36520f2e617e51e87e50f8cd
+# diff from e82633eb19c4b390846a6eecd72204b696448954 to 8378e9887b6cf0b99e28a3b71c585bd1279932f7
-diff -urNad linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid
---- linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid 2005-03-02 08:37:49.000000000 +0100
-+++ /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid 2005-04-19 08:28:09.521239400 +0200
-@@ -64,15 +64,11 @@
+diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
+index 7363e12..d71a230 100644
+--- a/drivers/scsi/megaraid/Kconfig.megaraid
++++ b/drivers/scsi/megaraid/Kconfig.megaraid
+@@ -1,12 +1,6 @@
+-config MEGARAID_NEWGEN
+- bool "LSI Logic New Generation RAID Device Drivers"
+- depends on PCI && SCSI
+- help
+- LSI Logic RAID Device Drivers
+-
+ config MEGARAID_MM
+ tristate "LSI Logic Management Module (New Driver)"
+- depends on PCI && SCSI && MEGARAID_NEWGEN
++ depends on PCI && SCSI
+ help
+ Management Module provides ioctl, sysfs support for LSI Logic
+ RAID controllers.
+@@ -64,18 +58,15 @@ config MEGARAID_MAILBOX
To compile this driver as a module, choose M here: the
module will be called megaraid_mbox
@@ -31,15 +36,33 @@
- This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
- and 467 SCSI host adapters. This driver also support the all U320
- RAID controllers
-+ This driver supports the AMI MEGARAID 1 and 2.
++ This driver supports the AMI MEGARAID 1 and 2, and the HP NETRAID
++ 1 and 2
To compile this driver as a module, choose M here: the
module will be called megaraid
-endif
-diff -urNad linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c
---- linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c 2005-03-02 08:37:30.000000000 +0100
-+++ /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c 2005-04-19 08:35:13.889725584 +0200
-@@ -4565,7 +4565,7 @@
+
+ config MEGARAID_SAS
+ tristate "LSI Logic MegaRAID SAS RAID Module"
+diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
+index 4facf55..59cdd2a 100644
+--- a/drivers/scsi/megaraid.h
++++ b/drivers/scsi/megaraid.h
+@@ -84,6 +84,10 @@
+ #define LSI_SUBSYS_VID 0x1000
+ #define INTEL_SUBSYS_VID 0x8086
+
++/* Sub-System Device IDs */
++#define HP_NETRAID1M_SUBSYS_DID 0x60E7
++#define HP_NETRAID2M_SUBSYS_DID 0x60E8
++
+ #define HBA_SIGNATURE 0x3344
+ #define HBA_SIGNATURE_471 0xCCCC
+ #define HBA_SIGNATURE_64BIT 0x0299
+--- a/drivers/scsi/megaraid.c
++++ b/drivers/scsi/megaraid.c
+@@ -4570,7 +4570,7 @@
};
static int __devinit
@@ -48,35 +71,43 @@
{
struct Scsi_Host *host;
adapter_t *adapter;
-@@ -5033,35 +5033,23 @@
+@@ -5036,36 +5036,28 @@
+ __megaraid_shutdown(adapter);
}
- static struct pci_device_id megaraid_pci_tbl[] = {
+-static struct pci_device_id megaraid_pci_tbl[] = {
- {PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DISCOVERY,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_PERC4_DI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
- {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_PERC4_QC_VERDE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
++static struct pci_device_id megaraid_legacy_pci_tbl[] = {
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-- {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
+ {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ HP_SUBSYS_VID, HP_NETRAID1M_SUBSYS_DID, 0, 0, 0},
++ {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
++ HP_SUBSYS_VID, HP_NETRAID2M_SUBSYS_DID, 0, 0, 0},
{0,}
};
- MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
+-MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
++MODULE_DEVICE_TABLE(pci, megaraid_legacy_pci_tbl);
- static struct pci_driver megaraid_pci_driver = {
+-static struct pci_driver megaraid_pci_driver = {
- .name = "megaraid",
-+ .name = "megaraidlegacy",
- .id_table = megaraid_pci_tbl,
+- .id_table = megaraid_pci_tbl,
- .probe = megaraid_probe_one,
++static struct pci_driver megaraid_legacy_pci_driver = {
++ .name = "megaraidlegacy",
++ .id_table = megaraid_legacy_pci_tbl,
+ .probe = megaraid_legacy_probe_one,
.remove = __devexit_p(megaraid_remove_one),
.shutdown = megaraid_shutdown,
@@ -87,7 +118,16 @@
{
int error;
-@@ -5102,7 +5090,7 @@
+@@ -5081,7 +5073,7 @@
+ "megaraid: failed to create megaraid root\n");
+ }
+ #endif
+- error = pci_module_init(&megaraid_pci_driver);
++ error = pci_module_init(&megaraid_legacy_pci_driver);
+ if (error) {
+ #ifdef CONFIG_PROC_FS
+ remove_proc_entry("megaraid", &proc_root);
+@@ -5104,21 +5096,21 @@
return 0;
}
@@ -96,7 +136,14 @@
{
/*
* Unregister the character device interface to the driver.
-@@ -5116,7 +5104,7 @@
+ */
+ unregister_chrdev(major, "megadev");
+
+- pci_unregister_driver(&megaraid_pci_driver);
++ pci_unregister_driver(&megaraid_legacy_pci_driver);
+
+ #ifdef CONFIG_PROC_FS
+ remove_proc_entry("megaraid", &proc_root);
#endif
}
Added: dists/sid/linux-2.6/debian/patches-debian/ppc64-thermal-overtemp.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches-debian/ppc64-thermal-overtemp.patch Mon Dec 19 13:58:41 2005
@@ -0,0 +1,33 @@
+Subject: [PATCH] powerpc: g5 thermal overtemp bug
+
+The g5 thermal control for liquid cooled machines has a small bug, when
+the temperatures gets too high, it boosts all fans to the max, but
+incorrectly sets the liquids pump to the min instead of the max speed,
+thus causing the overtemp condition not to clear and the machine to shut
+down after a while. This fixes it to set the pumps to max speed instead.
+This problem might explain some of the reports of random shutdowns that
+some g5 users have been reporting in the past.
+
+Many thanks to Marcus Rothe for spending a lot of time trying various
+patches & sending log logs before I found out that typo. Note that
+overtemp handling is still not perfect and the machine might still
+shutdown, that patch should reduce if not eliminate such occcurences in
+"normal" conditions with high load. I'll implement a better handling
+with proper slowing down of the CPUs later.
+
+Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+
+
+Index: linux-work/drivers/macintosh/therm_pm72.c
+===================================================================
+--- linux-work.orig/drivers/macintosh/therm_pm72.c 2005-11-10 08:20:14.000000000 +1100
++++ linux-work/drivers/macintosh/therm_pm72.c 2005-12-19 11:20:39.000000000 +1100
+@@ -933,7 +933,7 @@
+ if (state0->overtemp > 0) {
+ state0->rpm = state0->mpu.rmaxn_exhaust_fan;
+ state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan;
+- pump = state0->pump_min;
++ pump = state0->pump_max;
+ goto do_set_fans;
+ }
+
Modified: dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-6
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-6 (original)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-6 Mon Dec 19 13:58:41 2005
@@ -1 +1,7 @@
+- setkeys-needs-root-2.patch
+- setkeys-needs-root-1.patch
+- mm-invalidate_inode_pages2-overflow.patch
+- net-bonding-consolidation-fix.patch
+ 2.6.14.4.patch
++ ppc64-thermal-overtemp.patch
++ drivers-scsi-megaraid_splitup.patch
More information about the Kernel-svn-changes
mailing list