SCSI fixes for 4.1-rc4
Subsystems (4)
James Bottomley
maintainerThis is a set of five fixes: Two MAINTAINER email updates (urgent because the non-avagotech emails will start bouncing) an lpfc big endian oops fix, a 256 byte sector hang fix (to eliminate 256 byte sectors) and a storvsc fix which could cause test unit ready failures on bringup.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Alexey Kardashevskiy (1):
lpfc: Fix breakage on big endian kernels
James Smart (1):
MAINTAINERS: Revise lpfc maintainers for Avago Technologies ownership of Emulex
K. Y. Srinivasan (1):
storvsc: Set the SRB flags correctly when no data transfer is needed
Mark Hounschell (1):
sd: Disable support for 256 byte/sector disks
Minh Tran (1):
MAINTAINERS, be2iscsi: change email domain
And the diffstat:
MAINTAINERS | 13 ++++++++----- drivers/scsi/be2iscsi/be.h | 6 +++--- drivers/scsi/be2iscsi/be_cmds.c | 6 +++--- drivers/scsi/be2iscsi/be_cmds.h | 6 +++--- drivers/scsi/be2iscsi/be_iscsi.c | 8 ++++---- drivers/scsi/be2iscsi/be_iscsi.h | 8 ++++---- drivers/scsi/be2iscsi/be_main.c | 12 ++++++------ drivers/scsi/be2iscsi/be_main.h | 10 +++++----- drivers/scsi/be2iscsi/be_mgmt.c | 8 ++++---- drivers/scsi/be2iscsi/be_mgmt.h | 8 ++++---- drivers/scsi/lpfc/lpfc_scsi.c | 41 ++++++++++++++++++++-------------------- drivers/scsi/sd.c | 19 +++++-------------- drivers/scsi/storvsc_drv.c | 3 +-- 13 files changed, 71 insertions(+), 77 deletions(-)
With full diff below.
James
---
MAINTAINERS +8 -5
@@ -3803,10 +3803,11 @@ M: David Woodhouse <[email protected]> L: [email protected] S: Maintained -EMULEX LPFC FC SCSI DRIVER -M: James Smart <[email protected]> +EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER +M: James Smart <[email protected]> +M: Dick Kennedy <[email protected]> L: [email protected] -W: http://sourceforge.net/projects/lpfcxxxx +W: http://www.avagotech.com S: Supported F: drivers/scsi/lpfc/
@@ -8794,9 +8795,11 @@ F: drivers/misc/phantom.c F: include/uapi/linux/phantom.h SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER -M: Jayamohan Kallickal <[email protected]> +M: Jayamohan Kallickal <[email protected]> +M: Minh Tran <[email protected]> +M: John Soni Jose <[email protected]> L: [email protected] -W: http://www.emulex.com +W: http://www.avagotech.com S: Supported F: drivers/scsi/be2iscsi/
drivers/scsi/be2iscsi/be.h +3 -3
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -8,9 +8,9 @@* Public License is included in this distribution in the file called COPYING. * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/be2iscsi/be_cmds.c +3 -3
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -8,9 +8,9 @@* Public License is included in this distribution in the file called COPYING. * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/be2iscsi/be_cmds.h +3 -3
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -8,9 +8,9 @@* Public License is included in this distribution in the file called COPYING. * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/be2iscsi/be_iscsi.c +4 -4
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@* as published by the Free Software Foundation. The full GNU General * Public License is included in this distribution in the file called COPYING. * -* Written by: Jayamohan Kallickal ([email protected]) +* Written by: Jayamohan Kallickal ([email protected]) * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/be2iscsi/be_iscsi.h +4 -4
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@* as published by the Free Software Foundation. The full GNU General * Public License is included in this distribution in the file called COPYING. * -* Written by: Jayamohan Kallickal ([email protected]) +* Written by: Jayamohan Kallickal ([email protected]) * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/be2iscsi/be_main.c +6 -6
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@* as published by the Free Software Foundation. The full GNU General * Public License is included in this distribution in the file called COPYING. * -* Written by: Jayamohan Kallickal ([email protected]) +* Written by: Jayamohan Kallickal ([email protected]) * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
@@ -50,7 +50,7 @@ static unsigned int enable_msix = 1;MODULE_DESCRIPTION (DRV_DESC " " BUILD_STR );MODULE_VERSION (BUILD_STR ); -MODULE_AUTHOR ("Emulex Corporation" ); +MODULE_AUTHOR ("Avago Technologies" );MODULE_LICENSE ("GPL" );module_param (be_iopoll_budget, int,0 );module_param (enable_msix, int,0 );
@@ -552,7 +552,7 @@ MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table);static struct scsi_host_template beiscsi_sht = { .module =THIS_MODULE , - .name ="Emulex 10Gbe open-iscsi Initiator Driver" , + .name ="Avago Technologies 10Gbe open-iscsi Initiator Driver" , .proc_name =DRV_NAME , .queuecommand = iscsi_queuecommand, .change_queue_depth = scsi_change_queue_depth,
drivers/scsi/be2iscsi/be_main.h +5 -5
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@* as published by the Free Software Foundation. The full GNU General * Public License is included in this distribution in the file called COPYING. * -* Written by: Jayamohan Kallickal ([email protected]) +* Written by: Jayamohan Kallickal ([email protected]) * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
@@ -37,7 +37,7 @@#define DRV_NAME "be2iscsi"#define BUILD_STR "10.4.114.0" -#define BE_NAME "Emulex OneConnect" \ +#define BE_NAME "Avago Technologies OneConnect" \ "Open-iSCSI Driver version" BUILD_STR#define DRV_DESC BE_NAME " " "Driver"
drivers/scsi/be2iscsi/be_mgmt.c +4 -4
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@* as published by the Free Software Foundation. The full GNU General * Public License is included in this distribution in the file called COPYING. * -* Written by: Jayamohan Kallickal ([email protected]) +* Written by: Jayamohan Kallickal ([email protected]) * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/be2iscsi/be_mgmt.h +4 -4
@@ -1,5 +1,5 @@/** -* Copyright (C) 2005 - 2014 Emulex +* Copyright (C) 2005 - 2015 Avago Technologies * All rights reserved. * * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@* as published by the Free Software Foundation. The full GNU General * Public License is included in this distribution in the file called COPYING. * -* Written by: Jayamohan Kallickal ([email protected]) +* Written by: Jayamohan Kallickal ([email protected]) * * Contact Information: -* [email protected] +* [email protected] * -* Emulex +* Avago Technologies * 3333 Susan Street * Costa Mesa, CA 92626 */
drivers/scsi/lpfc/lpfc_scsi.c +21 -20
65 lines not on this page · raw message
drivers/scsi/sd.c +5 -14
@@ -1600,6 +1600,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd) {u64 start_lba =blk_rq_pos (scmd->request);u64 end_lba =blk_rq_pos (scmd->request) + (scsi_bufflen (scmd) /512 ); +u64 factor = scmd->device->sector_size /512 ;u64 bad_lba;int info_valid;/*
@@ -1621,16 +1622,9 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)if (scsi_bufflen (scmd) <= scmd->device->sector_size)return 0 ; -if (scmd->device->sector_size <512 ) { -/* only legitimate sector_size here is 256 */ - start_lba <<=1 ; - end_lba <<=1 ; - }else { -/* be careful ... don't want any overflows */ -unsigned int factor = scmd->device->sector_size /512 ; -do_div (start_lba, factor); -do_div (end_lba, factor); - } +/* be careful ... don't want any overflows */ +do_div (start_lba, factor); +do_div (end_lba, factor);/* The bad lba was reported incorrectly, we have no idea where * the error is.
@@ -2188,8 +2182,7 @@ got_data:if (sector_size !=512 && sector_size !=1024 && sector_size !=2048 && - sector_size !=4096 && - sector_size !=256 ) { + sector_size !=4096 ) {sd_printk (KERN_NOTICE , sdkp,"Unsupported sector size %d.\n" , sector_size);/*
@@ -2244,8 +2237,6 @@ got_data: sdkp->capacity <<=2 ; else if (sector_size == 1024) sdkp->capacity <<= 1; - else if (sector_size == 256) - sdkp->capacity >>= 1; blk_queue_physical_block_size(sdp->request_queue, sdkp->physical_block_size);
drivers/scsi/storvsc_drv.c +1 -2
@@ -1600,8 +1600,7 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)break ;default : vm_srb->data_in =UNKNOWN_TYPE ; - vm_srb->win8_extension.srb_flags |= (SRB_FLAGS_DATA_IN | -SRB_FLAGS_DATA_OUT ); + vm_srb->win8_extension.srb_flags |=SRB_FLAGS_NO_DATA_TRANSFER ;break ; }