Allow both megaraid drivers to be built
Subsystems (2)
PATCH RESEND 1/1 Allow both megaraid drivers to be built
Hi James,
Here's a rediff of a patch I sent at the end of August.
Rename megaraid to megaraid_legacy, changing sysfs name, module name, and the messages printed out via printk. I have left the procfs name as "megaraid" as presumably userspace tools rely on this.
Remove hardware ID's from megaraid_legacy which overlap with the newgen megaraid drivers.
Allow megaraid_legacy to be built alongside the newgen driver.
Instead of renaming the file locally and sending a huge unreviewable diff, I've left the original filenames (megaraid.c and megaraid.h) in place. Please use git-mv to rename these to megaraid_legacy.[ch] once you have applied this.
drivers/scsi/Makefile renamed from drivers/scsi/Makefile.orig +1 -1
@@ -97,7 +97,7 @@ obj-$(CONFIG_SCSI_IBMMCA) += ibmmca.o obj-$(CONFIG_SCSI_EATA) += eata.o obj-$(CONFIG_SCSI_DC395x) += dc395x.o obj-$(CONFIG_SCSI_DC390T) += tmscsim.o -obj-$(CONFIG_MEGARAID_LEGACY) += megaraid.o +obj-$(CONFIG_MEGARAID_LEGACY) += megaraid_legacy.o obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/ obj-$(CONFIG_MEGARAID_SAS) += megaraid/ obj-$(CONFIG_SCSI_ACARD) += atp870u.o
drivers/scsi/megaraid/Kconfig.megaraid renamed from drivers/scsi/megaraid/Kconfig.megaraid.orig +6 -6
@@ -64,18 +64,18 @@ config MEGARAID_MAILBOX To compile this driver as a module, choose M here: the module will be called megaraid_mbox -if MEGARAID_NEWGEN=n config MEGARAID_LEGACY tristate "LSI Logic Legacy MegaRAID Driver" depends on PCI && SCSI help - 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 LSI MegaRAID 418, 428, 438, 466, 467, 762, 490 + and 467 SCSI host adapters. + + Other MegaRAID controllers are supported by the MEGARAID_NEWGEN driver + series. To compile this driver as a module, choose M here: the - module will be called megaraid -endif + module will be called megaraid_legacy config MEGARAID_SAS tristate "LSI Logic MegaRAID SAS RAID Module"
drivers/scsi/megaraid.c renamed from drivers/scsi/megaraid.c.orig +64 -65
385 lines not on this page · raw message
drivers/scsi/megaraid.h renamed from drivers/scsi/megaraid.h.orig +2 -10
@@ -1,5 +1,5 @@ -#ifndef __MEGARAID_H__ -#define __MEGARAID_H__ +#ifndef __MEGARAID_LEGACY_H__ +#define __MEGARAID_LEGACY_H__#include <linux/spinlock.h>
@@ -45,18 +45,10 @@#define MAX_DEV_TYPE 32 -#ifndef PCI_VENDOR_ID_LSI_LOGIC -#define PCI_VENDOR_ID_LSI_LOGIC 0x1000 -#endif -#ifndef PCI_VENDOR_ID_AMI #define PCI_VENDOR_ID_AMI 0x101E#endif -#ifndef PCI_VENDOR_ID_DELL -#define PCI_VENDOR_ID_DELL 0x1028 -#endif -#ifndef PCI_VENDOR_ID_INTEL #define PCI_VENDOR_ID_INTEL 0x8086#endif
Quoted 6 lines · Daniel Drake
Here's a rediff of a patch I sent at the end of August.
Rename megaraid to
megaraid_legacy, changing sysfs name, module name, and the messages printed out via printk. I have left the procfs name as "megaraid" as presumably userspace tools rely on this.
Quoted 8 lines
Remove hardware ID's from
megaraid_legacywhich overlap with the newgen megaraid drivers.Allow
megaraid_legacyto be built alongside the newgen driver.Instead of renaming the file locally and sending a huge unreviewable diff, I've left the original filenames (
megaraid.candmegaraid.h) in place. Please use git-mv to rename these to megaraid_legacy.[ch] once you have applied this.
This looks fine to me. I would, however, like input from the megaraid maintainers, since it actually involves a name change. However, if there are no comments before we got -rc, I'll queue it for after 2.6.15
James