[PATCH] [358/2many] MAINTAINERS - ONSTREAM SCSI TAPE DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 17970b0..89a586a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3441,6 +3441,8 @@ M:[EMAIL PROTECTED] L: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: drivers/scsi/osst* +F: drivers/scsi/st.c OPROFILE P: Philippe Elie - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [332/2many] MAINTAINERS - NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index e372aeb..493de7a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3177,6 +3177,7 @@ P:James E.J. Bottomley M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: drivers/scsi/NCR_D700.* NETEM NETWORK EMULATOR P: Stephen Hemminger - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [303/2many] MAINTAINERS - LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 0046cbd..c90c64d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2909,6 +2909,7 @@ P:Matthew Wilcox M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: drivers/scsi/sym53c8xx_2/ M32R ARCHITECTURE P: Hirokazu Takata - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [302/2many] MAINTAINERS - LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 8ae4d49..0046cbd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2902,6 +2902,7 @@ L:[EMAIL PROTECTED] L: linux-scsi@vger.kernel.org W: http://www.lsilogic.com/support S: Supported +F: drivers/message/fusion/ LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers P: Matthew Wilcox - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [284/2many] MAINTAINERS - LASI 53c700 driver for PARISC
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 5c4d564..f8a3640 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2731,6 +2731,8 @@ P:James E.J. Bottomley M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: Documentation/scsi/53c700.txt +F: drivers/scsi/53c700* LED SUBSYSTEM P: Richard Purdie - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [204/2many] MAINTAINERS - FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 3bea26f..770b0d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1952,6 +1952,8 @@ P:Rik Faith M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Odd fixes (e.g., new signatures) +F: drivers/scsi/fdomain.* +F: drivers/scsi/pcmcia/fdomain_stub.c GDT SCSI DISK ARRAY CONTROLLER DRIVER P: Achim Leubner - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [205/2many] MAINTAINERS - GDT SCSI DISK ARRAY CONTROLLER DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 770b0d8..6597718 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1961,6 +1961,7 @@ M:[EMAIL PROTECTED] L: linux-scsi@vger.kernel.org W: http://www.icp-vortex.com/ S: Supported +F: drivers/scsi/gdt* GENERIC GPIO I2C DRIVER P: Haavard Skinnemoen - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [182/2many] MAINTAINERS - EMULEX LPFC FC SCSI DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index d5bceb3..6da519c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1759,6 +1759,7 @@ M:[EMAIL PROTECTED] L: linux-scsi@vger.kernel.org W: http://sourceforge.net/projects/lpfc S: Supported +F: drivers/scsi/lpfc/ EPSON 1355 FRAMEBUFFER DRIVER P: Christopher Hoover - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [167/2many] MAINTAINERS - EATA ISA/EISA/PCI SCSI DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index a8b11ba..144c052 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1626,6 +1626,7 @@ P:Dario Ballabio M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: drivers/scsi/eata* EATA-PIO SCSI DRIVER P: Michael Neuffer - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [115/2many] MAINTAINERS - BSG (block layer generic sg v4 driver)
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 0ee8069..4ad8cd5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1118,6 +1118,8 @@ P:FUJITA Tomonori M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Supported +F: block/bsg.c +F: include/linux/bsg.h BTTV VIDEO4LINUX DRIVER P: Mauro Carvalho Chehab - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [19/2many] MAINTAINERS - IPS SCSI RAID DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 141b08a..71e09b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -224,6 +224,7 @@ M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org W: http://www.adaptec.com/ S: Maintained +F: drivers/scsi/ips* DPT_I2O SCSI RAID DRIVER P: Adaptec OEM Raid Solutions - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [35/2many] MAINTAINERS - AHA152X SCSI DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index c35092f..b6827c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -343,9 +343,11 @@ F: drivers/char/agp/ AHA152X SCSI DRIVER P: Juergen E. Fischer -M: Juergen Fischer <[EMAIL PROTECTED]> +M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: drivers/scsi/aha152x* +F: drivers/scsi/pcmcia/aha152x* ALCATEL SPEEDTOUCH USB DRIVER P: Duncan Sands - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [21/2many] MAINTAINERS - AACRAID SCSI RAID DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 7d58f6b..1162fb7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -241,6 +241,7 @@ M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org W: http://www.adaptec.com/ S: Supported +F: drivers/scsi/aacraid/ ACPI P: Len Brown - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [20/2many] MAINTAINERS - DPT_I2O SCSI RAID DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 71e09b7..7d58f6b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -232,6 +232,8 @@ M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org W: http://www.adaptec.com/ S: Maintained +F: drivers/scsi/dpt* +F: drivers/scsi/dpt/ AACRAID SCSI RAID DRIVER P: Adaptec OEM Raid Solutions - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] [8/2many] MAINTAINERS - 53C700 AND 53C700-66 SCSI DRIVER
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index 1275844..ad55112 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -133,6 +133,7 @@ P: James E.J. Bottomley M: [EMAIL PROTECTED] L: linux-scsi@vger.kernel.org S: Maintained +F: drivers/scsi/53c700* 6PACK NETWORK DRIVER FOR AX.25 P: Andreas Koensgen - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] qla2xxx: Correct 8GB iIDMA support.
Original implementation manipulated the FC_GS values for
port-speed. Transition the codes to use the driver's own
internal representations as this makes for a reduction in
duplicate 'conversion' codes throughout the driver.
Signed-off-by: Andrew Vasquez <[EMAIL PROTECTED]>
---
drivers/scsi/qla2xxx/qla_def.h |1 -
drivers/scsi/qla2xxx/qla_gs.c | 24 +++-
drivers/scsi/qla2xxx/qla_init.c | 45 +-
3 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 27ae3a5..c196486 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1502,7 +1502,6 @@ typedef struct {
uint8_t node_name[WWN_SIZE];
uint8_t port_name[WWN_SIZE];
uint8_t fabric_port_name[WWN_SIZE];
- uint16_t fp_speeds;
uint16_t fp_speed;
} sw_info_t;
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index b06cbb8..60bf239 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1821,7 +1821,7 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
/* Issue GFPN_ID */
- list[i].fp_speeds = list[i].fp_speed = 0;
+ list[i].fp_speed = PORT_SPEED_UNKNOWN;
/* Prepare common MS IOCB */
ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE,
@@ -1858,9 +1858,21 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
}
rval = QLA_FUNCTION_FAILED;
} else {
- /* Save portname */
- list[i].fp_speeds = ct_rsp->rsp.gpsc.speeds;
- list[i].fp_speed = ct_rsp->rsp.gpsc.speed;
+ /* Save port-speed */
+ switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) {
+ case BIT_15:
+ list[i].fp_speed = PORT_SPEED_1GB;
+ break;
+ case BIT_14:
+ list[i].fp_speed = PORT_SPEED_2GB;
+ break;
+ case BIT_13:
+ list[i].fp_speed = PORT_SPEED_4GB;
+ break;
+ case BIT_11:
+ list[i].fp_speed = PORT_SPEED_8GB;
+ break;
+ }
DEBUG2_3(printk("scsi(%ld): GPSC ext entry - "
"fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x "
@@ -1873,8 +1885,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
list[i].fabric_port_name[5],
list[i].fabric_port_name[6],
list[i].fabric_port_name[7],
- be16_to_cpu(list[i].fp_speeds),
- be16_to_cpu(list[i].fp_speed)));
+ be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
+ be16_to_cpu(ct_rsp->rsp.gpsc.speed)));
}
/* Last device exit. */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8da0586..1a058ec 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2079,17 +2079,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
}
/* Base iIDMA settings on HBA port speed. */
- switch (ha->link_data_rate) {
- case PORT_SPEED_1GB:
- fcport->fp_speed = cpu_to_be16(BIT_15);
- break;
- case PORT_SPEED_2GB:
- fcport->fp_speed = cpu_to_be16(BIT_14);
- break;
- case PORT_SPEED_4GB:
- fcport->fp_speed = cpu_to_be16(BIT_13);
- break;
- }
+ fcport->fp_speed = ha->link_data_rate;
qla2x00_update_fcport(ha, fcport);
@@ -2130,38 +2120,25 @@ static void
qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
{
#define LS_UNKNOWN 2
- static char *link_speeds[5] = { "1", "2", "?", "4" };
+ static char *link_speeds[5] = { "1", "2", "?", "4", "8" };
int rval;
- uint16_t port_speed, mb[6];
+ uint16_t mb[6];
if (!IS_IIDMA_CAPABLE(ha))
return;
- switch (be16_to_cpu(fcport->fp_speed)) {
- case BIT_15:
- port_speed = PORT_SPEED_1GB;
- break;
- case BIT_14:
- port_speed = PORT_SPEED_2GB;
- break;
- case BIT_13:
- port_speed = PORT_SPEED_4GB;
- break;
- default:
+ if (fcport->fp_speed == PORT_SPEED_UNKNOWN) {
DEBUG2(printk("s
[PATCH 5/6] qla2xxx: Correct mailbox register dump for FWI2 capable ISPs.
Signed-off-by: Andrew Vasquez <[EMAIL PROTECTED]>
---
drivers/scsi/qla2xxx/qla_dbg.c | 21 +
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 563d18f..c668034 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -2050,21 +2050,18 @@ qla25xx_fw_dump_failed:
void
qla2x00_dump_regs(scsi_qla_host_t *ha)
{
+ int i;
struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+ struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
+ uint16_t __iomem *mbx_reg;
+
+ mbx_reg = IS_FWI2_CAPABLE(ha) ? ®24->mailbox0:
+ MAILBOX_REG(ha, reg, 0);
printk("Mailbox registers:\n");
- printk("scsi(%ld): mbox 0 0x%04x \n",
- ha->host_no, RD_MAILBOX_REG(ha, reg, 0));
- printk("scsi(%ld): mbox 1 0x%04x \n",
- ha->host_no, RD_MAILBOX_REG(ha, reg, 1));
- printk("scsi(%ld): mbox 2 0x%04x \n",
- ha->host_no, RD_MAILBOX_REG(ha, reg, 2));
- printk("scsi(%ld): mbox 3 0x%04x \n",
- ha->host_no, RD_MAILBOX_REG(ha, reg, 3));
- printk("scsi(%ld): mbox 4 0x%04x \n",
- ha->host_no, RD_MAILBOX_REG(ha, reg, 4));
- printk("scsi(%ld): mbox 5 0x%04x \n",
- ha->host_no, RD_MAILBOX_REG(ha, reg, 5));
+ for (i = 0; i < 6; i++)
+ printk("scsi(%ld): mbox %d 0x%04x \n", ha->host_no, i,
+ RD_REG_WORD(mbx_reg++));
}
--
1.5.3.rc4.41.g7efe
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] qla2xxx: Update version number to 8.02.00-k3.
Signed-off-by: Andrew Vasquez <[EMAIL PROTECTED]> --- drivers/scsi/qla2xxx/qla_version.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index dd1f8ce..18095b9 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h @@ -7,7 +7,7 @@ /* * Driver version */ -#define QLA2XXX_VERSION "8.02.00-k2" +#define QLA2XXX_VERSION "8.02.00-k3" #define QLA_DRIVER_MAJOR_VER 8 #define QLA_DRIVER_MINOR_VER 2 -- 1.5.3.rc4.41.g7efe - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/6] qla2xxx: Don't modify parity bits during ISP25XX restart.
Signed-off-by: Andrew Vasquez <[EMAIL PROTECTED]>
---
drivers/scsi/qla2xxx/qla_init.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 374abe1..8da0586 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3354,7 +3354,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
spin_lock_irqsave(&ha->hardware_lock, flags);
- if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+ if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+ !IS_QLA25XX(ha)) {
/*
* Disable SRAM, Instruction RAM and GP RAM
* parity.
@@ -3370,7 +3371,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
spin_lock_irqsave(&ha->hardware_lock, flags);
- if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+ if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+ !IS_QLA25XX(ha)) {
/* Enable proper parity */
if (IS_QLA2300(ha))
/* SRAM parity */
--
1.5.3.rc4.41.g7efe
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/6] qla2xxx: Correct management-server login-state synchronization issue.
Transitioning link-state via NOS/OLS requires a relogin to a fabric's Management Server. Request relogin when the firmware issues a point-to-point asynchronous event (0x8030). Signed-off-by: Andrew Vasquez <[EMAIL PROTECTED]> --- drivers/scsi/qla2xxx/qla_isr.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 50539da..eecae99 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -490,6 +490,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb) set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags); ha->flags.gpsc_supported = 1; + ha->flags.management_server_logged_in = 0; break; case MBA_CHG_IN_CONNECTION: /* Change in connection mode */ -- 1.5.3.rc4.41.g7efe - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] qla2xxx: Allocate enough space for the full PCI descriptor.
Signed-off-by: Andrew Vasquez <[EMAIL PROTECTED]> --- drivers/scsi/qla2xxx/qla_os.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 93c0c7e..acca898 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1564,7 +1564,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) struct Scsi_Host *host; scsi_qla_host_t *ha; unsigned long flags = 0; - char pci_info[20]; + char pci_info[30]; char fw_str[30]; struct scsi_host_template *sht; -- 1.5.3.rc4.41.g7efe - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/6] qla2xxx: fixes for 2.6.23 [8.02.00-k3].
This patchset contains fixes for 2.6.23. drivers/scsi/qla2xxx/qla_dbg.c | 21 ++ drivers/scsi/qla2xxx/qla_def.h |1 - drivers/scsi/qla2xxx/qla_gs.c | 24 drivers/scsi/qla2xxx/qla_init.c| 51 ++- drivers/scsi/qla2xxx/qla_isr.c |1 + drivers/scsi/qla2xxx/qla_os.c |2 +- drivers/scsi/qla2xxx/qla_version.h |2 +- 7 files changed, 45 insertions(+), 57 deletions(-) here's the commits: - Allocate enough space for the full PCI descriptor. - Don't modify parity bits during ISP25XX restart. - Correct management-server login-state synchronization issue. - Correct 8GB iIDMA support. - Correct mailbox register dump for FWI2 capable ISPs. - Update version number to 8.02.00-k3. Regards, Andrew Vasquez QLogic Corporation - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC][PATCH] fix for async scsi scan sysfs problem (resend)
On Sat, Aug 11, 2007 at 04:04:54PM +0100, Jurij Smakov wrote: > [Please keep me on CC, as I'm not on LKML.] > I've recently got a Sun Blade 1000 box with a QLA2200 controller, and > I'm bumping into exact same problem with 2.6.22: Please try http://marc.info/?l=linux-scsi&m=118289275414202 which fixes a number of problems with the async scanning code. -- "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step." - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Re: cciss: warning: right shift count >= width of type
On 08/12/2007 10:32 PM, James Bottomley wrote:
On Sun, 2007-08-12 at 07:58 +0100, Al Viro wrote:
On Sun, Aug 12, 2007 at 03:21:57AM +0200, Rene Herman wrote:
@@ -2609,13 +2609,13 @@ static void do_cciss_request(request_queue_t *q)
} else {
c->Request.CDBLen = 16;
c->Request.CDB[1]= 0;
- c->Request.CDB[2]= (start_blk >> 56) & 0xff; //MSB
- c->Request.CDB[3]= (start_blk >> 48) & 0xff;
- c->Request.CDB[4]= (start_blk >> 40) & 0xff;
- c->Request.CDB[5]= (start_blk >> 32) & 0xff;
- c->Request.CDB[6]= (start_blk >> 24) & 0xff;
- c->Request.CDB[7]= (start_blk >> 16) & 0xff;
- c->Request.CDB[8]= (start_blk >> 8) & 0xff;
+ c->Request.CDB[2]= ((u64)start_blk >> 56) & 0xff; //MSB
+ c->Request.CDB[3]= ((u64)start_blk >> 48) & 0xff;
+ c->Request.CDB[4]= ((u64)start_blk >> 40) & 0xff;
+ c->Request.CDB[5]= ((u64)start_blk >> 32) & 0xff;
+ c->Request.CDB[6]= ((u64)start_blk >> 24) & 0xff;
+ c->Request.CDB[7]= ((u64)start_blk >> 16) & 0xff;
+ c->Request.CDB[8]= ((u64)start_blk >> 8) & 0xff;
put_unaligned(cpu_to_be64(start_blk), &c->Request.CDB[2]);
which is what's happening here anyway.
Well ... this was debated a while ago ad nauseam:
http://marc.info/?t=117699555300010
The main objection to what you propose is that it forces the u64
coercion even in the 32 bit start_blk case. The preferred solution as a
result of that debate was simply to us a macro Andrew introduced:
upper_32_bits()
Which will silently replace zero in the non LBD case. I actually
thought this had already been done.
I see. Will assume it's somewhere in the pipeline.
Rene.
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6][RESEND] Emulex FC HBA driver: fix overflow of statically allocated array
(previously send on 09-Aug-2007 20:47)
Hi,
The Coverity checker noticed that we may overrun a statically allocated
array in drivers/scsi/lpfc/lpfc_sli.c::lpfc_sli_hbqbuf_find().
The case is this; In 'struct lpfc_hba' we have
#define LPFC_MAX_HBQS 4
...
struct lpfc_hba {
...
struct hbq_s hbqs[LPFC_MAX_HBQS];
...
};
But then in lpfc_sli_hbqbuf_find() we have this code
hbqno = tag >> 16;
if (hbqno > LPFC_MAX_HBQS)
return NULL;
if 'hbqno' ends up as exactely 4, then we won't return, and then this
list_for_each_entry(d_buf, &phba->hbqs[hbqno].hbq_buffer_list, list) {
will cause an overflow of the statically allocated array at index 4,
since the valid indices are only 0-3.
I propose this patch, that simply changes the 'hbqno > LPFC_MAX_HBQS'
into 'hbqno >= LPFC_MAX_HBQS' as a possible fix.
Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>
Acked-by: James Smart <[EMAIL PROTECTED]>
---
drivers/scsi/lpfc/lpfc_sli.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index ce5ff2b..e5337ad 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -675,7 +675,7 @@ lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag)
uint32_t hbqno;
hbqno = tag >> 16;
- if (hbqno > LPFC_MAX_HBQS)
+ if (hbqno >= LPFC_MAX_HBQS)
return NULL;
list_for_each_entry(d_buf, &phba->hbqs[hbqno].hbq_buffer_list, list) {
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Re: cciss: warning: right shift count >= width of type
On Sun, 2007-08-12 at 07:58 +0100, Al Viro wrote:
> On Sun, Aug 12, 2007 at 03:21:57AM +0200, Rene Herman wrote:
> > @@ -2609,13 +2609,13 @@ static void do_cciss_request(request_queue_t *q)
> > } else {
> > c->Request.CDBLen = 16;
> > c->Request.CDB[1]= 0;
> > - c->Request.CDB[2]= (start_blk >> 56) & 0xff;//MSB
> > - c->Request.CDB[3]= (start_blk >> 48) & 0xff;
> > - c->Request.CDB[4]= (start_blk >> 40) & 0xff;
> > - c->Request.CDB[5]= (start_blk >> 32) & 0xff;
> > - c->Request.CDB[6]= (start_blk >> 24) & 0xff;
> > - c->Request.CDB[7]= (start_blk >> 16) & 0xff;
> > - c->Request.CDB[8]= (start_blk >> 8) & 0xff;
> > + c->Request.CDB[2]= ((u64)start_blk >> 56) & 0xff;
> > //MSB
> > + c->Request.CDB[3]= ((u64)start_blk >> 48) & 0xff;
> > + c->Request.CDB[4]= ((u64)start_blk >> 40) & 0xff;
> > + c->Request.CDB[5]= ((u64)start_blk >> 32) & 0xff;
> > + c->Request.CDB[6]= ((u64)start_blk >> 24) & 0xff;
> > + c->Request.CDB[7]= ((u64)start_blk >> 16) & 0xff;
> > + c->Request.CDB[8]= ((u64)start_blk >> 8) & 0xff;
>
> put_unaligned(cpu_to_be64(start_blk), &c->Request.CDB[2]);
>
> which is what's happening here anyway.
Well ... this was debated a while ago ad nauseam:
http://marc.info/?t=117699555300010
The main objection to what you propose is that it forces the u64
coercion even in the 32 bit start_blk case. The preferred solution as a
result of that debate was simply to us a macro Andrew introduced:
upper_32_bits()
Which will silently replace zero in the non LBD case. I actually
thought this had already been done.
James
James
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Re: cciss: warning: right shift count >= width of type
On 08/12/2007 08:58 AM, Al Viro wrote:
On Sun, Aug 12, 2007 at 03:21:57AM +0200, Rene Herman wrote:
+ c->Request.CDB[2]= ((u64)start_blk >> 56) & 0xff; //MSB
+ c->Request.CDB[3]= ((u64)start_blk >> 48) & 0xff;
+ c->Request.CDB[4]= ((u64)start_blk >> 40) & 0xff;
+ c->Request.CDB[5]= ((u64)start_blk >> 32) & 0xff;
+ c->Request.CDB[6]= ((u64)start_blk >> 24) & 0xff;
+ c->Request.CDB[7]= ((u64)start_blk >> 16) & 0xff;
+ c->Request.CDB[8]= ((u64)start_blk >> 8) & 0xff;
put_unaligned(cpu_to_be64(start_blk), &c->Request.CDB[2]);
which is what's happening here anyway.
Well, yes. There are a few more of these in the driver and this wants a
maintainer (whom I can't reach @hp.com) comment.
Is that 16-bit one for CCISS_READ_10 really right? Either:
put_unaligned(cpu_to_be32(creq->nr_sectors), &c->Request.CDB[6]);
or possibly:
put_unaligned(cpu_to_be16(creq->nr_sectors), &c->Request.CDB[8]);
would look less surprising than the current 16-bit in 24-bit thing and the
"sect >> 24" comment there seems to imply the first?
(the implcit downcasting in that case is fine, right?)
Rene.
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 5acc6c4..9fb6b3c 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1711,10 +1712,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int
ctlr, void *buff, size_
c->Request.Type.Direction = XFER_READ;
c->Request.Timeout = 0;
c->Request.CDB[0] = cmd;
- c->Request.CDB[6] = (size >> 24) & 0xFF;//MSB
- c->Request.CDB[7] = (size >> 16) & 0xFF;
- c->Request.CDB[8] = (size >> 8) & 0xFF;
- c->Request.CDB[9] = size & 0xFF;
+ put_unaligned(cpu_to_be32(size), &c->Request.CDB[6]);
break;
case CCISS_READ_CAPACITY:
@@ -1735,12 +1733,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int
ctlr, void *buff, size_
c->Request.Timeout = 0;
c->Request.CDB[0] = cmd;
c->Request.CDB[1] = 0x10;
- c->Request.CDB[10] = (size >> 24) & 0xFF;
- c->Request.CDB[11] = (size >> 16) & 0xFF;
- c->Request.CDB[12] = (size >> 8) & 0xFF;
- c->Request.CDB[13] = size & 0xFF;
- c->Request.Timeout = 0;
- c->Request.CDB[0] = cmd;
+ put_unaligned(cpu_to_be32(size), &c->Request.CDB[10]);
break;
case CCISS_CACHE_FLUSH:
c->Request.CDBLen = 12;
@@ -2598,29 +2591,15 @@ static void do_cciss_request(request_queue_t *q)
if (likely(blk_fs_request(creq))) {
if(h->cciss_read == CCISS_READ_10) {
c->Request.CDB[1] = 0;
- c->Request.CDB[2] = (start_blk >> 24) & 0xff; //MSB
- c->Request.CDB[3] = (start_blk >> 16) & 0xff;
- c->Request.CDB[4] = (start_blk >> 8) & 0xff;
- c->Request.CDB[5] = start_blk & 0xff;
- c->Request.CDB[6] = 0; // (sect >> 24) & 0xff; MSB
- c->Request.CDB[7] = (creq->nr_sectors >> 8) & 0xff;
- c->Request.CDB[8] = creq->nr_sectors & 0xff;
+ put_unaligned(cpu_to_be32(start_blk),
&c->Request.CDB[2]);
+ c->Request.CDB[6] = 0;
+ put_unaligned(cpu_to_be16(creq->nr_sectors),
&c->Request.CDB[7]);
c->Request.CDB[9] = c->Request.CDB[11] =
c->Request.CDB[12] = 0;
} else {
c->Request.CDBLen = 16;
c->Request.CDB[1]= 0;
- c->Request.CDB[2]= (start_blk >> 56) & 0xff;//MSB
- c->Request.CDB[3]= (start_blk >> 48) & 0xff;
- c->Request.CDB[4]= (start_blk >> 40) & 0xff;
- c->Request.CDB[5]= (start_blk >> 32) & 0xff;
- c->Request.CDB[6]= (start_blk >> 24) & 0xff;
- c->Request.CDB[7]= (start_blk >> 16) & 0xff;
- c->Request.CDB[8]= (start_blk >> 8) & 0xff;
- c->Request.CDB[9]= start_blk & 0xff;
- c->Request.CDB[10]= (creq->nr_sectors >> 24) & 0xff;
- c->Request.CDB[11]= (creq->nr_sectors >> 16) & 0xff;
- c->Request.CDB[12]= (creq->nr_sectors >> 8) & 0xff;
- c->Request.CDB[13]= creq->nr_sectors & 0xff;
+
Re: Build failure in advansys driver - error: implicit declaration of function 'to_pci_dev'
On 12/08/07, Matthew Wilcox <[EMAIL PROTECTED]> wrote: > On Sun, Aug 12, 2007 at 01:43:16AM +0200, Jesper Juhl wrote: > > Trying to build current Linus git tree (head at > > ac07860264bd2b18834d3fa3be47032115524cea) using the attached config > > file (generated by 'make randconfig') the build fails for me with : > > > > ... > > CC drivers/scsi/advansys.o > > drivers/scsi/advansys.c:794:2: warning: #warning this driver is still not > > properly converted to the DMA API > > drivers/scsi/advansys.c: In function 'advansys_board_found': > > drivers/scsi/advansys.c:17781: error: implicit declaration of function > > 'to_pci_dev' > > I'm sorry that linux-scsi is a write-only list for you, but this error > has been reported at least twice already, and a more polite response was > received by each of those reporters. > I know I should have searched the archives, but it was late at night and I just wanted to get the problem reported so I didn't forget about it, so I didn't. Better it gets reported a few times than not at all... Next time I'll just leave it for the next day to do the archive search and hope I don't forget about it. -- Jesper Juhl <[EMAIL PROTECTED]> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH] microtek: convert to use the data buffer accessors
On Mon, 2007-08-13 at 00:12 +0900, FUJITA Tomonori wrote: > Oops, I didn't realized that. Isn't the patch in scsi-misc, > scsi-pending, or scsi-fixes? No ... I forgot ... after Greg told me to take it through my tree ... I'll add it. James - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: 2.6.23-rc2-mm2
Andrew Morton wrote: > On Fri, 10 Aug 2007 14:35:01 +0200 Gabriel C <[EMAIL PROTECTED]> wrote: > >> In file included from include/linux/blkdev.h:17, >> from kernel/sched.c:45: >> include/linux/bsg.h:67: warning: 'struct request_queue' declared inside >> parameter list >> include/linux/bsg.h:67: warning: its scope is only this definition or >> declaration, which is probably not what you want >> include/linux/bsg.h:71: warning: 'struct request_queue' declared inside >> parameter list > > Thanks, I'll fix that up. > I just realized this problem exists in mainline too , introduced by this commit : http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a4ee0df8b3d007f0d685d38a56dc0b91e01aaaf7;hp=2cd614c8732172524c36cd5245620338928062b6 - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH] microtek: convert to use the data buffer accessors
On Sun, 12 Aug 2007 11:01:20 -0400 "Harrosh, Boaz" <[EMAIL PROTECTED]> wrote: > FUJITA Tomonori wrote ... > > Subject: [PATCH] microtek: convert to use the data buffer accessors > > > > - remove the unnecessary map_single path. > > > > - convert to use the new accessors for the sg lists and the > > parameters. > > > > TODO: sg chaining support > > > > Signed-off-by: FUJITA Tomonori <[EMAIL PROTECTED]> > > Is this not the same as the patch I sent at 2007-07-12 > http://marc.info/?l=linux-scsi&m=118424592500438&w=4 > > And was ACKed by one of the maintainers: > http://marc.info/?l=linux-scsi&m=118426360825803&w=4 > Oops, I didn't realized that. Isn't the patch in scsi-misc, scsi-pending, or scsi-fixes? - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH] microtek: convert to use the data buffer accessors
FUJITA Tomonori wrote ... > Subject: [PATCH] microtek: convert to use the data buffer accessors > > - remove the unnecessary map_single path. > > - convert to use the new accessors for the sg lists and the > parameters. > > TODO: sg chaining support > > Signed-off-by: FUJITA Tomonori <[EMAIL PROTECTED]> Is this not the same as the patch I sent at 2007-07-12 http://marc.info/?l=linux-scsi&m=118424592500438&w=4 And was ACKed by one of the maintainers: http://marc.info/?l=linux-scsi&m=118426360825803&w=4 Boaz - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Build failure in advansys driver - error: implicit declaration of function 'to_pci_dev'
On Sun, Aug 12, 2007 at 01:43:16AM +0200, Jesper Juhl wrote: > Trying to build current Linus git tree (head at > ac07860264bd2b18834d3fa3be47032115524cea) using the attached config > file (generated by 'make randconfig') the build fails for me with : > > ... > CC drivers/scsi/advansys.o > drivers/scsi/advansys.c:794:2: warning: #warning this driver is still not > properly converted to the DMA API > drivers/scsi/advansys.c: In function 'advansys_board_found': > drivers/scsi/advansys.c:17781: error: implicit declaration of function > 'to_pci_dev' I'm sorry that linux-scsi is a write-only list for you, but this error has been reported at least twice already, and a more polite response was received by each of those reporters. -- "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step." - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[patch 08/10] m68k: Fix a few hickups in drivers/scsi/Kconfig
m68k: Fix a few hickups in drivers/scsi/Kconfig
Signed-off-by: Geert Uytterhoeven <[EMAIL PROTECTED]>
---
drivers/scsi/Kconfig |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1561,7 +1561,7 @@ config A3000_SCSI
built-in SCSI controller, say Y. Otherwise, say N.
To compile this driver as a module, choose M here: the
- module will be called wd33c93.
+ module will be called a3000.
config A2091_SCSI
tristate "A2091/A590 WD33C93A support"
@@ -1571,7 +1571,7 @@ config A2091_SCSI
say N.
To compile this driver as a module, choose M here: the
- module will be called wd33c93.
+ module will be called a2091.
config GVP11_SCSI
tristate "GVP Series II WD33C93A support"
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] microtek: convert to use the data buffer accessors
The patch is only compile tested.
---
>From d5ad824bce0e5e3894a102fee74f1f7c36d639b7 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <[EMAIL PROTECTED]>
Date: Sun, 12 Aug 2007 15:33:23 +0900
Subject: [PATCH] microtek: convert to use the data buffer accessors
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the
parameters.
TODO: sg chaining support
Signed-off-by: FUJITA Tomonori <[EMAIL PROTECTED]>
---
drivers/usb/image/microtek.c | 32 +---
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 768b2c1..59b57c3 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -446,7 +446,8 @@ static void mts_data_done( struct urb* transfer )
MTS_INT_INIT();
if ( context->data_length != transfer->actual_length ) {
- context->srb->resid = context->data_length -
transfer->actual_length;
+ scsi_set_resid(context->srb,
+ context->data_length - transfer->actual_length);
} else if ( unlikely(status) ) {
context->srb->result = (status == -ENOENT ? DID_ABORT :
DID_ERROR)<<16;
}
@@ -490,7 +491,7 @@ static void mts_command_done( struct urb *transfer )
context->data_pipe,
context->data,
context->data_length,
- context->srb->use_sg > 1 ? mts_do_sg
: mts_data_done);
+ scsi_sg_count(context->srb) > 1 ?
mts_do_sg : mts_data_done);
} else {
mts_get_status(transfer);
}
@@ -505,21 +506,22 @@ static void mts_do_sg (struct urb* transfer)
int status = transfer->status;
MTS_INT_INIT();
- MTS_DEBUG("Processing fragment %d of %d\n",
context->fragment,context->srb->use_sg);
+ MTS_DEBUG("Processing fragment %d of %d\n", context->fragment,
+ scsi_sg_count(context->srb));
if (unlikely(status)) {
context->srb->result = (status == -ENOENT ? DID_ABORT :
DID_ERROR)<<16;
mts_transfer_cleanup(transfer);
}
- sg = context->srb->request_buffer;
+ sg = scsi_sglist(context->srb);
context->fragment++;
mts_int_submit_urb(transfer,
context->data_pipe,
page_address(sg[context->fragment].page) +
sg[context->fragment].offset,
sg[context->fragment].length,
- context->fragment + 1 == context->srb->use_sg ?
mts_data_done : mts_do_sg);
+ context->fragment + 1 == scsi_sg_count(context->srb)
? mts_data_done : mts_do_sg);
return;
}
@@ -547,25 +549,17 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct
mts_desc* desc)
desc->context.srb = srb;
desc->context.fragment = 0;
- if (!srb->use_sg) {
- if ( !srb->request_bufflen ){
- desc->context.data = NULL;
- desc->context.data_length = 0;
- return;
- } else {
- desc->context.data = srb->request_buffer;
- desc->context.data_length = srb->request_bufflen;
- MTS_DEBUG("length = %d or %d\n",
- srb->request_bufflen, srb->bufflen);
- }
- } else {
+ if (scsi_sg_count(srb)) {
MTS_DEBUG("Using scatter/gather\n");
- sg = srb->request_buffer;
+ sg = scsi_sglist(srb);
desc->context.data = page_address(sg[0].page) + sg[0].offset;
desc->context.data_length = sg[0].length;
+ } else {
+ desc->context.data = NULL;
+ desc->context.data_length = 0;
+ return;
}
-
/* can't rely on srb->sc_data_direction */
/* Brutally ripped from usb-storage */
--
1.5.2.4
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
