mirror of https://gitee.com/openkylin/linux.git
[SCSI] 3w-9xxx: add MSI support and misc fixes
This patch for the 3w-9xxx scsi driver applies on top of the BKL-pushdown changes in -git9. This patch does the following: - Increase max AENs drained to 256. - Add MSI support and "use_msi" module parameter. - Fix bug in twa_get_param() on 4GB+. - Use pci_resource_len() for ioremap(). Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
adam radford
James Bottomley
parent
6bd522f6a2
commit
3dabec7175
|
|
@ -4,7 +4,7 @@
|
|||
Written By: Adam Radford <linuxraid@amcc.com>
|
||||
Modifications By: Tom Couch <linuxraid@amcc.com>
|
||||
|
||||
Copyright (C) 2004-2007 Applied Micro Circuits Corporation.
|
||||
Copyright (C) 2004-2008 Applied Micro Circuits Corporation.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -71,6 +71,10 @@
|
|||
Add support for 9650SE controllers.
|
||||
2.26.02.009 - Fix dma mask setting to fallback to 32-bit if 64-bit fails.
|
||||
2.26.02.010 - Add support for 9690SA controllers.
|
||||
2.26.02.011 - Increase max AENs drained to 256.
|
||||
Add MSI support and "use_msi" module parameter.
|
||||
Fix bug in twa_get_param() on 4GB+.
|
||||
Use pci_resource_len() for ioremap().
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
|
@ -95,7 +99,7 @@
|
|||
#include "3w-9xxx.h"
|
||||
|
||||
/* Globals */
|
||||
#define TW_DRIVER_VERSION "2.26.02.010"
|
||||
#define TW_DRIVER_VERSION "2.26.02.011"
|
||||
static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
|
||||
static unsigned int twa_device_extension_count;
|
||||
static int twa_major = -1;
|
||||
|
|
@ -107,6 +111,10 @@ MODULE_DESCRIPTION ("3ware 9000 Storage Controller Linux Driver");
|
|||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(TW_DRIVER_VERSION);
|
||||
|
||||
static int use_msi = 0;
|
||||
module_param(use_msi, int, S_IRUGO);
|
||||
MODULE_PARM_DESC(use_msi, "Use Message Signaled Interrupts. Default: 0");
|
||||
|
||||
/* Function prototypes */
|
||||
static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header);
|
||||
static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id);
|
||||
|
|
@ -1038,7 +1046,6 @@ static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int tabl
|
|||
TW_Command_Full *full_command_packet;
|
||||
TW_Command *command_packet;
|
||||
TW_Param_Apache *param;
|
||||
unsigned long param_value;
|
||||
void *retval = NULL;
|
||||
|
||||
/* Setup the command packet */
|
||||
|
|
@ -1057,9 +1064,8 @@ static void *twa_get_param(TW_Device_Extension *tw_dev, int request_id, int tabl
|
|||
param->table_id = cpu_to_le16(table_id | 0x8000);
|
||||
param->parameter_id = cpu_to_le16(parameter_id);
|
||||
param->parameter_size_bytes = cpu_to_le16(parameter_size_bytes);
|
||||
param_value = tw_dev->generic_buffer_phys[request_id];
|
||||
|
||||
command_packet->byte8_offset.param.sgl[0].address = TW_CPU_TO_SGL(param_value);
|
||||
command_packet->byte8_offset.param.sgl[0].address = TW_CPU_TO_SGL(tw_dev->generic_buffer_phys[request_id]);
|
||||
command_packet->byte8_offset.param.sgl[0].length = cpu_to_le32(TW_SECTOR_SIZE);
|
||||
|
||||
/* Post the command packet to the board */
|
||||
|
|
@ -2000,7 +2006,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
|
|||
{
|
||||
struct Scsi_Host *host = NULL;
|
||||
TW_Device_Extension *tw_dev;
|
||||
u32 mem_addr;
|
||||
unsigned long mem_addr, mem_len;
|
||||
int retval = -ENODEV;
|
||||
|
||||
retval = pci_enable_device(pdev);
|
||||
|
|
@ -2045,13 +2051,16 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
|
|||
goto out_free_device_extension;
|
||||
}
|
||||
|
||||
if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
|
||||
if (pdev->device == PCI_DEVICE_ID_3WARE_9000) {
|
||||
mem_addr = pci_resource_start(pdev, 1);
|
||||
else
|
||||
mem_len = pci_resource_len(pdev, 1);
|
||||
} else {
|
||||
mem_addr = pci_resource_start(pdev, 2);
|
||||
mem_len = pci_resource_len(pdev, 2);
|
||||
}
|
||||
|
||||
/* Save base address */
|
||||
tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
|
||||
tw_dev->base_addr = ioremap(mem_addr, mem_len);
|
||||
if (!tw_dev->base_addr) {
|
||||
TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
|
||||
goto out_release_mem_region;
|
||||
|
|
@ -2086,7 +2095,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
|
|||
|
||||
pci_set_drvdata(pdev, host);
|
||||
|
||||
printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
|
||||
printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
|
||||
host->host_no, mem_addr, pdev->irq);
|
||||
printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
|
||||
host->host_no,
|
||||
|
|
@ -2097,6 +2106,11 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
|
|||
le32_to_cpu(*(int *)twa_get_param(tw_dev, 2, TW_INFORMATION_TABLE,
|
||||
TW_PARAM_PORTCOUNT, TW_PARAM_PORTCOUNT_LENGTH)));
|
||||
|
||||
/* Try to enable MSI */
|
||||
if (use_msi && (pdev->device != PCI_DEVICE_ID_3WARE_9000) &&
|
||||
!pci_enable_msi(pdev))
|
||||
set_bit(TW_USING_MSI, &tw_dev->flags);
|
||||
|
||||
/* Now setup the interrupt handler */
|
||||
retval = request_irq(pdev->irq, twa_interrupt, IRQF_SHARED, "3w-9xxx", tw_dev);
|
||||
if (retval) {
|
||||
|
|
@ -2120,6 +2134,8 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
|
|||
return 0;
|
||||
|
||||
out_remove_host:
|
||||
if (test_bit(TW_USING_MSI, &tw_dev->flags))
|
||||
pci_disable_msi(pdev);
|
||||
scsi_remove_host(host);
|
||||
out_iounmap:
|
||||
iounmap(tw_dev->base_addr);
|
||||
|
|
@ -2151,6 +2167,10 @@ static void twa_remove(struct pci_dev *pdev)
|
|||
/* Shutdown the card */
|
||||
__twa_shutdown(tw_dev);
|
||||
|
||||
/* Disable MSI if enabled */
|
||||
if (test_bit(TW_USING_MSI, &tw_dev->flags))
|
||||
pci_disable_msi(pdev);
|
||||
|
||||
/* Free IO remapping */
|
||||
iounmap(tw_dev->base_addr);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
Written By: Adam Radford <linuxraid@amcc.com>
|
||||
Modifications By: Tom Couch <linuxraid@amcc.com>
|
||||
|
||||
Copyright (C) 2004-2007 Applied Micro Circuits Corporation.
|
||||
Copyright (C) 2004-2008 Applied Micro Circuits Corporation.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -319,8 +319,8 @@ static twa_message_type twa_error_table[] = {
|
|||
|
||||
/* Compatibility defines */
|
||||
#define TW_9000_ARCH_ID 0x5
|
||||
#define TW_CURRENT_DRIVER_SRL 30
|
||||
#define TW_CURRENT_DRIVER_BUILD 80
|
||||
#define TW_CURRENT_DRIVER_SRL 35
|
||||
#define TW_CURRENT_DRIVER_BUILD 0
|
||||
#define TW_CURRENT_DRIVER_BRANCH 0
|
||||
|
||||
/* Phase defines */
|
||||
|
|
@ -352,8 +352,9 @@ static twa_message_type twa_error_table[] = {
|
|||
#define TW_MAX_RESET_TRIES 2
|
||||
#define TW_MAX_CMDS_PER_LUN 254
|
||||
#define TW_MAX_RESPONSE_DRAIN 256
|
||||
#define TW_MAX_AEN_DRAIN 40
|
||||
#define TW_MAX_AEN_DRAIN 255
|
||||
#define TW_IN_RESET 2
|
||||
#define TW_USING_MSI 3
|
||||
#define TW_IN_ATTENTION_LOOP 4
|
||||
#define TW_MAX_SECTORS 256
|
||||
#define TW_AEN_WAIT_TIME 1000
|
||||
|
|
|
|||
Loading…
Reference in New Issue