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

Commit f8aea200 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: (21 commits)
  [SCSI] sd: fix computation of the full size of the device
  [SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact
  [SCSI] sun3x_esp: Convert && to ||
  [SCSI] sd: remove command-size switching code
  [SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API
  [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API
  [SCSI] fix netlink kernel-doc
  [SCSI] sd: Fix handling of NO_SENSE check condition
  [SCSI] export busy state via q->lld_busy_fn()
  [SCSI] refactor sdev/starget/shost busy checking
  [SCSI] mptfusion: Increase scsi-timeouts, similariy to the LSI 4.x driver.
  [SCSI] aic7xxx: Take the LED out of diagnostic mode on PM resume
  [SCSI] aic79xx: user visible misuse wrong SI units (not disk size!)
  [SCSI] ipr: use memory_read_from_buffer()
  [SCSI] aic79xx: fix shadowed variables
  [SCSI] aic79xx: fix shadowed variables, add statics
  [SCSI] aic7xxx: update *_shipped files
  [SCSI] aic7xxx: update .reg files
  [SCSI] aic7xxx: introduce "dont_generate_debug_code" keyword in aicasm parser
  [SCSI] scsi_dh: Initialize path state to be passive when path is not owned
  ...
parents c3c9897c 520a2c27

drivers/message/fusion/mptscsih.c

+1 −2
Original line number Diff line number Diff line
@@ -1760,10 +1760,9 @@ mptscsih_get_tm_timeout(MPT_ADAPTER *ioc) 
	case FC:

		return 40;

	case SAS:

		return 10;

	case SPI:

	default:

		return 2;

		return 10;

	}

}

drivers/scsi/3w-9xxx.c

+0 −3
Original line number Diff line number Diff line
@@ -1924,12 +1924,9 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int re 
	    (cmd->sc_data_direction == DMA_FROM_DEVICE ||

	     cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {

		if (scsi_sg_count(cmd) == 1) {

			unsigned long flags;

			void *buf = tw_dev->generic_buffer_virt[request_id];



			local_irq_save(flags);

			scsi_sg_copy_from_buffer(cmd, buf, TW_SECTOR_SIZE);

			local_irq_restore(flags);

		}

	}

} /* End twa_scsiop_execute_scsi_complete() */

drivers/scsi/3w-xxxx.c

+1 −6
Original line number Diff line number Diff line
@@ -1466,12 +1466,7 @@ static int tw_scsiop_inquiry(TW_Device_Extension *tw_dev, int request_id) 
static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,

				 void *data, unsigned int len)

{

	struct scsi_cmnd *cmd = tw_dev->srb[request_id];

	unsigned long flags;



	local_irq_save(flags);

	scsi_sg_copy_from_buffer(cmd, data, len);

	local_irq_restore(flags);

	scsi_sg_copy_from_buffer(tw_dev->srb[request_id], data, len);

}



/* This function is called by the isr to complete an inquiry command */

drivers/scsi/aic7xxx/aic79xx.reg

+185 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/aic7xxx/aic79xx_core.c

+5 −10
Original line number Diff line number Diff line
@@ -2472,8 +2472,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat) 
		if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0)

			ahd_outb(ahd, CLRLQOINT1, 0);

	} else if ((status & SELTO) != 0) {

		u_int  scbid;



		/* Stop the selection */

		ahd_outb(ahd, SCSISEQ0, 0);
@@ -2583,9 +2581,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat) 
		case BUSFREE_DFF0:

		case BUSFREE_DFF1:

		{

			u_int	scbid;

			struct	scb *scb;



			mode = busfreetime == BUSFREE_DFF0

			     ? AHD_MODE_DFF0 : AHD_MODE_DFF1;

			ahd_set_modes(ahd, mode, mode);
@@ -3689,7 +3684,7 @@ ahd_free_tstate(struct ahd_softc *ahd, u_int scsi_id, char channel, int force) 
 * by the capabilities of the bus connectivity of and sync settings for

 * the target.

 */

void

static void

ahd_devlimited_syncrate(struct ahd_softc *ahd,

			struct ahd_initiator_tinfo *tinfo,

			u_int *period, u_int *ppr_options, role_t role)
@@ -4136,7 +4131,7 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo, 


			/*

			 * Harpoon2A assumed that there would be a

			 * fallback rate between 160MHz and 80Mhz,

			 * fallback rate between 160MHz and 80MHz,

			 * so 7 is used as the period factor rather

			 * than 8 for 160MHz.

			 */
@@ -8708,7 +8703,7 @@ ahd_reset_current_bus(struct ahd_softc *ahd) 
int

ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)

{

	struct	ahd_devinfo devinfo;

	struct	ahd_devinfo caminfo;

	u_int	initiator;

	u_int	target;

	u_int	max_scsiid;
@@ -8729,7 +8724,7 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset) 


	ahd->pending_device = NULL;



	ahd_compile_devinfo(&devinfo,

	ahd_compile_devinfo(&caminfo,

			    CAM_TARGET_WILDCARD,

			    CAM_TARGET_WILDCARD,

			    CAM_LUN_WILDCARD,
@@ -8868,7 +8863,7 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset) 
	}



	/* Notify the XPT that a bus reset occurred */

	ahd_send_async(ahd, devinfo.channel, CAM_TARGET_WILDCARD,

	ahd_send_async(ahd, caminfo.channel, CAM_TARGET_WILDCARD,

		       CAM_LUN_WILDCARD, AC_BUS_RESET);



	ahd_restart(ahd);