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

Commit 5fc77247 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:
  [SCSI] SCSI core: better initialization for sdev->scsi_level
  [SCSI] scsi_proc.c: display sdev->scsi_level correctly
  [SCSI] megaraid_sas: update version and author info
  [SCSI] megaraid_sas: return sync cache call with success
  [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path
  [SCSI] megaraid_sas: add bios_param in scsi_host_template
  [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set
  [SCSI] scsi_transport.h should include scsi_device.h
  [SCSI] aic79xx: remove extra newline from info message
  [SCSI] scsi_scan.c: handle bad inquiry responses
  [SCSI] aic94xx: tie driver to the major number of the sequencer firmware
  [SCSI] lpfc: add PCI error recovery support
  [SCSI] megaraid: pci_module_init to pci_register_driver
  [SCSI] tgt: fix the user/kernel ring buffer interface
  [SCSI] sgiwd93: interfacing to wd33c93
  [SCSI] wd33c93: Fast SCSI with WD33C93B
parents d43a338e 7c9d6f16

drivers/scsi/aic7xxx/aic79xx_osm.c

+0 −1
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ ahd_linux_info(struct Scsi_Host *host) 
	strcat(bp, "        ");

	ahd_controller_info(ahd, ahd_info);

	strcat(bp, ahd_info);

	strcat(bp, "\n");



	return (bp);

}

drivers/scsi/aic94xx/aic94xx_seq.c

+10 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#define PAUSE_TRIES 1000



static const struct firmware *sequencer_fw;

static const char *sequencer_version;

static u16 cseq_vecs[CSEQ_NUM_VECS], lseq_vecs[LSEQ_NUM_VECS], mode2_task,

	cseq_idle_loop, lseq_idle_loop;

static u8 *cseq_code, *lseq_code;
@@ -1276,7 +1275,6 @@ static int asd_request_firmware(struct asd_ha_struct *asd_ha) 
	header.csum = le32_to_cpu(hdr_ptr->csum);

	header.major = le32_to_cpu(hdr_ptr->major);

	header.minor = le32_to_cpu(hdr_ptr->minor);

	sequencer_version = hdr_ptr->version;

	header.cseq_table_offset = le32_to_cpu(hdr_ptr->cseq_table_offset);

	header.cseq_table_size = le32_to_cpu(hdr_ptr->cseq_table_size);

	header.lseq_table_offset = le32_to_cpu(hdr_ptr->lseq_table_offset);
@@ -1303,6 +1301,16 @@ static int asd_request_firmware(struct asd_ha_struct *asd_ha) 
		return -EINVAL;

	}



	asd_printk("Found sequencer Firmware version %d.%d (%s)\n",

		   header.major, header.minor, hdr_ptr->version);



	if (header.major != SAS_RAZOR_SEQUENCER_FW_MAJOR) {

		asd_printk("Firmware Major Version Mismatch;"

			   "driver requires version %d.X",

			   SAS_RAZOR_SEQUENCER_FW_MAJOR);

		return -EINVAL;

	}



	ptr_cseq_vecs = (u16 *)&sequencer_fw->data[header.cseq_table_offset];

	ptr_lseq_vecs = (u16 *)&sequencer_fw->data[header.lseq_table_offset];

	mode2_task = header.mode2_task;
