Commit ed7e8ef7 authored by Ju, Seokmann's avatar Ju, Seokmann Committed by James Bottomley
Browse files

[SCSI] megaraid_{mbox,mm} : remove PCI Id overlaping between megaraid_legacy and megaraid_{mbox,mm} 



Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3492b328

Documentation/scsi/ChangeLog.megaraid

+35 −0
Original line number Diff line number Diff line 
Release Date	: Fri Nov 11 12:27:22 EST 2005 - Seokmann Ju <sju@lsil.com>

Current Version : 2.20.4.7 (scsi module), 2.20.2.6 (cmm module)

Older Version	: 2.20.4.6 (scsi module), 2.20.2.6 (cmm module)



1.	Sorted out PCI IDs to remove megaraid support overlaps.

	Based on the patch from Daniel, sorted out PCI IDs along with

	charactor node name change from 'megadev' to 'megadev_legacy' to avoid

	conflict.

	---

	Hopefully we'll be getting the build restriction zapped much sooner, 

	but we should also be thinking about totally removing the hardware 

	support overlap in the megaraid drivers.



	This patch pencils in a date of Feb 06 for this, and performs some 

	printk abuse in hope that existing legacy users might pick up on what's

	going on.



	Signed-off-by: Daniel Drake <dsd@gentoo.org>

	---



2.	Fixed a issue: megaraid always fails to reset handler.

	---

	I found that the megaraid driver always fails to reset the

	adapter with the following message:

		megaraid: resetting the host...

		megaraid mbox: reset sequence completed successfully

		megaraid: fast sync command timed out

		megaraid: reservation reset failed

	when the "Cluster mode" of the adapter BIOS is enabled.

	So, whenever the reset occurs, the adapter goes to

	offline and just become unavailable.



	Jun'ichi Nomura [mailto:jnomura@mtc.biglobe.ne.jp]

	---



Release Date	: Mon Mar 07 12:27:22 EST 2005 - Seokmann Ju <sju@lsil.com>

Current Version : 2.20.4.6 (scsi module), 2.20.2.6 (cmm module)

Older Version	: 2.20.4.5 (scsi module), 2.20.2.5 (cmm module)

drivers/scsi/megaraid/Kconfig.megaraid

+0 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 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
@@ -75,7 +74,6 @@ config MEGARAID_LEGACY 


	To compile this driver as a module, choose M here: the

	module will be called megaraid

endif



config MEGARAID_SAS

	tristate "LSI Logic MegaRAID SAS RAID Module"

drivers/scsi/megaraid/megaraid_mbox.c

+9 −73
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ 
 *	   2 of the License, or (at your option) any later version.

 *

 * FILE		: megaraid_mbox.c

 * Version	: v2.20.4.6 (Mar 07 2005)

 * Version	: v2.20.4.7 (Nov 14 2005)

 *

 * Authors:

 * 	Atul Mukker		<Atul.Mukker@lsil.com>

 * 	Sreenivas Bagalkote	<Sreenivas.Bagalkote@lsil.com>

 * 	Manoj Jose		<Manoj.Jose@lsil.com>

 * 	Seokmann Ju		<Seokmann.Ju@lsil.com>

 *

 * List of supported controllers

 *
@@ -136,7 +137,7 @@ static int wait_till_fw_empty(adapter_t *); 






MODULE_AUTHOR("LSI Logic Corporation");

MODULE_AUTHOR("sju@lsil.com");

MODULE_DESCRIPTION("LSI Logic MegaRAID Mailbox Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(MEGARAID_VERSION);
@@ -278,68 +279,14 @@ static struct pci_device_id pci_id_table_g[] = { 
	{

		PCI_VENDOR_ID_AMI,

		PCI_DEVICE_ID_AMI_MEGARAID3,

		PCI_VENDOR_ID_DELL,

		PCI_SUBSYS_ID_PERC3_QC,

	},

	{

		PCI_VENDOR_ID_AMI,

		PCI_DEVICE_ID_AMI_MEGARAID3,

		PCI_VENDOR_ID_DELL,

		PCI_SUBSYS_ID_PERC3_DC,

	},

	{

		PCI_VENDOR_ID_AMI,

		PCI_DEVICE_ID_AMI_MEGARAID3,

		PCI_VENDOR_ID_DELL,

		PCI_SUBSYS_ID_PERC3_SC,

	},

	{

		PCI_VENDOR_ID_AMI,

		PCI_DEVICE_ID_AMI_MEGARAID3,

		PCI_VENDOR_ID_AMI,

		PCI_SUBSYS_ID_PERC3_SC,

	},

	{

		PCI_VENDOR_ID_AMI,

		PCI_DEVICE_ID_AMI_MEGARAID3,

		PCI_VENDOR_ID_AMI,

		PCI_SUBSYS_ID_PERC3_DC,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_MEGARAID_SCSI_320_0,

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_SUBSYS_ID_MEGARAID_SCSI_320_0,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_MEGARAID_SCSI_320_1,

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_SUBSYS_ID_MEGARAID_SCSI_320_1,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_MEGARAID_SCSI_320_2,

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_SUBSYS_ID_MEGARAID_SCSI_320_2,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_MEGARAID_I4_133_RAID,

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_SUBSYS_ID_MEGARAID_I4_133_RAID,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_MEGARAID_SATA_150_4,

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_SUBSYS_ID_MEGARAID_SATA_150_4,

		PCI_ANY_ID,

		PCI_ANY_ID,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_MEGARAID_SATA_150_6,

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_SUBSYS_ID_MEGARAID_SATA_150_6,

		PCI_DEVICE_ID_AMI_MEGARAID3,

		PCI_ANY_ID,

		PCI_ANY_ID,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,
@@ -347,18 +294,6 @@ static struct pci_device_id pci_id_table_g[] = { 
		PCI_ANY_ID,

		PCI_ANY_ID,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_INTEL_RAID_SRCS16,

		PCI_VENDOR_ID_INTEL,

		PCI_SUBSYS_ID_INTEL_RAID_SRCS16,

	},

	{

		PCI_VENDOR_ID_LSI_LOGIC,

		PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK,

		PCI_VENDOR_ID_INTEL,

		PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK,

	},

	{0}	/* Terminating entry */

};

MODULE_DEVICE_TABLE(pci, pci_id_table_g);
@@ -2985,6 +2920,7 @@ mbox_post_sync_cmd_fast(adapter_t *adapter, uint8_t raw_mbox[]) 


	for (i = 0; i < 0xFFFFF; i++) {

		if (mbox->numstatus != 0xFF) break;

		rmb();

	}



	if (i == 0xFFFFF) {

drivers/scsi/megaraid/megaraid_mbox.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include "megaraid_ioctl.h"





#define MEGARAID_VERSION	"2.20.4.6"

#define MEGARAID_EXT_VERSION	"(Release Date: Mon Mar 07 12:27:22 EST 2005)"

#define MEGARAID_VERSION	"2.20.4.7"

#define MEGARAID_EXT_VERSION	"(Release Date: Mon Nov 14 12:27:22 EST 2005)"





/*