Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec0bf39a 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: (73 commits)
  [SCSI] aic79xx: Add ASC-29320LPE ids to driver
  [SCSI] stex: version update
  [SCSI] stex: change wait loop code
  [SCSI] stex: add new device type support
  [SCSI] stex: update device id info
  [SCSI] stex: adjust default queue length
  [SCSI] stex: add value check in hard reset routine
  [SCSI] stex: fix controller_info command handling
  [SCSI] stex: fix biosparam calculation
  [SCSI] megaraid: fix MMIO casts
  [SCSI] tgt: fix undefined flush_dcache_page() problem
  [SCSI] libsas: better error handling in sas_expander.c
  [SCSI] lpfc 8.1.11 : Change version number to 8.1.11
  [SCSI] lpfc 8.1.11 : Misc Fixes
  [SCSI] lpfc 8.1.11 : Add soft_wwnn sysfs attribute, rename soft_wwn_enable
  [SCSI] lpfc 8.1.11 : Removed decoding of PCI Subsystem Id
  [SCSI] lpfc 8.1.11 : Add MSI (Message Signalled Interrupts) support
  [SCSI] lpfc 8.1.11 : Adjust LOG_FCP logging
  [SCSI] lpfc 8.1.11 : Fix Memory leaks
  [SCSI] lpfc 8.1.11 : Fix lpfc_multi_ring_support
  ...
parents bf83c2a3 d32adcb8

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,11 @@ and is between 256 and 4096 characters. It is defined in the file 


	scsi_logging=	[SCSI]



	scsi_mod.scan=	[SCSI] sync (default) scans SCSI busses as they are

			discovered.  async scans them in kernel threads,

			allowing boot to proceed.  none ignores them, expecting

			user space to do the scan.



	selinux		[SELINUX] Disable or enable SELinux at boot time.

			Format: { "0" | "1" }

			See security/selinux/Kconfig help text.

Documentation/scsi/scsi_mid_low_api.txt

+5 −26
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ Summary: 
   scsi_add_device - creates new scsi device (lu) instance

   scsi_add_host - perform sysfs registration and set up transport class

   scsi_adjust_queue_depth - change the queue depth on a SCSI device

   scsi_assign_lock - replace default host_lock with given lock

   scsi_bios_ptable - return copy of block device's partition table

   scsi_block_requests - prevent further commands being queued to given host

   scsi_deactivate_tcq - turn off tag command queueing
@@ -488,20 +487,6 @@ void scsi_adjust_queue_depth(struct scsi_device * sdev, int tagged, 
                             int tags)





/**

 * scsi_assign_lock - replace default host_lock with given lock

 * @shost: a pointer to a scsi host instance

 * @lock: pointer to lock to replace host_lock for this host

 *

 *      Returns nothing

 *

 *      Might block: no

 *

 *      Defined in: include/scsi/scsi_host.h .

 **/

void scsi_assign_lock(struct Scsi_Host *shost, spinlock_t *lock)





/**

 * scsi_bios_ptable - return copy of block device's partition table

 * @dev:        pointer to block device
@@ -1366,17 +1351,11 @@ Locks 
Each struct Scsi_Host instance has a spin_lock called struct 

Scsi_Host::default_lock which is initialized in scsi_host_alloc() [found in 

hosts.c]. Within the same function the struct Scsi_Host::host_lock pointer

is initialized to point at default_lock with the scsi_assign_lock() function.

Thereafter lock and unlock operations performed by the mid level use the

struct Scsi_Host::host_lock pointer.



LLDs can override the use of struct Scsi_Host::default_lock by

using scsi_assign_lock(). The earliest opportunity to do this would

be in the detect() function after it has invoked scsi_register(). It

could be replaced by a coarser grain lock (e.g. per driver) or a

lock of equal granularity (i.e. per host). Using finer grain locks 

(e.g. per SCSI device) may be possible by juggling locks in

queuecommand().

is initialized to point at default_lock.  Thereafter lock and unlock

operations performed by the mid level use the struct Scsi_Host::host_lock

pointer.  Previously drivers could override the host_lock pointer but

this is not allowed anymore.





Autosense

=========

block/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int sg_io(struct file *file, request_queue_t *q, 
	if (rq->bio)

		blk_queue_bounce(q, &rq->bio);



	rq->timeout = (hdr->timeout * HZ) / 1000;

	rq->timeout = jiffies_to_msecs(hdr->timeout);

	if (!rq->timeout)

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)

drivers/scsi/53c700.c

+6 −1
Original line number Diff line number Diff line
@@ -624,6 +624,8 @@ NCR_700_scsi_done(struct NCR_700_Host_Parameters *hostdata, 
			 * successful */

			if (result == 0)

				result = cmnd[7];

			/* restore the original length */

			SCp->cmd_len = cmnd[8];

		} else

			NCR_700_unmap(hostdata, SCp, slot);
@@ -1007,6 +1009,9 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp, 
				 * of the command */

				cmnd[6] = NCR_700_INTERNAL_SENSE_MAGIC;

				cmnd[7] = hostdata->status[0];

				cmnd[8] = SCp->cmd_len;

				SCp->cmd_len = 6; /* command length for

						   * REQUEST_SENSE */

				slot->pCmd = dma_map_single(hostdata->dev, cmnd, MAX_COMMAND_SIZE, DMA_TO_DEVICE);

				slot->dma_handle = dma_map_single(hostdata->dev, SCp->sense_buffer, sizeof(SCp->sense_buffer), DMA_FROM_DEVICE);

				slot->SG[0].ins = bS_to_host(SCRIPT_MOVE_DATA_IN | sizeof(SCp->sense_buffer));

drivers/scsi/BusLogic.c

+6 −6
Original line number Diff line number Diff line
@@ -2186,21 +2186,21 @@ static int __init BusLogic_init(void) 


	if (BusLogic_ProbeOptions.NoProbe)

		return -ENODEV;

	BusLogic_ProbeInfoList = (struct BusLogic_ProbeInfo *)

	    kmalloc(BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo), GFP_ATOMIC);

	BusLogic_ProbeInfoList =

	    kzalloc(BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo), GFP_KERNEL);

	if (BusLogic_ProbeInfoList == NULL) {

		BusLogic_Error("BusLogic: Unable to allocate Probe Info List\n", NULL);

		return -ENOMEM;

	}

	memset(BusLogic_ProbeInfoList, 0, BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo));

	PrototypeHostAdapter = (struct BusLogic_HostAdapter *)

	    kmalloc(sizeof(struct BusLogic_HostAdapter), GFP_ATOMIC);



	PrototypeHostAdapter =

	    kzalloc(sizeof(struct BusLogic_HostAdapter), GFP_KERNEL);

	if (PrototypeHostAdapter == NULL) {

		kfree(BusLogic_ProbeInfoList);

		BusLogic_Error("BusLogic: Unable to allocate Prototype " "Host Adapter\n", NULL);

		return -ENOMEM;

	}

	memset(PrototypeHostAdapter, 0, sizeof(struct BusLogic_HostAdapter));



#ifdef MODULE

	if (BusLogic != NULL)

		BusLogic_Setup(BusLogic);