* [GIT PATCH] SCSI updates for 2.6.12
@ 2005-06-18 14:06 James Bottomley
2005-06-18 14:16 ` Christoph Hellwig
0 siblings, 1 reply; 7+ messages in thread
From: James Bottomley @ 2005-06-18 14:06 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds; +Cc: SCSI Mailing List, Linux Kernel
This is several driver updates (aic7xxx and fusion are the big reworks)
with some infrastructure fixups. Note: The fusion update reworks the
driver to begin separating out the transports (so SPI, SAS and FC no
longer have a single module driving them).
The patch is available from
rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
or
http://www.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6.git/
The Short log is:
Adrian Bunk:
o drivers/scsi/sym53c416.c: fix a wrong check
o drivers/scsi/aacraid/: make some functions static
o drivers/scsi/NCR53C9x.c: make a struct static
o drivers/scsi/atp870u.c: make a function static
Alexander Viro:
o TYPE_RBC cache fixes (sbp2.c affected)
o qla trivial iomem annotation
Andreas Herrmann:
o zfcp: fix handling of port boxed and lun boxed fsf states
o zfcp: fix module parameter parsing
o zfcp: fix bug during adapter shutdown
o zfcp: fix: problem in send_els_handler when D_ID assignment changes
o zfcp: fix: mark fsf request failed when receiving unknown status qualifier
o zfcp: fix: reopen port only if link-test fails
o zfcp: fix: allow more time for adapter initialization
o zfcp: fix wrong handling of failed requests for GID_PN command
o zfcp: remove flags_dump feature
Andrew Morton:
o git-scsi-misc-sbp2-warning-fix
Andrew Vasquez:
o qla2xxx: Pull-down scsi-host-addition to follow board initialization
o remove some dead code in qla2xxx
Benoit Boissinot:
o drivers/scsi/dpt_i2o.c: fix compile warnings
o drivers/scsi/dpt_i2o.c: cleanup useless code
Brian King:
o sg: Command completion after remove oops
o ipr: Fix ipr PCI hotplug hang with CDROM attach
o ipr: Driver version 2.0.14
o ipr: Array error logging fix
Christoph Hellwig:
o aic7xxx: clean up eisa support
o aic7xxx: remove some dead wood
o aic7xxx: remove ahc_find_softc
o aic7xxx: do not check for duplicate pci ids
o aic7xxx/aic79xx: remove useless byte order macro cruft
o remove Documentation/DocBook/scsidrivers.tmpl
Eric Moore:
o fusion - bump driver version to 3.03.02
o fusion - mpi headers version 1.5.9
o fusion-kconfig-cleanup
o fusion-kfree-cleanup
o fusion - Adding pci recog support for Fibre 949X and 939X chips
o mptfusion: fix panic loading driver statically compiled
o mptfusion: mptfc Adding Stub Driver - Fiber Channel
o mptfusion: mptspi Adding Stub Driver - SCSI Parallel
o mptfusion: mptscsih Split driver support
o mptfusion: mptlan Remove credits and update copyright
o mptfusion: mptctl Remove credits and update copyright
o mptfusion: mptbase cleanup, split driver support, DMA 32_BIT_MASK
o mptfusion: Kconfig Adding new bus type drivers for fusion drivers
Gerd Knorr:
o convert scsi changer driver from class simple
o add scsi changer driver
James Bottomley:
o merge by hand (qla_os.c mismerge)
o merge by hand (fix up qla_os.c merge error)
o aic7xxx: fix the BIOS limits setting routines
o update spi transport class so that u320 Domain Validation works
o fix aic7xxx coupled parameter problem
o aic7xxx: remove separate target and device allocations
o Automatic merge of ../scsi-misc-2.6-old/
o allow the HBA to reserve target and device private areas
o Add target alloc/destroy callbacks to the host template
o merge by hand - fix up rejections in Documentation/DocBook/Makefile
o ultrastor: fix compile failure
o drivers/scsi/FlashPoint.c: cleanups
o mptfusion: correct Kconfig problem
o remove PCI2000 and PCI2220i drivers
o qla1280: update firmware
Jeff Garzik:
o allow sleeping in ->eh_host_reset_handler()
o allow sleeping in ->eh_bus_reset_handler()
o allow sleeping in ->eh_device_reset_handler()
o allow sleeping in ->eh_abort_handler()
o Remove no-op implementations of SCSI EH hooks
o Remove unnecessary locking around completion function calls
Jeremy Higdon:
o qla1280.c - fix result for device Busy and Queue Full
Kai Mäkisara:
o tape: fix permissions for SG_IO, etc
Lee Revell:
o Add DMA mask constants other than 32 and 64 bit
Mark Haverkamp:
o aacraid: regression fix
o 2.6 aacraid: updated sysfs files
o 2.6 aacraid: Variable FIB size (updated patch)
o aacraid: remove sparse warnings
Matthew Wilcox:
o sym2 version 2.2.1
Mike Miller:
o cciss 2.6 DMA mapping
Patrick Mansfield:
o saved and restore result for timed out commands
Seokmann Ju:
o megaraid version 2.20.4.6
Tejun Heo:
o remove a timer race in scsi_queue_insert()
o remove spurious if tests from scsi_eh_{times_out|done}
o remove unnecessary scsi_delete_timer() call in scsi_reset_provider()
o make scsi_queue_insert() use blk_requeue_request()
o make scsi_requeue_request() use blk_requeue_request()
o remove requeue feature from blk_insert_request()
o remove REQ_SPECIAL in scsi_init_io()
o make blk layer set REQ_SOFTBARRIER on defer and requeue
And the diffstat (sorry qla1280 firmware this time):
Documentation/DocBook/scsidrivers.tmpl | 193
b/Documentation/DocBook/Makefile | 2
b/Documentation/scsi/ChangeLog.megaraid | 66
b/Documentation/scsi/scsi-changer.txt | 180
b/Documentation/scsi/scsi_mid_low_api.txt | 12
b/drivers/block/cciss.c | 12
b/drivers/block/elevator.c | 13
b/drivers/block/ll_rw_blk.c | 20
b/drivers/block/paride/pd.c | 2
b/drivers/block/sx8.c | 4
b/drivers/fc4/fc.c | 26
b/drivers/fc4/fc_syms.c | 1
b/drivers/fc4/fcp_impl.h | 1
b/drivers/ieee1394/sbp2.c | 151
b/drivers/ieee1394/sbp2.h | 4
b/drivers/message/fusion/Kconfig | 56
b/drivers/message/fusion/Makefile | 44
b/drivers/message/fusion/lsi/mpi.h | 70
b/drivers/message/fusion/lsi/mpi_cnfg.h | 1005 +++-
b/drivers/message/fusion/lsi/mpi_fc.h | 7
b/drivers/message/fusion/lsi/mpi_history.txt | 451 +-
b/drivers/message/fusion/lsi/mpi_inb.h | 7
b/drivers/message/fusion/lsi/mpi_init.h | 88
b/drivers/message/fusion/lsi/mpi_ioc.h | 254 -
b/drivers/message/fusion/lsi/mpi_lan.h | 6
b/drivers/message/fusion/lsi/mpi_raid.h | 17
b/drivers/message/fusion/lsi/mpi_sas.h | 171
b/drivers/message/fusion/lsi/mpi_targ.h | 160
b/drivers/message/fusion/lsi/mpi_tool.h | 57
b/drivers/message/fusion/lsi/mpi_type.h | 11
b/drivers/message/fusion/mptbase.c | 343 -
b/drivers/message/fusion/mptbase.h | 52
b/drivers/message/fusion/mptctl.c | 68
b/drivers/message/fusion/mptctl.h | 15
b/drivers/message/fusion/mptfc.c | 431 +
b/drivers/message/fusion/mptlan.c | 37
b/drivers/message/fusion/mptlan.h | 48
b/drivers/message/fusion/mptscsih.c | 795 ---
b/drivers/message/fusion/mptscsih.h | 43
b/drivers/message/fusion/mptspi.c | 486 ++
b/drivers/s390/scsi/zfcp_aux.c | 37
b/drivers/s390/scsi/zfcp_def.h | 25
b/drivers/s390/scsi/zfcp_erp.c | 121
b/drivers/s390/scsi/zfcp_ext.h | 4
b/drivers/s390/scsi/zfcp_fsf.c | 324 -
b/drivers/s390/scsi/zfcp_qdio.c | 68
b/drivers/s390/scsi/zfcp_scsi.c | 24
b/drivers/scsi/3w-9xxx.c | 3
b/drivers/scsi/3w-xxxx.c | 3
b/drivers/scsi/53c700.c | 26
b/drivers/scsi/BusLogic.c | 8
b/drivers/scsi/FlashPoint.c | 5872 ++++-----------------------
b/drivers/scsi/Kconfig | 40
b/drivers/scsi/Makefile | 3
b/drivers/scsi/NCR5380.c | 42
b/drivers/scsi/NCR5380.h | 2
b/drivers/scsi/NCR53C9x.c | 6
b/drivers/scsi/NCR53c406a.c | 23
b/drivers/scsi/a2091.c | 7
b/drivers/scsi/a3000.c | 7
b/drivers/scsi/aacraid/aachba.c | 165
b/drivers/scsi/aacraid/aacraid.h | 470 +-
b/drivers/scsi/aacraid/commctrl.c | 228 -
b/drivers/scsi/aacraid/comminit.c | 92
b/drivers/scsi/aacraid/commsup.c | 100
b/drivers/scsi/aacraid/dpcsup.c | 6
b/drivers/scsi/aacraid/linit.c | 179
b/drivers/scsi/aacraid/rkt.c | 43
b/drivers/scsi/aacraid/rx.c | 46
b/drivers/scsi/aacraid/sa.c | 35
b/drivers/scsi/aha152x.c | 2
b/drivers/scsi/aha1542.c | 22
b/drivers/scsi/aha1542.h | 1
b/drivers/scsi/aic7xxx/aic7770_osm.c | 191
b/drivers/scsi/aic7xxx/aic79xx_osm.c | 20
b/drivers/scsi/aic7xxx/aic79xx_osm.h | 17
b/drivers/scsi/aic7xxx/aic7xxx.h | 2
b/drivers/scsi/aic7xxx/aic7xxx_core.c | 16
b/drivers/scsi/aic7xxx/aic7xxx_osm.c | 662 +--
b/drivers/scsi/aic7xxx/aic7xxx_osm.h | 64
b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 46
b/drivers/scsi/aic7xxx/aic7xxx_proc.c | 31
b/drivers/scsi/aic7xxx_old.c | 33
b/drivers/scsi/arm/cumana_1.c | 2
b/drivers/scsi/arm/ecoscsi.c | 2
b/drivers/scsi/arm/fas216.c | 3
b/drivers/scsi/arm/oak.c | 2
b/drivers/scsi/atp870u.c | 4
b/drivers/scsi/ch.c | 1026 ++++
b/drivers/scsi/dc395x.c | 12
b/drivers/scsi/dmx3191d.c | 2
b/drivers/scsi/dpt_i2o.c | 65
b/drivers/scsi/dpti.h | 2
b/drivers/scsi/dtc.c | 2
b/drivers/scsi/dtc.h | 4
b/drivers/scsi/eata.c | 11
b/drivers/scsi/eata_pio.c | 5
b/drivers/scsi/fcal.c | 1
b/drivers/scsi/fd_mcs.c | 17
b/drivers/scsi/fdomain.c | 6
b/drivers/scsi/g_NCR5380.c | 2
b/drivers/scsi/g_NCR5380.h | 4
b/drivers/scsi/gdth.c | 23
b/drivers/scsi/gvp11.c | 8
b/drivers/scsi/ibmmca.c | 28
b/drivers/scsi/ibmvscsi/ibmvscsi.c | 4
b/drivers/scsi/ide-scsi.c | 11
b/drivers/scsi/imm.c | 9
b/drivers/scsi/in2000.c | 31
b/drivers/scsi/in2000.h | 2
b/drivers/scsi/initio.c | 4
b/drivers/scsi/ipr.c | 55
b/drivers/scsi/ipr.h | 4
b/drivers/scsi/ips.c | 21
b/drivers/scsi/lpfc/lpfc_scsi.c | 36
b/drivers/scsi/mac53c94.c | 11
b/drivers/scsi/mac_scsi.c | 2
b/drivers/scsi/mac_scsi.h | 2
b/drivers/scsi/megaraid.c | 14
b/drivers/scsi/megaraid/mega_common.h | 1
b/drivers/scsi/megaraid/megaraid_mbox.c | 156
b/drivers/scsi/megaraid/megaraid_mbox.h | 64
b/drivers/scsi/megaraid/megaraid_mm.c | 9
b/drivers/scsi/megaraid/megaraid_mm.h | 4
b/drivers/scsi/mesh.c | 4
b/drivers/scsi/mvme147.c | 7
b/drivers/scsi/nsp32.c | 7
b/drivers/scsi/pas16.c | 2
b/drivers/scsi/pas16.h | 4
b/drivers/scsi/pcmcia/nsp_cs.c | 15
b/drivers/scsi/pcmcia/qlogic_stub.c | 2
b/drivers/scsi/pcmcia/sym53c500_cs.c | 2
b/drivers/scsi/pluto.c | 1
b/drivers/scsi/ppa.c | 5
b/drivers/scsi/ql1040_fw.h | 4021 +++++++++---------
b/drivers/scsi/ql12160_fw.h | 3046 +++++++-------
b/drivers/scsi/ql1280_fw.h | 3653 ++++++++--------
b/drivers/scsi/qla1280.c | 41
b/drivers/scsi/qla2xxx/qla_dbg.c | 3
b/drivers/scsi/qla2xxx/qla_def.h | 60
b/drivers/scsi/qla2xxx/qla_gbl.h | 14
b/drivers/scsi/qla2xxx/qla_init.c | 33
b/drivers/scsi/qla2xxx/qla_iocb.c | 3
b/drivers/scsi/qla2xxx/qla_isr.c | 18
b/drivers/scsi/qla2xxx/qla_mbx.c | 6
b/drivers/scsi/qla2xxx/qla_os.c | 149
b/drivers/scsi/qlogicfas.c | 2
b/drivers/scsi/qlogicfas408.c | 26
b/drivers/scsi/qlogicfas408.h | 2
b/drivers/scsi/scsi.c | 10
b/drivers/scsi/scsi_error.c | 42
b/drivers/scsi/scsi_lib.c | 40
b/drivers/scsi/scsi_scan.c | 25
b/drivers/scsi/scsi_transport_spi.c | 77
b/drivers/scsi/sd.c | 36
b/drivers/scsi/seagate.c | 15
b/drivers/scsi/seagate.h | 2
b/drivers/scsi/sg.c | 2
b/drivers/scsi/sgiwd93.c | 7
b/drivers/scsi/st.c | 19
b/drivers/scsi/sun3x_esp.c | 2
b/drivers/scsi/sym53c416.c | 23
b/drivers/scsi/sym53c416.h | 3
b/drivers/scsi/sym53c8xx_2/sym_defs.h | 2
b/drivers/scsi/sym53c8xx_2/sym_glue.c | 152
b/drivers/scsi/sym53c8xx_2/sym_glue.h | 27
b/drivers/scsi/sym53c8xx_2/sym_hipd.c | 65
b/drivers/scsi/sym53c8xx_2/sym_hipd.h | 22
b/drivers/scsi/sym53c8xx_2/sym_nvram.c | 7
b/drivers/scsi/t128.c | 2
b/drivers/scsi/t128.h | 4
b/drivers/scsi/tmscsim.c | 6
b/drivers/scsi/u14-34f.c | 8
b/drivers/scsi/ultrastor.c | 4
b/drivers/scsi/wd7000.c | 9
b/drivers/usb/storage/scsiglue.c | 9
b/include/linux/blkdev.h | 2
b/include/linux/chio.h | 168
b/include/linux/dma-mapping.h | 5
b/include/linux/major.h | 1
b/include/scsi/scsi.h | 4
b/include/scsi/scsi_device.h | 4
b/include/scsi/scsi_host.h | 25
b/include/scsi/scsi_transport.h | 38
drivers/scsi/pci2000.c | 836 ---
drivers/scsi/pci2220i.c | 2915 -------------
drivers/scsi/pci2220i.h | 39
drivers/scsi/psi_dale.h | 564 --
drivers/scsi/psi_roy.h | 331 -
189 files changed, 13552 insertions(+), 19322 deletions(-)
James
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PATCH] SCSI updates for 2.6.12
2005-06-18 14:06 [GIT PATCH] SCSI updates for 2.6.12 James Bottomley
@ 2005-06-18 14:16 ` Christoph Hellwig
2005-06-18 17:45 ` Chris Wright
0 siblings, 1 reply; 7+ messages in thread
From: Christoph Hellwig @ 2005-06-18 14:16 UTC (permalink / raw)
To: James Bottomley
Cc: Andrew Morton, Linus Torvalds, SCSI Mailing List, Linux Kernel
> Andrew Vasquez:
> o qla2xxx: Pull-down scsi-host-addition to follow board initialization
Can we please put this one in 2.6.12.1? qla2xxx breaks horribly in 2.6.12
because this one is missing.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PATCH] SCSI updates for 2.6.12
2005-06-18 14:16 ` Christoph Hellwig
@ 2005-06-18 17:45 ` Chris Wright
2005-06-20 9:35 ` James Bottomley
0 siblings, 1 reply; 7+ messages in thread
From: Chris Wright @ 2005-06-18 17:45 UTC (permalink / raw)
To: Christoph Hellwig, James Bottomley, Andrew Morton, Linus Torvalds,
SCSI Mailing List, Linux Kernel
* Christoph Hellwig (hch@infradead.org) wrote:
> > Andrew Vasquez:
> > o qla2xxx: Pull-down scsi-host-addition to follow board initialization
>
> Can we please put this one in 2.6.12.1? qla2xxx breaks horribly in 2.6.12
> because this one is missing.
Sure, if it's seriously broken w/out send it to stable@kernel.org,
and we'll queue it up.
thanks,
-chris
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PATCH] SCSI updates for 2.6.12
2005-06-18 17:45 ` Chris Wright
@ 2005-06-20 9:35 ` James Bottomley
2005-06-20 10:33 ` Q: qla23xxx and lpfc (Was: Re: [GIT PATCH] SCSI updates for 2.6.12) Tomasz Kłoczko
2005-06-20 17:52 ` [GIT PATCH] SCSI updates for 2.6.12 Chris Wright
0 siblings, 2 replies; 7+ messages in thread
From: James Bottomley @ 2005-06-20 9:35 UTC (permalink / raw)
To: Chris Wright
Cc: Christoph Hellwig, Andrew Morton, Linus Torvalds,
SCSI Mailing List, Linux Kernel
On Sat, 2005-06-18 at 10:45 -0700, Chris Wright wrote:
> Sure, if it's seriously broken w/out send it to stable@kernel.org,
> and we'll queue it up.
It should be here:
rsync://www.parisc-linux.org/~jejb/git/scsi-rc-fixes-2.6.git
That's the same patch that's merged now.
James
^ permalink raw reply [flat|nested] 7+ messages in thread
* Q: qla23xxx and lpfc (Was: Re: [GIT PATCH] SCSI updates for 2.6.12)
2005-06-20 9:35 ` James Bottomley
@ 2005-06-20 10:33 ` Tomasz Kłoczko
2005-06-20 10:45 ` Christoph Hellwig
2005-06-20 17:52 ` [GIT PATCH] SCSI updates for 2.6.12 Chris Wright
1 sibling, 1 reply; 7+ messages in thread
From: Tomasz Kłoczko @ 2005-06-20 10:33 UTC (permalink / raw)
To: James Bottomley
Cc: Chris Wright, Christoph Hellwig, Andrew Morton, Linus Torvalds,
SCSI Mailing List, Linux Kernel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 928 bytes --]
On Mon, 20 Jun 2005, James Bottomley wrote:
> On Sat, 2005-06-18 at 10:45 -0700, Chris Wright wrote:
>> Sure, if it's seriously broken w/out send it to stable@kernel.org,
>> and we'll queue it up.
>
> It should be here:
>
> rsync://www.parisc-linux.org/~jejb/git/scsi-rc-fixes-2.6.git
>
> That's the same patch that's merged now.
Included in vanilla 2.6.12 qla23xxx 8.00.02b5 is for me unuseable (fails
on scaning luns and oopses on array controler reset) on x86_64 with
qla2300 and for me works only version 8.01.00b2.
Is it will be possible include this version in official tree ?
Also is it will be possible include Emulex lpfc driver to official tree ?
kloczek
--
-----------------------------------------------------------
*Ludzie nie mają problemów, tylko sobie sami je stwarzają*
-----------------------------------------------------------
Tomasz Kłoczko, sys adm @zie.pg.gda.pl|*e-mail: kloczek@rudy.mif.pg.gda.pl*
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Q: qla23xxx and lpfc (Was: Re: [GIT PATCH] SCSI updates for 2.6.12)
2005-06-20 10:33 ` Q: qla23xxx and lpfc (Was: Re: [GIT PATCH] SCSI updates for 2.6.12) Tomasz Kłoczko
@ 2005-06-20 10:45 ` Christoph Hellwig
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Hellwig @ 2005-06-20 10:45 UTC (permalink / raw)
To: Tomasz K?oczko
Cc: James Bottomley, Chris Wright, Christoph Hellwig, Andrew Morton,
Linus Torvalds, SCSI Mailing List, Linux Kernel
On Mon, Jun 20, 2005 at 12:33:49PM +0200, Tomasz K?oczko wrote:
> Included in vanilla 2.6.12 qla23xxx 8.00.02b5 is for me unuseable (fails
> on scaning luns and oopses on array controler reset) on x86_64 with
> qla2300 and for me works only version 8.01.00b2.
> Is it will be possible include this version in official tree ?
As said above a bad patch from Qlogic went in and Linus didn't pull the
release critical fixes tree before release. It'll be fixed in 2.6.12.1.
8.01.00b2 is full of crap and despite the higher version number actually
a regression vs the kernel driver in various aspects.
> Also is it will be possible include Emulex lpfc driver to official tree ?
See drivers/scsi/lpfc/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PATCH] SCSI updates for 2.6.12
2005-06-20 9:35 ` James Bottomley
2005-06-20 10:33 ` Q: qla23xxx and lpfc (Was: Re: [GIT PATCH] SCSI updates for 2.6.12) Tomasz Kłoczko
@ 2005-06-20 17:52 ` Chris Wright
1 sibling, 0 replies; 7+ messages in thread
From: Chris Wright @ 2005-06-20 17:52 UTC (permalink / raw)
To: James Bottomley
Cc: Chris Wright, Christoph Hellwig, Andrew Morton, Linus Torvalds,
SCSI Mailing List, Linux Kernel, stable
* James Bottomley (James.Bottomley@SteelEye.com) wrote:
> It should be here:
>
> rsync://www.parisc-linux.org/~jejb/git/scsi-rc-fixes-2.6.git
The following is queued for -stable:
[SCSI] qla2xxx: Pull-down scsi-host-addition to follow board initialization.
Return to previous held-logic of calling scsi_add_host() only
after the board has been completely initialized. Also return
pci_*() error-codes during probe failure paths.
This also corrects an issue where only lun 0 is being scanned for
a given port.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---
commit a1541d5af66d02426655b1498f814c52347dd7d3
tree 02d041e54ebaec744d30ebf6012e305b9673bec0
parent 27198d855abbfc82df69e81b6c8d2f333580114c
author Andrew Vasquez <andrew.vasquez@qlogic.com> Thu, 09 Jun 2005 17:21:28 -0700
committer James Bottomley <jejb@mulgrave.(none)> Sat, 11 Jun 2005 13:06:22 -0500
drivers/scsi/qla2xxx/qla_os.c | 55 +++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1150,7 +1150,7 @@ iospace_error_exit:
*/
int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
{
- int ret;
+ int ret = -ENODEV;
device_reg_t __iomem *reg;
struct Scsi_Host *host;
scsi_qla_host_t *ha;
@@ -1161,7 +1161,7 @@ int qla2x00_probe_one(struct pci_dev *pd
fc_port_t *fcport;
if (pci_enable_device(pdev))
- return -1;
+ goto probe_out;
host = scsi_host_alloc(&qla2x00_driver_template,
sizeof(scsi_qla_host_t));
@@ -1183,9 +1183,8 @@ int qla2x00_probe_one(struct pci_dev *pd
/* Configure PCI I/O space */
ret = qla2x00_iospace_config(ha);
- if (ret != 0) {
- goto probe_alloc_failed;
- }
+ if (ret)
+ goto probe_failed;
/* Sanitize the information from PCI BIOS. */
host->irq = pdev->irq;
@@ -1258,23 +1257,10 @@ int qla2x00_probe_one(struct pci_dev *pd
qla_printk(KERN_WARNING, ha,
"[ERROR] Failed to allocate memory for adapter\n");
- goto probe_alloc_failed;
+ ret = -ENOMEM;
+ goto probe_failed;
}
- pci_set_drvdata(pdev, ha);
- host->this_id = 255;
- host->cmd_per_lun = 3;
- host->unique_id = ha->instance;
- host->max_cmd_len = MAX_CMDSZ;
- host->max_channel = ha->ports - 1;
- host->max_id = ha->max_targets;
- host->max_lun = ha->max_luns;
- host->transportt = qla2xxx_transport_template;
- if (scsi_add_host(host, &pdev->dev))
- goto probe_alloc_failed;
-
- qla2x00_alloc_sysfs_attr(ha);
-
if (qla2x00_initialize_adapter(ha) &&
!(ha->device_flags & DFLG_NO_CABLE)) {
@@ -1285,11 +1271,10 @@ int qla2x00_probe_one(struct pci_dev *pd
"Adapter flags %x.\n",
ha->host_no, ha->device_flags));
+ ret = -ENODEV;
goto probe_failed;
}
- qla2x00_init_host_attr(ha);
-
/*
* Startup the kernel thread for this host adapter
*/
@@ -1299,17 +1284,26 @@ int qla2x00_probe_one(struct pci_dev *pd
qla_printk(KERN_WARNING, ha,
"Unable to start DPC thread!\n");
+ ret = -ENODEV;
goto probe_failed;
}
wait_for_completion(&ha->dpc_inited);
+ host->this_id = 255;
+ host->cmd_per_lun = 3;
+ host->unique_id = ha->instance;
+ host->max_cmd_len = MAX_CMDSZ;
+ host->max_channel = ha->ports - 1;
+ host->max_lun = MAX_LUNS;
+ host->transportt = qla2xxx_transport_template;
+
if (IS_QLA2100(ha) || IS_QLA2200(ha))
ret = request_irq(host->irq, qla2100_intr_handler,
SA_INTERRUPT|SA_SHIRQ, ha->brd_info->drv_name, ha);
else
ret = request_irq(host->irq, qla2300_intr_handler,
SA_INTERRUPT|SA_SHIRQ, ha->brd_info->drv_name, ha);
- if (ret != 0) {
+ if (ret) {
qla_printk(KERN_WARNING, ha,
"Failed to reserve interrupt %d already in use.\n",
host->irq);
@@ -1363,9 +1357,18 @@ int qla2x00_probe_one(struct pci_dev *pd
msleep(10);
}
+ pci_set_drvdata(pdev, ha);
ha->flags.init_done = 1;
num_hosts++;
+ ret = scsi_add_host(host, &pdev->dev);
+ if (ret)
+ goto probe_failed;
+
+ qla2x00_alloc_sysfs_attr(ha);
+
+ qla2x00_init_host_attr(ha);
+
qla_printk(KERN_INFO, ha, "\n"
" QLogic Fibre Channel HBA Driver: %s\n"
" QLogic %s - %s\n"
@@ -1384,9 +1387,6 @@ int qla2x00_probe_one(struct pci_dev *pd
probe_failed:
fc_remove_host(ha->host);
- scsi_remove_host(host);
-
-probe_alloc_failed:
qla2x00_free_device(ha);
scsi_host_put(host);
@@ -1394,7 +1394,8 @@ probe_alloc_failed:
probe_disable_device:
pci_disable_device(pdev);
- return -1;
+probe_out:
+ return ret;
}
EXPORT_SYMBOL_GPL(qla2x00_probe_one);
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2005-06-20 17:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-18 14:06 [GIT PATCH] SCSI updates for 2.6.12 James Bottomley
2005-06-18 14:16 ` Christoph Hellwig
2005-06-18 17:45 ` Chris Wright
2005-06-20 9:35 ` James Bottomley
2005-06-20 10:33 ` Q: qla23xxx and lpfc (Was: Re: [GIT PATCH] SCSI updates for 2.6.12) Tomasz Kłoczko
2005-06-20 10:45 ` Christoph Hellwig
2005-06-20 17:52 ` [GIT PATCH] SCSI updates for 2.6.12 Chris Wright
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox