public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi: mpt3sas: Set NVMe device queue depth as 128

Browse source 
Sets nvme device queue depth, name and displays device capabilities

Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Suganath Prabu Subramani 2017-10-31 18:02:33 +05:30 • committed by Martin K. Petersen
parent 4318c73478
commit d1b01d14b7
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/mpt3sas/mpt3sas_base.h
View file

@ -117,7 +117,7 @@
#define MPT3SAS_RAID_MAX_SECTORS 8192 #define MPT3SAS_RAID_MAX_SECTORS 8192
#define MPT3SAS_HOST_PAGE_SIZE_4K 12 #define MPT3SAS_HOST_PAGE_SIZE_4K 12
#define MPT3SAS_NVME_QUEUE_DEPTH 128
#define MPT_NAME_LENGTH 32 /* generic length of strings */ #define MPT_NAME_LENGTH 32 /* generic length of strings */
#define MPT_STRING_LENGTH 64 #define MPT_STRING_LENGTH 64

50
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View file

@ -2323,6 +2323,7 @@ scsih_slave_configure(struct scsi_device *sdev)
struct MPT3SAS_DEVICE *sas_device_priv_data; struct MPT3SAS_DEVICE *sas_device_priv_data;
struct MPT3SAS_TARGET *sas_target_priv_data; struct MPT3SAS_TARGET *sas_target_priv_data;
struct _sas_device *sas_device; struct _sas_device *sas_device;
struct _pcie_device *pcie_device;
struct _raid_device *raid_device; struct _raid_device *raid_device;
unsigned long flags; unsigned long flags;
int qdepth; int qdepth;
@ -2453,6 +2454,55 @@ scsih_slave_configure(struct scsi_device *sdev)
} }
} }
/* PCIe handling */
if (sas_target_priv_data->flags & MPT_TARGET_FLAGS_PCIE_DEVICE) {
spin_lock_irqsave(&ioc->pcie_device_lock, flags);
pcie_device = __mpt3sas_get_pdev_by_wwid(ioc,
sas_device_priv_data->sas_target->sas_address);
if (!pcie_device) {
spin_unlock_irqrestore(&ioc->pcie_device_lock, flags);
dfailprintk(ioc, pr_warn(MPT3SAS_FMT
"failure at %s:%d/%s()!\n", ioc->name, __FILE__,
__LINE__, __func__));
return 1;
}
qdepth = MPT3SAS_NVME_QUEUE_DEPTH;
ds = "NVMe";
sdev_printk(KERN_INFO, sdev,
"%s: handle(0x%04x), wwid(0x%016llx), port(%d)\n",
ds, handle, (unsigned long long)pcie_device->wwid,
pcie_device->port_num);
if (pcie_device->enclosure_handle != 0)
sdev_printk(KERN_INFO, sdev,
"%s: enclosure logical id(0x%016llx), slot(%d)\n",
ds,
(unsigned long long)pcie_device->enclosure_logical_id,
pcie_device->slot);
if (pcie_device->connector_name[0] != '\0')
sdev_printk(KERN_INFO, sdev,
"%s: enclosure level(0x%04x),"
"connector name( %s)\n", ds,
pcie_device->enclosure_level,
pcie_device->connector_name);
pcie_device_put(pcie_device);
spin_unlock_irqrestore(&ioc->pcie_device_lock, flags);
scsih_change_queue_depth(sdev, qdepth);
if (pcie_device->nvme_mdts)
blk_queue_max_hw_sectors(sdev->request_queue,
pcie_device->nvme_mdts/512);
/* Enable QUEUE_FLAG_NOMERGES flag, so that IOs won't be
** merged and can eliminate holes created during merging
** operation.
**/
queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES,
sdev->request_queue);
blk_queue_virt_boundary(sdev->request_queue,
ioc->page_size - 1);
return 0;
}
spin_lock_irqsave(&ioc->sas_device_lock, flags); spin_lock_irqsave(&ioc->sas_device_lock, flags);
sas_device = __mpt3sas_get_sdev_by_addr(ioc, sas_device = __mpt3sas_get_sdev_by_addr(ioc,
sas_device_priv_data->sas_target->sas_address); sas_device_priv_data->sas_target->sas_address);