History

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

Pull misc SCSI fixes from James Bottomley: "Five small patches, all in drivers or doc, which missed the initial pull request. The qla2xxx and megaraid_sas are actual fixes and the rest are spelling and doc changes" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ufs: fix spelling mistake "initilized" -> "initialized" scsi: pm80xx: fix spelling mistake "to" -> "too" scsi: MAINTAINERS: ufs: remove pedrom.sousa@synopsys.com scsi: megaraid_sas: fixup MSIx interrupt setup during resume scsi: qla2xxx: Fix unbound NVME response length

Linus Torvalds committed 6 years ago

Commit fdfa3a62 parents 291abfe e0a51427 files · +29 −20Browse files

Unified · Split

7 files
  1. MAINTAINERS +0 −1
  2. drivers/scsi/megaraid/megaraid_sas_base.c +9 −11
  3. drivers/scsi/pm8001/pm80xx_hwi.c +1 −1
  4. drivers/scsi/qla2xxx/qla_dbg.c +0 −6
  5. drivers/scsi/qla2xxx/qla_dbg.h +6 −0
  6. drivers/scsi/qla2xxx/qla_isr.c +12 −0
  7. drivers/scsi/ufs/ufs.h +1 −1
MAINTAINERS+0−1
@@ -17138,7 +17138,6 @@ F: drivers/staging/unisys/ · 17137 unmodified lines
17138UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER17138UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
17139R: Alim Akhtar <alim.akhtar@samsung.com>17139R: Alim Akhtar <alim.akhtar@samsung.com>
17140R: Avri Altman <avri.altman@wdc.com>17140R: Avri Altman <avri.altman@wdc.com>
17141R: Pedro Sousa <pedrom.sousa@synopsys.com>
17142L: linux-scsi@vger.kernel.org17141L: linux-scsi@vger.kernel.org
17143S: Supported17142S: Supported
17144F: Documentation/scsi/ufs.txt17143F: Documentation/scsi/ufs.txt
drivers/scsi/megaraid/megaraid_sas_base.c+9−11
@@ -7604,7 +7604,6 @@ megasas_resume(struct pci_dev *pdev) · 7603 unmodified lines
7604 int rval;7604 int rval;
7605 struct Scsi_Host *host;7605 struct Scsi_Host *host;
7606 struct megasas_instance *instance;7606 struct megasas_instance *instance;
7607 int irq_flags = PCI_IRQ_LEGACY;
7608 u32 status_reg;7607 u32 status_reg;
7609 7608
7610 instance = pci_get_drvdata(pdev);7609 instance = pci_get_drvdata(pdev);
@@ -7673,16 +7672,15 @@ megasas_resume(struct pci_dev *pdev) · 62 unmodified lines
7673 atomic_set(&instance->ldio_outstanding, 0);7672 atomic_set(&instance->ldio_outstanding, 0);
7674 7673
7675 /* Now re-enable MSI-X */7674 /* Now re-enable MSI-X */
7676 if (instance->msix_vectors) {7675 if (instance->msix_vectors)
7677 irq_flags = PCI_IRQ_MSIX;7676 megasas_alloc_irq_vectors(instance);
7678 if (instance->smp_affinity_enable)7677
7679 irq_flags |= PCI_IRQ_AFFINITY;7678 if (!instance->msix_vectors) {
7680 }7679 rval = pci_alloc_irq_vectors(instance->pdev, 1, 1,
7681 rval = pci_alloc_irq_vectors(instance->pdev, 1,7680 PCI_IRQ_LEGACY);
7682 instance->msix_vectors ?7681 if (rval < 0)
7683 instance->msix_vectors : 1, irq_flags);7682 goto fail_reenable_msix;
7684 if (rval < 0)7683 }
7685 goto fail_reenable_msix;
7686 7684
7687 megasas_setup_reply_map(instance);7685 megasas_setup_reply_map(instance);
7688 7686
drivers/scsi/pm8001/pm80xx_hwi.c+1−1
@@ -2377,7 +2377,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb) · 2376 unmodified lines
2377 ts->buf_valid_size = sizeof(*resp);2377 ts->buf_valid_size = sizeof(*resp);
2378 } else2378 } else
2379 PM8001_IO_DBG(pm8001_ha,2379 PM8001_IO_DBG(pm8001_ha,
2380 pm8001_printk("response to large\n"));2380 pm8001_printk("response too large\n"));
2381 }2381 }
2382 if (pm8001_dev)2382 if (pm8001_dev)
2383 pm8001_dev->running_req--;2383 pm8001_dev->running_req--;
drivers/scsi/qla2xxx/qla_dbg.c+0−6
@@ -2519,12 +2519,6 @@ qla83xx_fw_dump_failed: · 2518 unmodified lines
2519/* Driver Debug Functions. */2519/* Driver Debug Functions. */
2520/****************************************************************************/2520/****************************************************************************/
2521 2521
2522static inline int
2523ql_mask_match(uint level)
2524{
2525 return (level & ql2xextended_error_logging) == level;
2526}
2527
2528/*2522/*
2529 * This function is for formatting and logging debug information.2523 * This function is for formatting and logging debug information.
2530 * It is to be used when vha is available. It formats the message2524 * It is to be used when vha is available. It formats the message
drivers/scsi/qla2xxx/qla_dbg.h+6−0
@@ -374,3 +374,9 @@ extern int qla24xx_dump_ram(struct qla_hw_data *, uint32_t, uint32_t *, · 373 unmodified lines
374extern void qla24xx_pause_risc(struct device_reg_24xx __iomem *,374extern void qla24xx_pause_risc(struct device_reg_24xx __iomem *,
375 struct qla_hw_data *);375 struct qla_hw_data *);
376extern int qla24xx_soft_reset(struct qla_hw_data *);376extern int qla24xx_soft_reset(struct qla_hw_data *);
377
378static inline int
379ql_mask_match(uint level)
380{
381 return (level & ql2xextended_error_logging) == level;
382}
drivers/scsi/qla2xxx/qla_isr.c+12−0
@@ -1939,6 +1939,18 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, · 1938 unmodified lines
1939 inbuf = (uint32_t *)&sts->nvme_ersp_data;1939 inbuf = (uint32_t *)&sts->nvme_ersp_data;
1940 outbuf = (uint32_t *)fd->rspaddr;1940 outbuf = (uint32_t *)fd->rspaddr;
1941 iocb->u.nvme.rsp_pyld_len = le16_to_cpu(sts->nvme_rsp_pyld_len);1941 iocb->u.nvme.rsp_pyld_len = le16_to_cpu(sts->nvme_rsp_pyld_len);
1942 if (unlikely(iocb->u.nvme.rsp_pyld_len >
1943 sizeof(struct nvme_fc_ersp_iu))) {
1944 if (ql_mask_match(ql_dbg_io)) {
1945 WARN_ONCE(1, "Unexpected response payload length %u.\n",
1946 iocb->u.nvme.rsp_pyld_len);
1947 ql_log(ql_log_warn, fcport->vha, 0x5100,
1948 "Unexpected response payload length %u.\n",
1949 iocb->u.nvme.rsp_pyld_len);
1950 }
1951 iocb->u.nvme.rsp_pyld_len =
1952 sizeof(struct nvme_fc_ersp_iu);
1953 }
1942 iter = iocb->u.nvme.rsp_pyld_len >> 2;1954 iter = iocb->u.nvme.rsp_pyld_len >> 2;
1943 for (; iter; iter--)1955 for (; iter; iter--)
1944 *outbuf++ = swab32(*inbuf++);1956 *outbuf++ = swab32(*inbuf++);
drivers/scsi/ufs/ufs.h+1−1
@@ -546,7 +546,7 @@ static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info, · 545 unmodified lines
546 u8 lun)546 u8 lun)
547{547{
548 if (!dev_info || !dev_info->max_lu_supported) {548 if (!dev_info || !dev_info->max_lu_supported) {
549 pr_err("Max General LU supported by UFS isn't initilized\n");549 pr_err("Max General LU supported by UFS isn't initialized\n");
550 return false;550 return false;
551 }551 }
552 552

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t