Commit 0b320c86 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:
 "Three obvious driver fixes and two core fixes.

  The two core fixes are to disable Command Duration Limits by default
  to fix an inconsistency in SATA and some USB devices. The other is to
  change the default read size for block zero to follow the device
  preference (some USB bridges preferring 16 byte commands don't have a
  translation for READ(10) and thus don't scan properly)"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: mpi3mr: Fix ATA NCQ priority support
  scsi: ufs: core: Quiesce request queues before checking pending cmds
  scsi: core: Disable CDL by default
  scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory
  scsi: sd: Use READ(16) when reading block zero on large capacity disks
parents 11100273 90e6f089

drivers/scsi/mpi3mr/mpi3mr_app.c

+62 −0
Original line number Diff line number Diff line
@@ -2163,10 +2163,72 @@ persistent_id_show(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR_RO(persistent_id);



/**

 * sas_ncq_prio_supported_show - Indicate if device supports NCQ priority

 * @dev: pointer to embedded device

 * @attr: sas_ncq_prio_supported attribute descriptor

 * @buf: the buffer returned

 *

 * A sysfs 'read-only' sdev attribute, only works with SATA devices

 */

static ssize_t

sas_ncq_prio_supported_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	struct scsi_device *sdev = to_scsi_device(dev);



	return sysfs_emit(buf, "%d\n", sas_ata_ncq_prio_supported(sdev));

}

static DEVICE_ATTR_RO(sas_ncq_prio_supported);



/**

 * sas_ncq_prio_enable_show - send prioritized io commands to device

 * @dev: pointer to embedded device

 * @attr: sas_ncq_prio_enable attribute descriptor

 * @buf: the buffer returned

 *

 * A sysfs 'read/write' sdev attribute, only works with SATA devices

 */

static ssize_t

sas_ncq_prio_enable_show(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct mpi3mr_sdev_priv_data *sdev_priv_data =  sdev->hostdata;



	if (!sdev_priv_data)

		return 0;



	return sysfs_emit(buf, "%d\n", sdev_priv_data->ncq_prio_enable);

}



static ssize_t

sas_ncq_prio_enable_store(struct device *dev,

				  struct device_attribute *attr,

				  const char *buf, size_t count)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct mpi3mr_sdev_priv_data *sdev_priv_data =  sdev->hostdata;

	bool ncq_prio_enable = 0;



	if (kstrtobool(buf, &ncq_prio_enable))

		return -EINVAL;



	if (!sas_ata_ncq_prio_supported(sdev))

		return -EINVAL;



	sdev_priv_data->ncq_prio_enable = ncq_prio_enable;



	return strlen(buf);

}

static DEVICE_ATTR_RW(sas_ncq_prio_enable);



static struct attribute *mpi3mr_dev_attrs[] = {

	&dev_attr_sas_address.attr,

	&dev_attr_device_handle.attr,

	&dev_attr_persistent_id.attr,

	&dev_attr_sas_ncq_prio_supported.attr,

	&dev_attr_sas_ncq_prio_enable.attr,

	NULL,

};

drivers/scsi/mpt3sas/mpt3sas_base.c

+19 −0
Original line number Diff line number Diff line
@@ -8512,6 +8512,12 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc) 
	ioc->pd_handles_sz = (ioc->facts.MaxDevHandle / 8);

	if (ioc->facts.MaxDevHandle % 8)

		ioc->pd_handles_sz++;

	/*

	 * pd_handles_sz should have, at least, the minimal room for

	 * set_bit()/test_bit(), otherwise out-of-memory touch may occur.

	 */

	ioc->pd_handles_sz = ALIGN(ioc->pd_handles_sz, sizeof(unsigned long));



	ioc->pd_handles = kzalloc(ioc->pd_handles_sz,

	    GFP_KERNEL);

	if (!ioc->pd_handles) {
@@ -8529,6 +8535,13 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc) 
	ioc->pend_os_device_add_sz = (ioc->facts.MaxDevHandle / 8);

	if (ioc->facts.MaxDevHandle % 8)

		ioc->pend_os_device_add_sz++;



	/*

	 * pend_os_device_add_sz should have, at least, the minimal room for

	 * set_bit()/test_bit(), otherwise out-of-memory may occur.

	 */

	ioc->pend_os_device_add_sz = ALIGN(ioc->pend_os_device_add_sz,

					   sizeof(unsigned long));

	ioc->pend_os_device_add = kzalloc(ioc->pend_os_device_add_sz,

	    GFP_KERNEL);

	if (!ioc->pend_os_device_add) {
@@ -8820,6 +8833,12 @@ _base_check_ioc_facts_changes(struct MPT3SAS_ADAPTER *ioc) 
		if (ioc->facts.MaxDevHandle % 8)

			pd_handles_sz++;



		/*

		 * pd_handles should have, at least, the minimal room for

		 * set_bit()/test_bit(), otherwise out-of-memory touch may

		 * occur.

		 */

		pd_handles_sz = ALIGN(pd_handles_sz, sizeof(unsigned long));

		pd_handles = krealloc(ioc->pd_handles, pd_handles_sz,

		    GFP_KERNEL);

		if (!pd_handles) {

drivers/scsi/mpt3sas/mpt3sas_base.h

+0 −3
Original line number Diff line number Diff line
@@ -2048,9 +2048,6 @@ void 
mpt3sas_setup_direct_io(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,

	struct _raid_device *raid_device, Mpi25SCSIIORequest_t *mpi_request);



/* NCQ Prio Handling Check */

bool scsih_ncq_prio_supp(struct scsi_device *sdev);



void mpt3sas_setup_debugfs(struct MPT3SAS_ADAPTER *ioc);

void mpt3sas_destroy_debugfs(struct MPT3SAS_ADAPTER *ioc);

void mpt3sas_init_debugfs(void);

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -4088,7 +4088,7 @@ sas_ncq_prio_supported_show(struct device *dev, 
{

	struct scsi_device *sdev = to_scsi_device(dev);



	return sysfs_emit(buf, "%d\n", scsih_ncq_prio_supp(sdev));

	return sysfs_emit(buf, "%d\n", sas_ata_ncq_prio_supported(sdev));

}

static DEVICE_ATTR_RO(sas_ncq_prio_supported);
@@ -4123,7 +4123,7 @@ sas_ncq_prio_enable_store(struct device *dev, 
	if (kstrtobool(buf, &ncq_prio_enable))

		return -EINVAL;



	if (!scsih_ncq_prio_supp(sdev))

	if (!sas_ata_ncq_prio_supported(sdev))

		return -EINVAL;



	sas_device_priv_data->ncq_prio_enable = ncq_prio_enable;

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+0 −23
Original line number Diff line number Diff line
@@ -12571,29 +12571,6 @@ scsih_pci_mmio_enabled(struct pci_dev *pdev) 
	return PCI_ERS_RESULT_RECOVERED;

}



/**

 * scsih_ncq_prio_supp - Check for NCQ command priority support

 * @sdev: scsi device struct

 *

 * This is called when a user indicates they would like to enable

 * ncq command priorities. This works only on SATA devices.

 */

bool scsih_ncq_prio_supp(struct scsi_device *sdev)

{

	struct scsi_vpd *vpd;

	bool ncq_prio_supp = false;



	rcu_read_lock();

	vpd = rcu_dereference(sdev->vpd_pg89);

	if (!vpd || vpd->len < 214)

		goto out;



	ncq_prio_supp = (vpd->data[213] >> 4) & 1;

out:

	rcu_read_unlock();



	return ncq_prio_supp;

}

/*

 * The pci device ids are defined in mpi/mpi2_cnfg.h.

 */