[SCSI] arcmsr: 1.20.00.15: add SATA RAID plus other fixes

Description:
** support ARC1200/1201/1202 SATA RAID adapter, which is named
ACB_ADAPTER_TYPE_B
** modify the arcmsr_pci_slot_reset function
** modify the arcmsr_pci_ers_disconnect_forepart function
** modify the arcmsr_pci_ers_need_reset_forepart function 

Signed-off-by: Nick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 18 insertions, 5 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e1efa0eac4ff..69b2fac6f098 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -543,19 +543,32 @@ config SCSI_IN2000
           module will be called in2000.
 
 config SCSI_ARCMSR
-        tristate "ARECA ARC11X0[PCI-X]/ARC12X0[PCI-EXPRESS] SATA-RAID support"
+        tristate "ARECA (ARC11xx/12xx/13xx/16xx) SATA/SAS RAID Host Adapter"
         depends on PCI && SCSI
         help
-          This driver supports all of ARECA's SATA RAID controller cards.
+          This driver supports all of ARECA's SATA/SAS RAID controller cards.
           This is an ARECA-maintained driver by Erich Chen.
-          If you have any problems, please mail to: < erich@areca.com.tw >
+          If you have any problems, please mail to: <erich@areca.com.tw>.
           Areca supports Linux RAID config tools.
-
-          < http://www.areca.com.tw >
+          Please link <http://www.areca.com.tw>
 
           To compile this driver as a module, choose M here: the
           module will be called arcmsr (modprobe arcmsr).
 
+config SCSI_ARCMSR_AER
+        bool "Enable PCI Error Recovery Capability in Areca Driver(ARCMSR)"
+        depends on SCSI_ARCMSR && PCIEAER
+        default n
+        help
+          The advanced error reporting(AER) capability is "NOT" provided by
+          ARC1200/1201/1202 SATA RAID controllers cards.
+          If your card is one of ARC1200/1201/1202, please use the default setting, n.
+          If your card is other models, you could pick it
+          on condition that the kernel version is greater than 2.6.19.
+          This function is maintained driver by Nick Cheng. If you have any
+          problems or suggestion, you are welcome to contact with <nick.cheng@areca.com.tw>.
+          To enable this function, choose Y here.
+
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 
 config SCSI_HPTIOP