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

Commit f164c421 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: (94 commits)
  [SCSI] SPI transport class: misc DV fixes
  [SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
  [SCSI] eata_pio cleanup and PCI fix
  [SCSI] aacraid: README update
  [SCSI] aacraid: remove scsi_remove_device
  [SCSI] aacraid: merge rx and rkt code
  [SCSI] aacraid: expose physical devices
  [SCSI] aacraid: misc cleanup
  [SCSI] zfcp: update maintainers file
  [SCSI] zfcp: update maintainers file
  [SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
  [SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
  [SCSI] zfcp: fix: use correct req_id in eh_abort_handler
  [SCSI] zfcp: create private slab caches to guarantee proper data alignment
  [SCSI] zfcp: remove zfcp_ccw_unregister function
  [SCSI] aic7xxx: pause sequencer before touching SBLKCTL
  [SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
  [SCSI] scsi_debug version 1.80
  [SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
  [SCSI] aha152x: remove static host array
  ...
parents 6973ddde 1aedf2cc
Loading
Loading
Loading
Loading
+56 −0
Original line number Diff line number Diff line
**************************************************************************
** History
**
**   REV#         DATE             NAME         DESCRIPTION
** 1.00.00.00    3/31/2004       Erich Chen     First release
** 1.10.00.04    7/28/2004       Erich Chen     modify for ioctl
** 1.10.00.06    8/28/2004       Erich Chen     modify for 2.6.x
** 1.10.00.08    9/28/2004       Erich Chen     modify for x86_64
** 1.10.00.10   10/10/2004       Erich Chen     bug fix for SMP & ioctl
** 1.20.00.00   11/29/2004       Erich Chen     bug fix with arcmsr_bus_reset when PHY error
** 1.20.00.02   12/09/2004       Erich Chen     bug fix with over 2T bytes RAID Volume
** 1.20.00.04    1/09/2005       Erich Chen     fits for Debian linux kernel version 2.2.xx
** 1.20.00.05    2/20/2005       Erich Chen     cleanly as look like a Linux driver at 2.6.x
**                                              thanks for peoples kindness comment
**						Kornel Wieliczek
**						Christoph Hellwig
**						Adrian Bunk
**						Andrew Morton
**						Christoph Hellwig
**						James Bottomley
**						Arjan van de Ven
** 1.20.00.06    3/12/2005       Erich Chen     fix with arcmsr_pci_unmap_dma "unsigned long" cast,
**						modify PCCB POOL allocated by "dma_alloc_coherent"
**						(Kornel Wieliczek's comment)
** 1.20.00.07    3/23/2005       Erich Chen     bug fix with arcmsr_scsi_host_template_init
**						occur segmentation fault,
**						if RAID adapter does not on PCI slot
**						and modprobe/rmmod this driver twice.
**						bug fix enormous stack usage (Adrian Bunk's comment)
** 1.20.00.08    6/23/2005       Erich Chen     bug fix with abort command,
**						in case of heavy loading when sata cable
**						working on low quality connection
** 1.20.00.09    9/12/2005       Erich Chen     bug fix with abort command handling, firmware version check
**						and firmware update notify for hardware bug fix
** 1.20.00.10    9/23/2005       Erich Chen     enhance sysfs function for change driver's max tag Q number.
**						add DMA_64BIT_MASK for backward compatible with all 2.6.x
**						add some useful message for abort command
**						add ioctl code 'ARCMSR_IOCTL_FLUSH_ADAPTER_CACHE'
**						customer can send this command for sync raid volume data
** 1.20.00.11    9/29/2005       Erich Chen     by comment of Arjan van de Ven fix incorrect msleep redefine
**						cast off sizeof(dma_addr_t) condition for 64bit pci_set_dma_mask
** 1.20.00.12    9/30/2005       Erich Chen     bug fix with 64bit platform's ccbs using if over 4G system memory
**						change 64bit pci_set_consistent_dma_mask into 32bit
**						increcct adapter count if adapter initialize fail.
**						miss edit at arcmsr_build_ccb....
**						psge += sizeof(struct _SG64ENTRY *) =>
**						psge += sizeof(struct _SG64ENTRY)
**						64 bits sg entry would be incorrectly calculated
**						thanks Kornel Wieliczek give me kindly notify
**						and detail description
** 1.20.00.13   11/15/2005       Erich Chen     scheduling pending ccb with FIFO
**						change the architecture of arcmsr command queue list
**						for linux standard list
**						enable usage of pci message signal interrupt
**						follow Randy.Danlup kindness suggestion cleanup this code
**************************************************************************
 No newline at end of file
+30 −23
Original line number Diff line number Diff line
@@ -11,38 +11,43 @@ the original).
Supported Cards/Chipsets
-------------------------
	PCI ID (pci.ids)	OEM	Product
	9005:0285:9005:028a	Adaptec	2020ZCR (Skyhawk)
	9005:0285:9005:028e	Adaptec	2020SA (Skyhawk)
	9005:0285:9005:028b	Adaptec 2025ZCR (Terminator)
	9005:0285:9005:028f	Adaptec 2025SA (Terminator)
	9005:0285:9005:0286	Adaptec	2120S (Crusader)
	9005:0286:9005:028d	Adaptec	2130S (Lancer)
	9005:0283:9005:0283	Adaptec	Catapult (3210S with arc firmware)
	9005:0284:9005:0284	Adaptec	Tomcat (3410S with arc firmware)
	9005:0285:9005:0285	Adaptec	2200S (Vulcan)
	9005:0285:9005:0286	Adaptec	2120S (Crusader)
	9005:0285:9005:0287	Adaptec	2200S (Vulcan-2m)
	9005:0285:9005:0288	Adaptec	3230S (Harrier)
	9005:0285:9005:0289	Adaptec	3240S (Tornado)
	9005:0285:9005:028a	Adaptec	2020ZCR (Skyhawk)
	9005:0285:9005:028b	Adaptec 2025ZCR (Terminator)
	9005:0286:9005:028c	Adaptec	2230S (Lancer)
	9005:0286:9005:028c	Adaptec	2230SLP (Lancer)
	9005:0285:9005:0296	Adaptec	2240S (SabreExpress)
	9005:0286:9005:028d	Adaptec	2130S (Lancer)
	9005:0285:9005:028e	Adaptec	2020SA (Skyhawk)
	9005:0285:9005:028f	Adaptec 2025SA (Terminator)
	9005:0285:9005:0290	Adaptec	2410SA (Jaguar)
	9005:0285:9005:0293	Adaptec 21610SA (Corsair-16)
	9005:0285:103c:3227	Adaptec 2610SA (Bearcat HP release)
	9005:0285:9005:0293	Adaptec 21610SA (Corsair-16)
	9005:0285:9005:0296	Adaptec	2240S (SabreExpress)
	9005:0285:9005:0292	Adaptec	2810SA (Corsair-8)
	9005:0285:9005:0294	Adaptec	Prowler
	9005:0286:9005:029d	Adaptec	2420SA (Intruder HP release)
	9005:0286:9005:029c	Adaptec	2620SA (Intruder)
	9005:0286:9005:029b	Adaptec	2820SA (Intruder)
	9005:0286:9005:02a7	Adaptec	2830SA (Skyray)
	9005:0286:9005:02a8	Adaptec	2430SA (Skyray)
	9005:0285:9005:0288	Adaptec	3230S (Harrier)
	9005:0285:9005:0289	Adaptec	3240S (Tornado)
	9005:0285:9005:0298	Adaptec	4000SAS (BlackBird)
	9005:0285:9005:0297	Adaptec	4005SAS (AvonPark)
	9005:0285:9005:0298	Adaptec	4000SAS (BlackBird)
	9005:0285:9005:0299	Adaptec	4800SAS (Marauder-X)
	9005:0285:9005:029a	Adaptec	4805SAS (Marauder-E)
	9005:0286:9005:029b	Adaptec	2820SA (Intruder)
	9005:0286:9005:029c	Adaptec	2620SA (Intruder)
	9005:0286:9005:029d	Adaptec	2420SA (Intruder HP release)
	9005:0286:9005:02a2	Adaptec	3800SAS (Hurricane44)
	9005:0286:9005:02a7	Adaptec	3805SAS (Hurricane80)
	9005:0286:9005:02a8	Adaptec	3400SAS (Hurricane40)
	9005:0286:9005:02ac	Adaptec	1800SAS (Typhoon44)
	9005:0286:9005:02b3	Adaptec	2400SAS (Hurricane40lm)
	9005:0285:9005:02b5	Adaptec ASR5800 (Voodoo44)
	9005:0285:9005:02b6	Adaptec ASR5805 (Voodoo80)
	9005:0285:9005:02b7	Adaptec ASR5808 (Voodoo08)
	1011:0046:9005:0364	Adaptec	5400S (Mustang)
	1011:0046:9005:0365	Adaptec	5400S (Mustang)
	9005:0283:9005:0283	Adaptec	Catapult (3210S with arc firmware)
	9005:0284:9005:0284	Adaptec	Tomcat (3410S with arc firmware)
	9005:0287:9005:0800	Adaptec	Themisto (Jupiter)
	9005:0200:9005:0200	Adaptec	Themisto (Jupiter)
	9005:0286:9005:0800	Adaptec	Callisto (Jupiter)
@@ -64,18 +69,20 @@ Supported Cards/Chipsets
	9005:0285:9005:0290	IBM	ServeRAID 7t (Jaguar)
	9005:0285:1014:02F2	IBM	ServeRAID 8i (AvonPark)
	9005:0285:1014:0312	IBM	ServeRAID 8i (AvonParkLite)
	9005:0286:1014:9580	IBM	ServeRAID 8k/8k-l8 (Aurora)
	9005:0286:1014:9540	IBM	ServeRAID 8k/8k-l4 (AuroraLite)
	9005:0286:9005:029f	ICP	ICP9014R0 (Lancer)
	9005:0286:1014:9580	IBM	ServeRAID 8k/8k-l8 (Aurora)
	9005:0286:1014:034d	IBM	ServeRAID 8s (Hurricane)
	9005:0286:9005:029e	ICP	ICP9024R0 (Lancer)
	9005:0286:9005:029f	ICP	ICP9014R0 (Lancer)
	9005:0286:9005:02a0	ICP	ICP9047MA (Lancer)
	9005:0286:9005:02a1	ICP	ICP9087MA (Lancer)
	9005:0286:9005:02a3	ICP	ICP5445AU (Hurricane44)
	9005:0286:9005:02a4	ICP	ICP9085LI (Marauder-X)
	9005:0286:9005:02a5	ICP	ICP5085BR (Marauder-E)
	9005:0286:9005:02a3	ICP	ICP5445AU (Hurricane44)
	9005:0286:9005:02a6	ICP	ICP9067MA (Intruder-6)
	9005:0286:9005:02a9	ICP	ICP5087AU (Skyray)
	9005:0286:9005:02aa	ICP	ICP5047AU (Skyray)
	9005:0286:9005:02a9	ICP	ICP5085AU (Hurricane80)
	9005:0286:9005:02aa	ICP	ICP5045AU (Hurricane40)
	9005:0286:9005:02b4	ICP	ICP5045AL (Hurricane40lm)

People
-------------------------
Loading