Commit 69585dd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (34 commits)
  [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
  [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
  [SCSI] be2iscsi: Moving to pci_pools v3
  [SCSI] libiscsi: iscsi_session_setup to allow for private space
  [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
  [SCSI] zfcp: Fix hang when offlining device with offline chpid
  [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
  [SCSI] zfcp: Fix oops during shutdown of offline device
  [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
  [SCSI] zfcp: correctly initialize unchained requests
  [SCSI] mpt2sas: Bump version 02.100.03.00
  [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
  [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
  [SCSI] mpt2sas: Call init_completion on a per request basis.
  [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
  [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
  [SCSI] mpt2sas: Copyright change to 2009.
  [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
  [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
  [SCSI] bfa: Brocade BFA FC SCSI driver
  ...
parents bd381934 c7922a91

Documentation/scsi/hptiop.txt

+20 −1
Original line number Diff line number Diff line
@@ -3,6 +3,25 @@ HIGHPOINT ROCKETRAID 3xxx/4xxx ADAPTER DRIVER (hptiop) 
Controller Register Map

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



For RR44xx Intel IOP based adapters, the controller IOP is accessed via PCI BAR0 and BAR2:



     BAR0 offset    Register

            0x11C5C Link Interface IRQ Set

            0x11C60 Link Interface IRQ Clear



     BAR2 offset    Register

            0x10    Inbound Message Register 0

            0x14    Inbound Message Register 1

            0x18    Outbound Message Register 0

            0x1C    Outbound Message Register 1

            0x20    Inbound Doorbell Register

            0x24    Inbound Interrupt Status Register

            0x28    Inbound Interrupt Mask Register

            0x30    Outbound Interrupt Status Register

            0x34    Outbound Interrupt Mask Register

            0x40    Inbound Queue Port

            0x44    Outbound Queue Port



For Intel IOP based adapters, the controller IOP is accessed via PCI BAR0:



     BAR0 offset    Register
@@ -93,7 +112,7 @@ The driver exposes following sysfs attributes: 




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

Copyright (C) 2006-2007 HighPoint Technologies, Inc. All Rights Reserved.

Copyright (C) 2006-2009 HighPoint Technologies, Inc. All Rights Reserved.



  This file is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,13 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/tg3.*



BROCADE BFA FC SCSI DRIVER

P:      Jing Huang

M:      huangj@brocade.com

L:      linux-scsi@vger.kernel.org

S:      Supported

F:      drivers/scsi/bfa/



BSG (block layer generic sg v4 driver)

M:	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

L:	linux-scsi@vger.kernel.org
@@ -4646,6 +4653,14 @@ F: drivers/ata/ 
F:	include/linux/ata.h

F:	include/linux/libata.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

P:     Jayamohan Kallickal

M:     jayamohank@serverengines.com

L:     linux-scsi@vger.kernel.org

W:     http://www.serverengines.com

S:     Supported

F:     drivers/scsi/be2iscsi/



SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

M:	Sathya Perla <sathyap@serverengines.com>

M:	Subbu Seetharaman <subbus@serverengines.com>

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, 
	 * because we preallocate so many resources

	 */

	cls_session = iscsi_session_setup(&iscsi_iser_transport, shost,

					  ISCSI_DEF_XMIT_CMDS_MAX,

					  ISCSI_DEF_XMIT_CMDS_MAX, 0,

					  sizeof(struct iscsi_iser_task),

					  initial_cmdsn, 0);

	if (!cls_session)

drivers/s390/scsi/zfcp_aux.c

+20 −13
Original line number Diff line number Diff line
@@ -80,28 +80,35 @@ int zfcp_reqlist_isempty(struct zfcp_adapter *adapter) 


static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun)

{

	struct ccw_device *ccwdev;

	struct zfcp_adapter *adapter;

	struct zfcp_port *port;

	struct zfcp_unit *unit;



	ccwdev = get_ccwdev_by_busid(&zfcp_ccw_driver, busid);

	if (!ccwdev)

		return;



	if (ccw_device_set_online(ccwdev))

		goto out_ccwdev;



	mutex_lock(&zfcp_data.config_mutex);

	read_lock_irq(&zfcp_data.config_lock);

	adapter = zfcp_get_adapter_by_busid(busid);

	if (adapter)

	adapter = dev_get_drvdata(&ccwdev->dev);

	if (!adapter)

		goto out_unlock;

	zfcp_adapter_get(adapter);

	read_unlock_irq(&zfcp_data.config_lock);



	if (!adapter)

		goto out_adapter;

	port = zfcp_port_enqueue(adapter, wwpn, 0, 0);

	if (IS_ERR(port))

	port = zfcp_get_port_by_wwpn(adapter, wwpn);

	if (!port)

		goto out_port;



	zfcp_port_get(port);

	unit = zfcp_unit_enqueue(port, lun);

	if (IS_ERR(unit))

		goto out_unit;

	mutex_unlock(&zfcp_data.config_mutex);

	ccw_device_set_online(adapter->ccw_device);



	zfcp_erp_unit_reopen(unit, 0, "auidc_1", NULL);

	zfcp_erp_wait(adapter);

	flush_work(&unit->scsi_work);
@@ -111,8 +118,10 @@ out_unit: 
	zfcp_port_put(port);

out_port:

	zfcp_adapter_put(adapter);

out_adapter:

out_unlock:

	mutex_unlock(&zfcp_data.config_mutex);

out_ccwdev:

	put_device(&ccwdev->dev);

	return;

}
@@ -593,10 +602,8 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) 
	int retval = 0;

	unsigned long flags;



	cancel_work_sync(&adapter->scan_work);

	cancel_work_sync(&adapter->stat_work);

	zfcp_fc_wka_ports_force_offline(adapter->gs);

	zfcp_adapter_scsi_unregister(adapter);

	sysfs_remove_group(&adapter->ccw_device->dev.kobj,

			   &zfcp_sysfs_adapter_attrs);

	dev_set_drvdata(&adapter->ccw_device->dev, NULL);

drivers/s390/scsi/zfcp_ccw.c

+14 −26
Original line number Diff line number Diff line
@@ -102,6 +102,14 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device) 
	adapter = dev_get_drvdata(&ccw_device->dev);

	if (!adapter)

		goto out;

	mutex_unlock(&zfcp_data.config_mutex);



	cancel_work_sync(&adapter->scan_work);



	mutex_lock(&zfcp_data.config_mutex);



	/* this also removes the scsi devices, so call it first */

	zfcp_adapter_scsi_unregister(adapter);



	write_lock_irq(&zfcp_data.config_lock);

	list_for_each_entry_safe(port, p, &adapter->port_list_head, list) {
@@ -117,11 +125,8 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device) 
	write_unlock_irq(&zfcp_data.config_lock);



	list_for_each_entry_safe(port, p, &port_remove_lh, list) {

		list_for_each_entry_safe(unit, u, &unit_remove_lh, list) {

			if (unit->device)

				scsi_remove_device(unit->device);

		list_for_each_entry_safe(unit, u, &unit_remove_lh, list)

			zfcp_unit_dequeue(unit);

		}

		zfcp_port_dequeue(port);

	}

	wait_event(adapter->remove_wq, atomic_read(&adapter->refcount) == 0);
@@ -192,13 +197,9 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device) 


	mutex_lock(&zfcp_data.config_mutex);

	adapter = dev_get_drvdata(&ccw_device->dev);

	if (!adapter)

		goto out;



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

	zfcp_erp_wait(adapter);

	mutex_unlock(&zfcp_data.config_mutex);

out:

	return 0;

}
@@ -253,13 +254,17 @@ static void zfcp_ccw_shutdown(struct ccw_device *cdev) 


	mutex_lock(&zfcp_data.config_mutex);

	adapter = dev_get_drvdata(&cdev->dev);

	if (!adapter)

		goto out;



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

	zfcp_erp_wait(adapter);

	zfcp_erp_thread_kill(adapter);

out:

	mutex_unlock(&zfcp_data.config_mutex);

}



static struct ccw_driver zfcp_ccw_driver = {

struct ccw_driver zfcp_ccw_driver = {

	.owner       = THIS_MODULE,

	.name        = "zfcp",

	.ids         = zfcp_ccw_device_id,
@@ -284,20 +289,3 @@ int __init zfcp_ccw_register(void) 
{

	return ccw_driver_register(&zfcp_ccw_driver);

}
 


/**

 * zfcp_get_adapter_by_busid - find zfcp_adapter struct

 * @busid: bus id string of zfcp adapter to find

 */

struct zfcp_adapter *zfcp_get_adapter_by_busid(char *busid)

{

	struct ccw_device *ccw_device;

	struct zfcp_adapter *adapter = NULL;



	ccw_device = get_ccwdev_by_busid(&zfcp_ccw_driver, busid);

	if (ccw_device) {

		adapter = dev_get_drvdata(&ccw_device->dev);

		put_device(&ccw_device->dev);

	}

	return adapter;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE