Commit e760e716 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:
  [SCSI] gdth: update deprecated pci_find_device
  [SCSI] gdth: scan for scsi devices
  [SCSI] sym53c416: fix module parameters
  [SCSI] lpfc 8.2.5 : Update lpfc driver version to 8.2.5
  [SCSI] lpfc 8.2.5 : Fix buffer leaks
  [SCSI] lpfc 8.2.5 : Miscellaneous discovery Fixes
  [SCSI] lpfc 8.2.5 : Add MSI-X single message support
  [SCSI] lpfc 8.2.5 : Miscellaneous Fixes
  [SCSI] lpfc 8.2.5 : Correct ndlp referencing issues
  [SCSI] update SG_ALL to avoid causing chaining
  [SCSI] aic94xx: fix ABORT_TASK define conflict
  [SCSI] fas216: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] ses: fix memory leaks
  [SCSI] aacraid: informational sysfs value corrections
  [SCSI] mpt fusion: Request I/O resources only when required
  [SCSI] aacraid: ignore adapter reset check polarity
  [SCSI] aacraid: add optional MSI support
  [SCSI] mpt fusion: Avoid racing when mptsas and mptcl module are loaded in parallel
  [SCSI] MegaRAID driver management char device moved to misc
  [SCSI] advansys: fix overrun_buf aligned bug
parents b2e3e658 99109301

drivers/message/fusion/mptbase.c

+46 −8
Original line number Diff line number Diff line
@@ -1470,9 +1470,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (mpt_debug_level)

		printk(KERN_INFO MYNAM ": mpt_debug_level=%xh\n", mpt_debug_level);



	if (pci_enable_device(pdev))

		return r;



	ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);

	if (ioc == NULL) {

		printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
@@ -1482,6 +1479,20 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	ioc->id = mpt_ids++;

	sprintf(ioc->name, "ioc%d", ioc->id);



	ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);

	if (pci_enable_device_mem(pdev)) {

		kfree(ioc);

		printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "

		       "failed\n", ioc->name);

		return r;

	}

	if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {

		kfree(ioc);

		printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "

		       "MEM failed\n", ioc->name);

		return r;

	}



	dinitprintk(ioc, printk(MYIOC_s_INFO_FMT ": mpt_adapter_install\n", ioc->name));



	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
@@ -1658,6 +1669,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	ioc->active = 0;

	CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);



	/* Set IOC ptr in the pcidev's driver data. */

	pci_set_drvdata(ioc->pcidev, ioc);



	/* Set lookup ptr. */

	list_add_tail(&ioc->list, &ioc_list);
@@ -1791,6 +1805,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state) 
	CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);



	pci_disable_device(pdev);

	pci_release_selected_regions(pdev, ioc->bars);

	pci_set_power_state(pdev, device_state);



	return 0;
@@ -1807,7 +1822,6 @@ mpt_resume(struct pci_dev *pdev) 
	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);

	u32 device_state = pdev->current_state;

	int recovery_state;

	int err;



	printk(MYIOC_s_INFO_FMT

	"pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
@@ -1815,9 +1829,18 @@ mpt_resume(struct pci_dev *pdev) 


	pci_set_power_state(pdev, 0);

	pci_restore_state(pdev);

	err = pci_enable_device(pdev);

	if (err)

		return err;

	if (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) {

		ioc->bars = pci_select_bars(ioc->pcidev, IORESOURCE_MEM |

			IORESOURCE_IO);

		if (pci_enable_device(pdev))

			return 0;

	} else {

		ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);

		if (pci_enable_device_mem(pdev))

			return 0;

	}

	if (pci_request_selected_regions(pdev, ioc->bars, "mpt"))

		return 0;



	/* enable interrupts */

	CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);
@@ -1878,6 +1901,7 @@ mpt_signal_reset(u8 index, MPT_ADAPTER *ioc, int reset_phase) 
 *		-2 if READY but IOCFacts Failed

 *		-3 if READY but PrimeIOCFifos Failed

 *		-4 if READY but IOCInit Failed

 *		-5 if failed to enable_device and/or request_selected_regions

 */

static int

mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
@@ -1976,6 +2000,18 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) 
		}

	}



	if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP) &&

	    (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT)) {

		pci_release_selected_regions(ioc->pcidev, ioc->bars);

		ioc->bars = pci_select_bars(ioc->pcidev, IORESOURCE_MEM |

		    IORESOURCE_IO);

		if (pci_enable_device(ioc->pcidev))

			return -5;

		if (pci_request_selected_regions(ioc->pcidev, ioc->bars,

			"mpt"))

			return -5;

	}



	/*

	 * Device is reset now. It must have de-asserted the interrupt line

	 * (if it was asserted) and it should be safe to register for the
@@ -1999,7 +2035,6 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) 
			irq_allocated = 1;

			ioc->pci_irq = ioc->pcidev->irq;

			pci_set_master(ioc->pcidev);		/* ?? */

			pci_set_drvdata(ioc->pcidev, ioc);

			dprintk(ioc, printk(MYIOC_s_INFO_FMT "installed at interrupt "

			    "%d\n", ioc->name, ioc->pcidev->irq));

		}
@@ -2381,6 +2416,9 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc) 
		ioc->memmap = NULL;

	}



	pci_disable_device(ioc->pcidev);

	pci_release_selected_regions(ioc->pcidev, ioc->bars);



#if defined(CONFIG_MTRR) && 0

	if (ioc->mtrr_reg > 0) {

		mtrr_del(ioc->mtrr_reg, 0, 0);

drivers/message/fusion/mptbase.h

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ typedef struct _MPT_ADAPTER 
	dma_addr_t		HostPageBuffer_dma;

	int			 mtrr_reg;

	struct pci_dev		*pcidev;	/* struct pci_dev pointer */

	int			bars;		/* bitmask of BAR's that must be configured */

	u8			__iomem *memmap;	/* mmap address */

	struct Scsi_Host	*sh;		/* Scsi Host pointer */

	SpiCfgData		spi_data;	/* Scsi config. data */

drivers/scsi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ config SCSI_FD_MCS 


config SCSI_GDTH

	tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"

	depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API && PCI_LEGACY

	depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API

	---help---

	  Formerly called GDT SCSI Disk Array Controller Support.

drivers/scsi/aacraid/aachba.c

+49 −21
Original line number Diff line number Diff line
@@ -144,51 +144,77 @@ static char *aac_get_status_string(u32 status); 
 */



static int nondasd = -1;

static int aac_cache = 0;

static int aac_cache;

static int dacmode = -1;



int aac_msi;

int aac_commit = -1;

int startup_timeout = 180;

int aif_timeout = 120;



module_param(nondasd, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on");

MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices."

	" 0=off, 1=on");

module_param_named(cache, aac_cache, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(cache, "Disable Queue Flush commands:\n\tbit 0 - Disable FUA in WRITE SCSI commands\n\tbit 1 - Disable SYNCHRONIZE_CACHE SCSI command\n\tbit 2 - Disable only if Battery not protecting Cache");

MODULE_PARM_DESC(cache, "Disable Queue Flush commands:\n"

	"\tbit 0 - Disable FUA in WRITE SCSI commands\n"

	"\tbit 1 - Disable SYNCHRONIZE_CACHE SCSI command\n"

	"\tbit 2 - Disable only if Battery not protecting Cache");

module_param(dacmode, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0=off, 1=on");

MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC."

	" 0=off, 1=on");

module_param_named(commit, aac_commit, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on");

MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the"

	" adapter for foreign arrays.\n"

	"This is typically needed in systems that do not have a BIOS."

	" 0=off, 1=on");

module_param_named(msi, aac_msi, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(msi, "IRQ handling."

	" 0=PIC(default), 1=MSI, 2=MSI-X(unsupported, uses MSI)");

module_param(startup_timeout, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for adapter to have it's kernel up and\nrunning. This is typically adjusted for large systems that do not have a BIOS.");

MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for"

	" adapter to have it's kernel up and\n"

	"running. This is typically adjusted for large systems that do not"

	" have a BIOS.");

module_param(aif_timeout, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(aif_timeout, "The duration of time in seconds to wait for applications to pick up AIFs before\nderegistering them. This is typically adjusted for heavily burdened systems.");

MODULE_PARM_DESC(aif_timeout, "The duration of time in seconds to wait for"

	" applications to pick up AIFs before\n"

	"deregistering them. This is typically adjusted for heavily burdened"

	" systems.");



int numacb = -1;

module_param(numacb, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control blocks (FIB) allocated. Valid values are 512 and down. Default is to use suggestion from Firmware.");

MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control"

	" blocks (FIB) allocated. Valid values are 512 and down. Default is"

	" to use suggestion from Firmware.");



int acbsize = -1;

module_param(acbsize, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB) size. Valid values are 512, 2048, 4096 and 8192. Default is to use suggestion from Firmware.");

MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB)"

	" size. Valid values are 512, 2048, 4096 and 8192. Default is to use"

	" suggestion from Firmware.");



int update_interval = 30 * 60;

module_param(update_interval, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(update_interval, "Interval in seconds between time sync updates issued to adapter.");

MODULE_PARM_DESC(update_interval, "Interval in seconds between time sync"

	" updates issued to adapter.");



int check_interval = 24 * 60 * 60;

module_param(check_interval, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health checks.");

MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health"

	" checks.");



int aac_check_reset = 1;

module_param_named(check_reset, aac_check_reset, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the adapter. a value of -1 forces the reset to adapters programmed to ignore it.");

MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the"

	" adapter. a value of -1 forces the reset to adapters programmed to"

	" ignore it.");



int expose_physicals = -1;

module_param(expose_physicals, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(expose_physicals, "Expose physical components of the arrays. -1=protect 0=off, 1=on");

MODULE_PARM_DESC(expose_physicals, "Expose physical components of the arrays."

	" -1=protect 0=off, 1=on");



int aac_reset_devices = 0;

int aac_reset_devices;

module_param_named(reset_devices, aac_reset_devices, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(reset_devices, "Force an adapter reset at initialization.");
@@ -1315,7 +1341,7 @@ int aac_get_adapter_info(struct aac_dev* dev) 
			  (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),

			  dev->supplement_adapter_info.VpdInfo.Tsid);

		}

		if (!aac_check_reset || ((aac_check_reset != 1) &&

		if (!aac_check_reset || ((aac_check_reset == 1) &&

		  (dev->supplement_adapter_info.SupportedOptions2 &

		  AAC_OPTION_IGNORE_RESET))) {

			printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",
@@ -1353,13 +1379,14 @@ int aac_get_adapter_info(struct aac_dev* dev) 


	if (nondasd != -1)

		dev->nondasd_support = (nondasd!=0);

	if(dev->nondasd_support != 0) {

	if (dev->nondasd_support && !dev->in_reset)

		printk(KERN_INFO "%s%d: Non-DASD support enabled.\n",dev->name, dev->id);

	}



	dev->dac_support = 0;

	if( (sizeof(dma_addr_t) > 4) && (dev->adapter_info.options & AAC_OPT_SGMAP_HOST64)){

		printk(KERN_INFO "%s%d: 64bit support enabled.\n", dev->name, dev->id);

		if (!dev->in_reset)

			printk(KERN_INFO "%s%d: 64bit support enabled.\n",

				dev->name, dev->id);

		dev->dac_support = 1;

	}
@@ -1369,6 +1396,7 @@ int aac_get_adapter_info(struct aac_dev* dev) 
	if(dev->dac_support != 0) {

		if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&

			!pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {

			if (!dev->in_reset)

				printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",

					dev->name, dev->id);

		} else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&

drivers/scsi/aacraid/aacraid.h

+2 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,7 @@ struct aac_dev 
	u8			raw_io_64;

	u8			printf_enabled;

	u8			in_reset;

	u8			msi;

};



#define aac_adapter_interrupt(dev) \
@@ -1881,6 +1882,7 @@ extern int startup_timeout; 
extern int aif_timeout;

extern int expose_physicals;

extern int aac_reset_devices;

extern int aac_msi;

extern int aac_commit;

extern int update_interval;

extern int check_interval;

CRA Git | Maintained and supported by SUSTech CRA and CCSE