Commit 97d41e90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (54 commits)
  [SCSI] Initial Commit of qla4xxx
  [SCSI] raid class: handle component-add errors
  [SCSI] SCSI megaraid_sas: handle thrown errors
  [SCSI] SCSI aic94xx: handle sysfs errors
  [SCSI] SCSI st: fix error handling in module init, sysfs
  [SCSI] SCSI sd: fix module init/exit error handling
  [SCSI] SCSI osst: add error handling to module init, sysfs
  [SCSI] scsi: remove hosts.h
  [SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c
  [SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog
  [SCSI] megaraid_sas: adds tasklet for cmd completion
  [SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error
  [SCSI] megaraid_sas: function pointer for disable interrupt
  [SCSI] megaraid_sas: frame count optimization
  [SCSI] megaraid_sas: FW transition and q size changes
  [SCSI] qla2xxx: Update version number to 8.01.07-k2.
  [SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked.
  [SCSI] qla2xxx: Add MODULE_FIRMWARE tags.
  [SCSI] qla2xxx: Add support for host port state FC transport attribute.
  [SCSI] qla2xxx: Add support for fabric name FC transport attribute.
  ...
parents 3bdc9d0b afaf5a2d

Documentation/scsi/ChangeLog.megaraid_sas

+45 −0
Original line number Diff line number Diff line 


1 Release Date    : Mon Oct 02 11:21:32 PDT 2006 - Sumant Patro <Sumant.Patro@lsil.com>

2 Current Version : 00.00.03.05

3 Older Version   : 00.00.03.04



i.	PCI_DEVICE macro used



	Convert the pci_device_id-table of the megaraid_sas-driver to the PCI_DEVICE-macro, to safe some lines.



		- Henrik Kretzschmar <henne@nachtwindheim.de>

ii.	All compiler warnings removed

iii.	megasas_ctrl_info struct reverted to 3.02 release

iv.	Default value of megasas_dbg_lvl set to 0

v.	Removing in megasas_exit the sysfs entry created for megasas_dbg_lvl

vi.	In megasas_teardown_frame_pool(), cmd->frame was passed instead of

	cmd->sense to pci_pool_free. Fixed. Bug was pointed out by

	Eric Sesterhenn



1 Release Date    : Wed Sep 13 14:22:51 PDT 2006 - Sumant Patro <Sumant.Patro@lsil.com>

2 Current Version : 00.00.03.04

3 Older Version   : 00.00.03.03



i.	Added Reboot notify

ii.	Reduced by 1 max cmds sent to FW from Driver to make the reply_q_sz same

	as Max Cmds FW can support



1 Release Date    : Tue Aug 22 16:33:14 PDT 2006 - Sumant Patro <Sumant.Patro@lsil.com>

2 Current Version : 00.00.03.03

3 Older Version   : 00.00.03.02



i.	Send stop adapter to FW & Dump pending FW cmds before declaring adapter dead.

	New varible added to set dbg level.

ii.	Disable interrupt made as fn pointer as they are different for 1068 / 1078

iii.	Frame count optimization. Main frame can contain 2 SGE for 64 bit SGLs and

	3 SGE for 32 bit SGL

iv.	Tasklet added for cmd completion

v.	If FW in operational state before firing INIT, now we send RESET Flag to FW instead of just READY. This is used to do soft reset.

vi.	megasas_ctrl_prop structure updated (based on FW struct)

vii.	Added print : FW now in Ready State during initialization



1 Release Date    : Sun Aug 06 22:49:52 PDT 2006 - Sumant Patro <Sumant.Patro@lsil.com>

2 Current Version : 00.00.03.02

3 Older Version   : 00.00.03.01



i.	Added FW tranistion state for Hotplug scenario



1 Release Date    : Sun May 14 22:49:52 PDT 2006 - Sumant Patro <Sumant.Patro@lsil.com>

2 Current Version : 00.00.03.01

3 Older Version   : 00.00.02.04

drivers/message/fusion/linux_compat.h

+0 −9
Original line number Diff line number Diff line
@@ -6,13 +6,4 @@ 
#include <linux/version.h>

#include <scsi/scsi_device.h>



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,6))

static int inline scsi_device_online(struct scsi_device *sdev)

{

	return sdev->online;

}

#endif





/*}-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

#endif /* _LINUX_COMPAT_H */

drivers/scsi/3w-9xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -2211,7 +2211,7 @@ static int __init twa_init(void) 
{

	printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);



	return pci_module_init(&twa_driver);

	return pci_register_driver(&twa_driver);

} /* End twa_init() */



/* This function is called on driver exit */

drivers/scsi/3w-xxxx.c

+1 −1
Original line number Diff line number Diff line
@@ -2486,7 +2486,7 @@ static int __init tw_init(void) 
{

	printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);



	return pci_module_init(&tw_driver);

	return pci_register_driver(&tw_driver);

} /* End tw_init() */



/* This function is called on driver exit */

drivers/scsi/3w-xxxx.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static char *tw_aen_string[] = { 
	[0x00D] = "ERROR: Logical unit deleted: Unit #",

	[0x00F] = "WARNING: SMART threshold exceeded: Port #",

	[0x021] = "WARNING: ATA UDMA downgrade: Port #",

	[0x021] = "WARNING: ATA UDMA upgrade: Port #",

	[0x022] = "WARNING: ATA UDMA upgrade: Port #",

	[0x023] = "WARNING: Sector repair occurred: Port #",

	[0x024] = "ERROR: SBUF integrity check failure",

	[0x025] = "ERROR: Lost cached write: Port #",

CRA Git | Maintained and supported by SUSTech CRA and CCSE