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

Commit 2837461d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "This is a set of minor (and safe changes) that didn't make the initial
  pull request plus some bug fixes"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Mask off Scope bits in retry delay
  scsi: qla2xxx: Fix crash on qla2x00_mailbox_command
  scsi: aic7xxx: aic79xx: fix potential null pointer dereference on ahd
  scsi: mpt3sas: Add an I/O barrier
  scsi: qla2xxx: Fix setting lower transfer speed if GPSC fails
  scsi: hpsa: disable device during shutdown
  scsi: sd_zbc: Fix sd_zbc_check_zone_size() error path
  scsi: aacraid: remove bogus GFP_DMA32 specifies
parents f3b5020e 3cedc879

drivers/scsi/aacraid/commctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -8871,7 +8871,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;
@@ -8886,6 +8886,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;
@@ -8929,7 +8935,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
Original line number Diff line number Diff line
@@ -3348,6 +3348,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
Original line number Diff line number Diff line
@@ -5009,7 +5009,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,