Commit da40d036 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (147 commits)
  [SCSI] arcmsr: fix write to device check
  [SCSI] lpfc: lower stack use in lpfc_fc_frame_check
  [SCSI] eliminate an unnecessary local variable from scsi_remove_target()
  [SCSI] libiscsi: use bh locking instead of irq with session lock
  [SCSI] libiscsi: do not take host lock in queuecommand
  [SCSI] be2iscsi: fix null ptr when accessing task hdr
  [SCSI] be2iscsi: fix gfp use in alloc_pdu
  [SCSI] libiscsi: add more informative failure message during iscsi scsi eh
  [SCSI] gdth: Add missing call to gdth_ioctl_free
  [SCSI] bfa: remove unused defintions and misc cleanups
  [SCSI] bfa: remove inactive functions
  [SCSI] bfa: replace bfa_assert with WARN_ON
  [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
  [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
  [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
  [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
  [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
  [SCSI] qla2xxx: Remove redundant module parameter permission bits
  [SCSI] qla2xxx: Add sysfs node for displaying board temperature.
  [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
  ...
parents aa58abc2 c32e061f

Documentation/scsi/ChangeLog.megaraid_sas

+22 −0
Original line number Diff line number Diff line 
Release Date    : Tues.  Dec 14, 2010 17:00:00 PST 2010 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

Current Version : 00.00.05.29-rc1

Old Version     : 00.00.04.31-rc1

    1. Rename megaraid_sas.c to megaraid_sas_base.c.

    2. Update GPL headers.

    3. Add MSI-X support and 'msix_disable' module parameter.

    4. Use lowest memory bar (for SR-IOV VF support).

    5. Add struct megasas_instance_temlate changes, and change all code to use

       new instance entries:



       irqreturn_t (*service_isr )(int irq, void *devp);

       void (*tasklet)(unsigned long);

       u32 (*init_adapter)(struct megasas_instance *);

       u32 (*build_and_issue_cmd) (struct megasas_instance *,

       struct scsi_cmnd *);

       void (*issue_dcmd) (struct megasas_instance *instance,

                              struct megasas_cmd *cmd);



   6. Add code to support MegaRAID 9265/9285 controllers device id (0x5b).

-------------------------------------------------------------------------------

1 Release Date    : Thur.  May 03, 2010 09:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang

drivers/s390/scsi/zfcp_aux.c

+4 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static char *init_device; 
module_param_named(device, init_device, charp, 0400);

MODULE_PARM_DESC(device, "specify initial device");



static struct kmem_cache *zfcp_cache_hw_align(const char *name,

static struct kmem_cache * __init zfcp_cache_hw_align(const char *name,

						      unsigned long size)

{

	return kmem_cache_create(name, size, roundup_pow_of_two(size), 0, NULL);
@@ -311,8 +311,7 @@ int zfcp_status_read_refill(struct zfcp_adapter *adapter) 
		if (zfcp_fsf_status_read(adapter->qdio)) {

			if (atomic_read(&adapter->stat_miss) >=

			    adapter->stat_read_buf_num) {

				zfcp_erp_adapter_reopen(adapter, 0, "axsref1",

							NULL);

				zfcp_erp_adapter_reopen(adapter, 0, "axsref1");

				return 1;

			}

			break;
@@ -459,7 +458,7 @@ void zfcp_adapter_unregister(struct zfcp_adapter *adapter) 
	sysfs_remove_group(&cdev->dev.kobj, &zfcp_sysfs_adapter_attrs);



	zfcp_erp_thread_kill(adapter);

	zfcp_dbf_adapter_unregister(adapter->dbf);

	zfcp_dbf_adapter_unregister(adapter);

	zfcp_qdio_destroy(adapter->qdio);



	zfcp_ccw_adapter_put(adapter); /* final put to release */

drivers/s390/scsi/zfcp_ccw.c

+7 −7
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int zfcp_ccw_activate(struct ccw_device *cdev) 


	zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING);

	zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

				"ccresu2", NULL);

				"ccresu2");

	zfcp_erp_wait(adapter);

	flush_work(&adapter->scan_work);
@@ -182,7 +182,7 @@ static int zfcp_ccw_set_offline(struct ccw_device *cdev) 
	if (!adapter)

		return 0;



	zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1", NULL);

	zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1");

	zfcp_erp_wait(adapter);



	zfcp_ccw_adapter_put(adapter);
@@ -207,24 +207,24 @@ static int zfcp_ccw_notify(struct ccw_device *cdev, int event) 
	switch (event) {

	case CIO_GONE:

		dev_warn(&cdev->dev, "The FCP device has been detached\n");

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1", NULL);

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1");

		break;

	case CIO_NO_PATH:

		dev_warn(&cdev->dev,

			 "The CHPID for the FCP device is offline\n");

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2", NULL);

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2");

		break;

	case CIO_OPER:

		dev_info(&cdev->dev, "The FCP device is operational again\n");

		zfcp_erp_set_adapter_status(adapter,

					    ZFCP_STATUS_COMMON_RUNNING);

		zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

					"ccnoti4", NULL);

					"ccnoti4");

		break;

	case CIO_BOXED:

		dev_warn(&cdev->dev, "The FCP device did not respond within "

				     "the specified time\n");

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5", NULL);

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5");

		break;

	}
@@ -243,7 +243,7 @@ static void zfcp_ccw_shutdown(struct ccw_device *cdev) 
	if (!adapter)

		return;



	zfcp_erp_adapter_shutdown(adapter, 0, "ccshut1", NULL);

	zfcp_erp_adapter_shutdown(adapter, 0, "ccshut1");

	zfcp_erp_wait(adapter);

	zfcp_erp_thread_kill(adapter);

drivers/s390/scsi/zfcp_cfdc.c

+4 −4
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ void zfcp_cfdc_adapter_access_changed(struct zfcp_adapter *adapter) 
		    (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))

			zfcp_erp_port_reopen(port,

					     ZFCP_STATUS_COMMON_ERP_FAILED,

					     "cfaac_1", NULL);

					     "cfaac_1");

	}

	read_unlock_irqrestore(&adapter->port_list_lock, flags);
@@ -299,7 +299,7 @@ void zfcp_cfdc_adapter_access_changed(struct zfcp_adapter *adapter) 
		    (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))

			zfcp_erp_lun_reopen(sdev,

					    ZFCP_STATUS_COMMON_ERP_FAILED,

					    "cfaac_2", NULL);

					    "cfaac_2");

	}

}
@@ -426,7 +426,7 @@ int zfcp_cfdc_open_lun_eval(struct scsi_device *sdev, 
			zfcp_scsi_dev_lun(sdev),

			(unsigned long long)zfcp_sdev->port->wwpn);

		zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);

		zfcp_erp_lun_shutdown(sdev, 0, "fsouh_6", NULL);

		zfcp_erp_lun_shutdown(sdev, 0, "fsouh_6");

		return -EACCES;

	}
@@ -437,7 +437,7 @@ int zfcp_cfdc_open_lun_eval(struct scsi_device *sdev, 
			zfcp_scsi_dev_lun(sdev),

			(unsigned long long)zfcp_sdev->port->wwpn);

		zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);

		zfcp_erp_lun_shutdown(sdev, 0, "fsosh_8", NULL);

		zfcp_erp_lun_shutdown(sdev, 0, "fsosh_8");

		return -EACCES;

	}

drivers/s390/scsi/zfcp_dbf.c

+293 −884

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE