Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (23f268fa) · Commits · 戴 / test

drivers/scsi/bfa/bfad_fwimg.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@ u32 *bfi_image_cb;

		#define BFAD_FW_FILE_CT "ctfw.bin"
		#define BFAD_FW_FILE_CB "cbfw.bin"
		MODULE_FIRMWARE(BFAD_FW_FILE_CT);
		MODULE_FIRMWARE(BFAD_FW_FILE_CB);

		u32 *
		bfad_read_firmware(struct pci_dev pdev, u32 *bfi_image,

drivers/scsi/bfa/bfad_im.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -948,7 +948,7 @@ bfad_os_fc_host_init(struct bfad_im_port_s *im_port)
		if (bfad_supported_fc4s & (BFA_PORT_ROLE_FCP_IM \| BFA_PORT_ROLE_FCP_TM))
		/* For FCP type 0x08 */
		fc_host_supported_fc4s(host)[2] = 1;
		if (bfad_supported_fc4s \| BFA_PORT_ROLE_FCP_IPFC)
		if (bfad_supported_fc4s & BFA_PORT_ROLE_FCP_IPFC)
		/* For LLC/SNAP type 0x05 */
		fc_host_supported_fc4s(host)[3] = 0x20;
		/* For fibre channel services type 0x20 */

drivers/scsi/gdth.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2900,7 +2900,7 @@ static int gdth_read_event(gdth_ha_str ha, int handle, gdth_evt_str estr)
		eindex = handle;
		estr->event_source = 0;

		if (eindex >= MAX_EVENTS) {
		if (eindex < 0 \|\| eindex >= MAX_EVENTS) {
		spin_unlock_irqrestore(&ha->smp_lock, flags);
		return eindex;
		}

drivers/scsi/ipr.c

+33 −9

Original line number	Diff line number	Diff line
		@@ -4188,6 +4188,25 @@ static irqreturn_t ipr_handle_other_interrupt(struct ipr_ioa_cfg *ioa_cfg,
		return rc;
		}

		/**
		* ipr_isr_eh - Interrupt service routine error handler
		* @ioa_cfg: ioa config struct
		* @msg: message to log
		*
		* Return value:
		* none
		**/
		static void ipr_isr_eh(struct ipr_ioa_cfg ioa_cfg, char msg)
		{
		ioa_cfg->errors_logged++;
		dev_err(&ioa_cfg->pdev->dev, "%s\n", msg);

		if (WAIT_FOR_DUMP == ioa_cfg->sdt_state)
		ioa_cfg->sdt_state = GET_DUMP;

		ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
		}

		/**
		* ipr_isr - Interrupt service routine
		* @irq: irq number
		@@ -4203,6 +4222,7 @@ static irqreturn_t ipr_isr(int irq, void *devp)
		volatile u32 int_reg, int_mask_reg;
		u32 ioasc;
		u16 cmd_index;
		int num_hrrq = 0;
		struct ipr_cmnd *ipr_cmd;
		irqreturn_t rc = IRQ_NONE;

		@@ -4233,13 +4253,7 @@ static irqreturn_t ipr_isr(int irq, void *devp)
		IPR_HRRQ_REQ_RESP_HANDLE_MASK) >> IPR_HRRQ_REQ_RESP_HANDLE_SHIFT;

		if (unlikely(cmd_index >= IPR_NUM_CMD_BLKS)) {
		ioa_cfg->errors_logged++;
		dev_err(&ioa_cfg->pdev->dev, "Invalid response handle from IOA\n");

		if (WAIT_FOR_DUMP == ioa_cfg->sdt_state)
		ioa_cfg->sdt_state = GET_DUMP;

		ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
		ipr_isr_eh(ioa_cfg, "Invalid response handle from IOA");
		spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
		return IRQ_HANDLED;
		}
		@@ -4266,8 +4280,18 @@ static irqreturn_t ipr_isr(int irq, void *devp)

		if (ipr_cmd != NULL) {
		/* Clear the PCI interrupt */
		do {
		writel(IPR_PCII_HRRQ_UPDATED, ioa_cfg->regs.clr_interrupt_reg);
		int_reg = readl(ioa_cfg->regs.sense_interrupt_reg) & ~int_mask_reg;
		} while (int_reg & IPR_PCII_HRRQ_UPDATED &&
		num_hrrq++ < IPR_MAX_HRRQ_RETRIES);

		if (int_reg & IPR_PCII_HRRQ_UPDATED) {
		ipr_isr_eh(ioa_cfg, "Error clearing HRRQ");
		spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
		return IRQ_HANDLED;
		}

		} else
		break;
		}

drivers/scsi/ipr.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@
		#define IPR_IOA_MAX_SECTORS 32767
		#define IPR_VSET_MAX_SECTORS 512
		#define IPR_MAX_CDB_LEN 16
		#define IPR_MAX_HRRQ_RETRIES 3

		#define IPR_DEFAULT_BUS_WIDTH 16
		#define IPR_80MBs_SCSI_RATE ((80 * 10) / (IPR_DEFAULT_BUS_WIDTH / 8))

Admin message