final round of SCSI updates for the 4.17+ merge window
Subsystems (6)
James Bottomley
maintainerThis is a set of minor (and safe changes) that didn't make the initial pull request plus some bug fixes.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Anil Gurumurthy (1):
scsi: qla2xxx: Mask off Scope bits in retry delay
Christoph Hellwig (1):
scsi: aacraid: remove bogus GFP_DMA32 specifies
Colin Ian King (1):
scsi: aic7xxx: aic79xx: fix potential null pointer dereference on ahd
Damien Le Moal (1):
scsi: sd_zbc: Fix sd_zbc_check_zone_size() error path
Himanshu Madhani (1):
scsi: qla2xxx: Fix setting lower transfer speed if GPSC fails
Rodrigo R. Galvao (1):
scsi: qla2xxx: Fix crash on qla2x00_mailbox_command
Sinan Kaya (1):
scsi: hpsa: disable device during shutdown
Tomas Henzl (1):
scsi: mpt3sas: Add an I/O barrier
And the diffstat:
drivers/scsi/aacraid/commctrl.c | 4 ++-- drivers/scsi/aic7xxx/aic79xx_core.c | 8 ++++---- drivers/scsi/hpsa.c | 10 ++++++++-- drivers/scsi/mpt3sas/mpt3sas_base.c | 1 + drivers/scsi/qla2xxx/qla_init.c | 3 ++- drivers/scsi/qla2xxx/qla_isr.c | 8 ++++++-- drivers/scsi/qla2xxx/qla_mbx.c | 8 ++++++++ drivers/scsi/sd_zbc.c | 2 +- 8 files changed, 32 insertions(+), 12 deletions(-)
With full diff below.
James
---
drivers/scsi/aacraid/commctrl.c +2 -2
@@ -845,7 +845,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) rcode = -EINVAL ; goto cleanup; } - p =kmalloc (sg_count[i],GFP_KERNEL |GFP_DMA32 ); + p =kmalloc (sg_count[i],GFP_KERNEL );if (!p) {dprintk ((KERN_DEBUG "aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n" , sg_count[i], i, usg->count));
@@ -886,7 +886,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) rcode = -EINVAL ; goto cleanup; } - p =kmalloc (sg_count[i],GFP_KERNEL |GFP_DMA32 ); + p =kmalloc (sg_count[i],GFP_KERNEL );if (!p) {dprintk ((KERN_DEBUG "aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n" , sg_count[i], i, upsg->count));
drivers/scsi/aic7xxx/aic79xx_core.c +4 -4
@@ -6112,10 +6112,6 @@ ahd_alloc(void *platform_arg, char *name) ahd->int_coalescing_stop_threshold =AHD_INT_COALESCING_STOP_THRESHOLD_DEFAULT ; -if (ahd_platform_alloc (ahd, platform_arg) !=0 ) { -ahd_free (ahd); - ahd =NULL ; - }#ifdef AHD_DEBUG if ((ahd_debug &AHD_SHOW_MEMORY ) !=0 ) { printk("%s: scb size = 0x%x, hscb size = 0x%x\n",
@@ -6123,6 +6119,10 @@ ahd_alloc(void *platform_arg, char *name) (u_int)sizeof(struct hardware_scb)); }#endif +if (ahd_platform_alloc (ahd, platform_arg) !=0 ) { +ahd_free (ahd); + ahd =NULL ; + }return (ahd); }
drivers/scsi/hpsa.c +8 -2
@@ -8869,7 +8869,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h)kfree (options); } -static void hpsa_shutdown (struct pci_dev *pdev) +static void __hpsa_shutdown (struct pci_dev *pdev) {struct ctlr_info *h;
@@ -8884,6 +8884,12 @@ static void hpsa_shutdown(struct pci_dev *pdev)hpsa_disable_interrupt_mode (h);/* pci_init 2 */ } +static void hpsa_shutdown (struct pci_dev *pdev) +{ +__hpsa_shutdown (pdev); +pci_disable_device (pdev); +} +static void hpsa_free_device_info (struct ctlr_info *h) {int i;
@@ -8927,7 +8933,7 @@ static void hpsa_remove_one(struct pci_dev *pdev)scsi_remove_host (h->scsi_host);/* init_one 8 */ /* includes hpsa_free_irqs - init_one 4 */ /* includes hpsa_disable_interrupt_mode - pci_init 2 */ -hpsa_shutdown (pdev); +__hpsa_shutdown (pdev);hpsa_free_device_info (h);/* scan */
drivers/scsi/mpt3sas/mpt3sas_base.c +1 -0
@@ -3344,6 +3344,7 @@ _base_mpi_ep_writeq(__u64 b, volatile void __iomem *addr,spin_lock_irqsave (writeq_lock, flags);writel ((u32)(data_out), addr);writel ((u32)(data_out >>32 ), (addr +4 )); +mmiowb ();spin_unlock_irqrestore (writeq_lock, flags); }
drivers/scsi/qla2xxx/qla_init.c +2 -1
@@ -5037,7 +5037,8 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)return ;if (fcport->fp_speed ==PORT_SPEED_UNKNOWN || - fcport->fp_speed > ha->link_data_rate) + fcport->fp_speed > ha->link_data_rate || + !ha->flags.gpsc_supported)return ; rval = qla2x00_set_idma_speed(vha, fcport->loop_id, fcport->fp_speed,
drivers/scsi/qla2xxx/qla_isr.c +6 -2
@@ -2494,8 +2494,12 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) ox_id =le16_to_cpu (sts24->ox_id); par_sense_len =sizeof (sts24->data);/* Valid values of the retry delay timer are 0x1-0xffef */ -if (sts24->retry_delay >0 && sts24->retry_delay <0xfff1 ) - retry_delay = sts24->retry_delay; +if (sts24->retry_delay >0 && sts24->retry_delay <0xfff1 ) { + retry_delay = sts24->retry_delay &0x3fff ; +ql_dbg (ql_dbg_io, sp->vha,0x3033 , +"%s: scope=%#x retry_delay=%#x\n" , __func__, + sts24->retry_delay >>14 , retry_delay); + } }else {if (scsi_status &SS_SENSE_LEN_VALID ) sense_len =le16_to_cpu (sts->req_sense_length);
drivers/scsi/qla2xxx/qla_mbx.c +8 -0
@@ -292,6 +292,14 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if (time_after (jiffies, wait_time))break ; +/* +* Check if it's UNLOADING, cause we cannot poll in +* this case, or else a NULL pointer dereference +* is triggered. +*/ +if (unlikely (test_bit (UNLOADING , &base_vha->dpc_flags))) +return QLA_FUNCTION_TIMEOUT ; +/* Check for pending interrupts. */ qla2x00_poll (ha->rsp_q_map[0 ]);
drivers/scsi/sd_zbc.c +1 -1
@@ -452,7 +452,7 @@ static s64 sd_zbc_check_zone_size(struct scsi_disk *sdkp) }else if (this_zone_blocks != zone_blocks && (block + this_zone_blocks < sdkp->capacity || this_zone_blocks > zone_blocks)) { - this_zone_blocks =0 ; + zone_blocks =0 ; goto out; } block += this_zone_blocks;