@@ -1335,7 +1343,6 @@ int asd_init_seqs(struct asd_ha_struct *asd_ha) 
		return err;

	}



	asd_printk("using sequencer %s\n", sequencer_version);

	err = asd_seq_download_seqs(asd_ha);

	if (err) {

		asd_printk("couldn't download sequencers for %s\n",

drivers/scsi/aic94xx/aic94xx_seq.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define LSEQ_NUM_VECS	11



#define SAS_RAZOR_SEQUENCER_FW_FILE "aic94xx-seq.fw"

#define SAS_RAZOR_SEQUENCER_FW_MAJOR	1



/* Note:  All quantites in the sequencer file are little endian */

struct sequencer_file_header {

drivers/scsi/lpfc/lpfc_init.c

+97 −0
Original line number Diff line number Diff line
@@ -518,6 +518,10 @@ lpfc_handle_eratt(struct lpfc_hba * phba) 
	struct lpfc_sli *psli = &phba->sli;

	struct lpfc_sli_ring  *pring;

	uint32_t event_data;

	/* If the pci channel is offline, ignore possible errors,

	 * since we cannot communicate with the pci card anyway. */

	if (pci_channel_offline(phba->pcidev))

		return;



	if (phba->work_hs & HS_FFER6 ||

	    phba->work_hs & HS_FFER5) {
@@ -1797,6 +1801,92 @@ lpfc_pci_remove_one(struct pci_dev *pdev) 
	pci_set_drvdata(pdev, NULL);

}



/**

 * lpfc_io_error_detected - called when PCI error is detected

 * @pdev: Pointer to PCI device

 * @state: The current pci conneection state

 *

 * This function is called after a PCI bus error affecting

 * this device has been detected.

 */

static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,

				pci_channel_state_t state)

{

	struct Scsi_Host *host = pci_get_drvdata(pdev);

	struct lpfc_hba *phba = (struct lpfc_hba *)host->hostdata;

	struct lpfc_sli *psli = &phba->sli;

	struct lpfc_sli_ring  *pring;



	if (state == pci_channel_io_perm_failure) {

		lpfc_pci_remove_one(pdev);

		return PCI_ERS_RESULT_DISCONNECT;

	}

	pci_disable_device(pdev);

	/*

	 * There may be I/Os dropped by the firmware.

	 * Error iocb (I/O) on txcmplq and let the SCSI layer

	 * retry it after re-establishing link.

	 */

	pring = &psli->ring[psli->fcp_ring];

	lpfc_sli_abort_iocb_ring(phba, pring);



	/* Request a slot reset. */

	return PCI_ERS_RESULT_NEED_RESET;

}



/**

 * lpfc_io_slot_reset - called after the pci bus has been reset.

 * @pdev: Pointer to PCI device

 *

 * Restart the card from scratch, as if from a cold-boot.

 */

static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)

{

	struct Scsi_Host *host = pci_get_drvdata(pdev);

	struct lpfc_hba *phba = (struct lpfc_hba *)host->hostdata;

	struct lpfc_sli *psli = &phba->sli;

	int bars = pci_select_bars(pdev, IORESOURCE_MEM);



	dev_printk(KERN_INFO, &pdev->dev, "recovering from a slot reset.\n");

	if (pci_enable_device_bars(pdev, bars)) {

		printk(KERN_ERR "lpfc: Cannot re-enable "

			"PCI device after reset.\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}



	pci_set_master(pdev);



	/* Re-establishing Link */

	spin_lock_irq(phba->host->host_lock);

	phba->fc_flag |= FC_ESTABLISH_LINK;

	psli->sli_flag &= ~LPFC_SLI2_ACTIVE;

	spin_unlock_irq(phba->host->host_lock);





	/* Take device offline; this will perform cleanup */

	lpfc_offline(phba);

	lpfc_sli_brdrestart(phba);



	return PCI_ERS_RESULT_RECOVERED;

}



/**

 * lpfc_io_resume - called when traffic can start flowing again.

 * @pdev: Pointer to PCI device

 *

 * This callback is called when the error recovery driver tells us that

 * its OK to resume normal operation.

 */

static void lpfc_io_resume(struct pci_dev *pdev)

{

	struct Scsi_Host *host = pci_get_drvdata(pdev);

	struct lpfc_hba *phba = (struct lpfc_hba *)host->hostdata;



	if (lpfc_online(phba) == 0) {

		mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);

	}

}



static struct pci_device_id lpfc_id_table[] = {

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,

		PCI_ANY_ID, PCI_ANY_ID, },
@@ -1857,11 +1947,18 @@ static struct pci_device_id lpfc_id_table[] = { 


MODULE_DEVICE_TABLE(pci, lpfc_id_table);



static struct pci_error_handlers lpfc_err_handler = {

	.error_detected = lpfc_io_error_detected,

	.slot_reset = lpfc_io_slot_reset,

	.resume = lpfc_io_resume,

};



static struct pci_driver lpfc_driver = {

	.name		= LPFC_DRIVER_NAME,

	.id_table	= lpfc_id_table,

	.probe		= lpfc_pci_probe_one,

	.remove		= __devexit_p(lpfc_pci_remove_one),

	.err_handler = &lpfc_err_handler,

};



static int __init

drivers/scsi/lpfc/lpfc_sli.c

+12 −0
Original line number Diff line number Diff line
@@ -2104,6 +2104,10 @@ lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag) 
	volatile uint32_t word0, ldata;

	void __iomem *to_slim;



	/* If the PCI channel is in offline state, do not post mbox. */

	if (unlikely(pci_channel_offline(phba->pcidev)))

		return MBX_NOT_FINISHED;



	psli = &phba->sli;



	spin_lock_irqsave(phba->host->host_lock, drvr_flag);
@@ -2407,6 +2411,10 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
	struct lpfc_iocbq *nextiocb;

	IOCB_t *iocb;



	/* If the PCI channel is in offline state, do not post iocbs. */

	if (unlikely(pci_channel_offline(phba->pcidev)))

		return IOCB_ERROR;



	/*

	 * We should never get an IOCB if we are in a < LINK_DOWN state

	 */
@@ -3154,6 +3162,10 @@ lpfc_intr_handler(int irq, void *dev_id) 
	if (unlikely(!phba))

		return IRQ_NONE;



	/* If the pci channel is offline, ignore all the interrupts. */

	if (unlikely(pci_channel_offline(phba->pcidev)))

		return IRQ_NONE;



	phba->sli.slistat.sli_intr++;



	/*