Commit 5f0b1437 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: (97 commits)
  [SCSI] zfcp: removed wrong comment
  [SCSI] zfcp: use of uninitialized variable
  [SCSI] zfcp: Invalid locking order
  [SCSI] aic79xx: use dma_get_required_mask()
  [SCSI] aic79xx: fix bracket mismatch in unused macro
  [SCSI] BusLogic: Replace 'boolean' by 'bool'
  [SCSI] advansys: clean up warnings
  [SCSI] 53c7xx: brackets fix in uncompiled code
  [SCSI] nsp_cs: remove old scsi code
  [SCSI] aic79xx: make ahd_match_scb() static
  [SCSI] DAC960: kmalloc->kzalloc/Casting cleanups
  [SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled
  [SCSI] Buslogic: local_irq_disable() is redundant after local_irq_save()
  [SCSI] aic94xx: update for v28 firmware
  [SCSI] scsi_error: Fix lost EH commands
  [SCSI] aic94xx: Add default bus reset handler
  [SCSI] aic94xx: Remove TMF result code munging
  [SCSI] libsas: Add an LU reset mechanism to the error handler
  [SCSI] libsas: Don't BUG when connecting two expanders via wide port
  [SCSI] st: fix Tape dies if wrong block size used, bug 7919
  ...
parents 574009c1 81b7bbd1

Documentation/scsi/ChangeLog.megaraid

+16 −0
Original line number Diff line number Diff line 
Release Date	: Thu Nov 16 15:32:35 EST 2006 -

				Sumant Patro <sumant.patro@lsi.com>

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

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



1.	Changes in Initialization to fix kdump failure.

	Send SYNC command on loading.

	This command clears the pending commands in the adapter

	and re-initialize its internal RAID structure.

	Without this change, megaraid driver either panics or fails to

	initialize the adapter during kdump's second kernel boot

	if there are pending commands or interrupts from other devices

	sharing the same IRQ.

2. 	Authors email-id domain name changed from lsil.com to lsi.com.

	Also modified the MODULE_AUTHOR to megaraidlinux@lsi.com



Release Date	: Fri May 19 09:31:45 EST 2006 - Seokmann Ju <sju@lsil.com>

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

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

drivers/block/DAC960.c

+13 −14
Original line number Diff line number Diff line
@@ -1373,8 +1373,7 @@ static bool DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T 
  Controller->BounceBufferLimit = DAC690_V2_PciDmaMask;



  /* This is a temporary dma mapping, used only in the scope of this function */

  CommandMailbox =

	  (DAC960_V2_CommandMailbox_T *)pci_alloc_consistent( PCI_Device,

  CommandMailbox = pci_alloc_consistent(PCI_Device,

		sizeof(DAC960_V2_CommandMailbox_T), &CommandMailboxDMA);

  if (CommandMailbox == NULL)

	  return false;
@@ -1879,8 +1878,8 @@ static bool DAC960_V2_ReadControllerConfiguration(DAC960_Controller_T 
      if (NewLogicalDeviceInfo->LogicalDeviceState !=

	  DAC960_V2_LogicalDevice_Offline)

	Controller->LogicalDriveInitiallyAccessible[LogicalDeviceNumber] = true;

      LogicalDeviceInfo = (DAC960_V2_LogicalDeviceInfo_T *)

	kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T), GFP_ATOMIC);

      LogicalDeviceInfo = kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T),

				   GFP_ATOMIC);

      if (LogicalDeviceInfo == NULL)

	return DAC960_Failure(Controller, "LOGICAL DEVICE ALLOCATION");

      Controller->V2.LogicalDeviceInformation[LogicalDeviceNumber] =
@@ -2113,8 +2112,8 @@ static bool DAC960_V2_ReadDeviceConfiguration(DAC960_Controller_T 
      if (!DAC960_V2_NewPhysicalDeviceInfo(Controller, Channel, TargetID, LogicalUnit))

	  break;



      PhysicalDeviceInfo = (DAC960_V2_PhysicalDeviceInfo_T *)

		kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T), GFP_ATOMIC);

      PhysicalDeviceInfo = kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T),

				    GFP_ATOMIC);

      if (PhysicalDeviceInfo == NULL)

		return DAC960_Failure(Controller, "PHYSICAL DEVICE ALLOCATION");

      Controller->V2.PhysicalDeviceInformation[PhysicalDeviceIndex] =
@@ -2122,8 +2121,8 @@ static bool DAC960_V2_ReadDeviceConfiguration(DAC960_Controller_T 
      memcpy(PhysicalDeviceInfo, NewPhysicalDeviceInfo,

		sizeof(DAC960_V2_PhysicalDeviceInfo_T));



      InquiryUnitSerialNumber = (DAC960_SCSI_Inquiry_UnitSerialNumber_T *)

	kmalloc(sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T), GFP_ATOMIC);

      InquiryUnitSerialNumber = kmalloc(

	      sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T), GFP_ATOMIC);

      if (InquiryUnitSerialNumber == NULL) {

	kfree(PhysicalDeviceInfo);

	return DAC960_Failure(Controller, "SERIAL NUMBER ALLOCATION");
@@ -4949,8 +4948,8 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command) 
	      PhysicalDevice.LogicalUnit = NewLogicalDeviceInfo->LogicalUnit;

	      Controller->V2.LogicalDriveToVirtualDevice[LogicalDeviceNumber] =

		PhysicalDevice;

	      LogicalDeviceInfo = (DAC960_V2_LogicalDeviceInfo_T *)

		kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T), GFP_ATOMIC);

	      LogicalDeviceInfo = kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T),

					  GFP_ATOMIC);

	      Controller->V2.LogicalDeviceInformation[LogicalDeviceNumber] =

		LogicalDeviceInfo;

	      DAC960_Critical("Logical Drive %d (/dev/rd/c%dd%d) "
@@ -5709,14 +5708,14 @@ static bool DAC960_CheckStatusBuffer(DAC960_Controller_T *Controller, 
      unsigned int NewStatusBufferLength = DAC960_InitialStatusBufferSize;

      while (NewStatusBufferLength < ByteCount)

	NewStatusBufferLength *= 2;

      Controller->CombinedStatusBuffer =

	(unsigned char *) kmalloc(NewStatusBufferLength, GFP_ATOMIC);

      Controller->CombinedStatusBuffer = kmalloc(NewStatusBufferLength,

						  GFP_ATOMIC);

      if (Controller->CombinedStatusBuffer == NULL) return false;

      Controller->CombinedStatusBufferLength = NewStatusBufferLength;

      return true;

    }

  NewStatusBuffer = (unsigned char *)

    kmalloc(2 * Controller->CombinedStatusBufferLength, GFP_ATOMIC);

  NewStatusBuffer = kmalloc(2 * Controller->CombinedStatusBufferLength,

			     GFP_ATOMIC);

  if (NewStatusBuffer == NULL)

    {

      DAC960_Warning("Unable to expand Combined Status Buffer - Truncating\n",

drivers/message/fusion/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config FUSION_MAX_SGE 


config FUSION_CTL

	tristate "Fusion MPT misc device (ioctl) driver"

	depends on FUSION_SPI || FUSION_FC

	depends on FUSION_SPI || FUSION_FC || FUSION_SAS

	---help---

	  The Fusion MPT misc device driver provides specialized control

	  of MPT adapters via system ioctl calls.  Use of ioctl calls to

drivers/message/fusion/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
#EXTRA_CFLAGS += -DMPT_DEBUG_INIT

#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT

#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL

#EXTRA_CFLAGS += -DMPT_DEBUG_DV

#EXTRA_CFLAGS += -DMPT_DEBUG_TM

#EXTRA_CFLAGS += -DMPT_DEBUG_REPLY



#

# driver/module specifics...
@@ -20,11 +23,7 @@ 
#CFLAGS_mptbase.o += -DMPT_DEBUG_RESET

#

#  For mptscsih:

#CFLAGS_mptscsih.o += -DMPT_DEBUG_DV

#CFLAGS_mptscsih.o += -DMPT_DEBUG_NEGO

#CFLAGS_mptscsih.o += -DMPT_DEBUG_TM

#CFLAGS_mptscsih.o += -DMPT_DEBUG_SCSI

#CFLAGS_mptscsih.o += -DMPT_DEBUG_REPLY

#

#  For mptctl:

#CFLAGS_mptctl.o += -DMPT_DEBUG_IOCTL

drivers/message/fusion/lsi/mpi.h

+4 −3
Original line number Diff line number Diff line 
/*

 *  Copyright (c) 2000-2005 LSI Logic Corporation.

 *  Copyright (c) 2000-2006 LSI Logic Corporation.

 *

 *

 *           Name:  mpi.h

 *          Title:  MPI Message independent structures and definitions

 *  Creation Date:  July 27, 2000

 *

 *    mpi.h Version:  01.05.11

 *    mpi.h Version:  01.05.12

 *

 *  Version History

 *  ---------------
@@ -77,6 +77,7 @@ 
 *  08-03-05  01.05.09  Bumped MPI_HEADER_VERSION_UNIT.

 *  08-30-05  01.05.10  Added 2 new IOCStatus codes for Target.

 *  03-27-06  01.05.11  Bumped MPI_HEADER_VERSION_UNIT.

 *  10-11-06  01.05.12  Bumped MPI_HEADER_VERSION_UNIT.

 *  --------------------------------------------------------------------------

 */
@@ -107,7 +108,7 @@ 
/* Note: The major versions of 0xe0 through 0xff are reserved */



/* versioning for this MPI header set */

#define MPI_HEADER_VERSION_UNIT             (0x0D)

#define MPI_HEADER_VERSION_UNIT             (0x0E)

#define MPI_HEADER_VERSION_DEV              (0x00)

#define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)

#define MPI_HEADER_VERSION_UNIT_SHIFT       (8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE