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
1713817138 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
1713917139 R: Alim Akhtar <alim.akhtar@samsung.com>
1714017140 R: Avri Altman <avri.altman@wdc.com>
17141−R: Pedro Sousa <pedrom.sousa@synopsys.com>
1714217141 L: linux-scsi@vger.kernel.org
1714317142 S: Supported
1714417143 F: 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
76047604 int rval;
76057605 struct Scsi_Host *host;
76067606 struct megasas_instance *instance;
7607− int irq_flags = PCI_IRQ_LEGACY;
76087607 u32 status_reg;
76097608
76107609 instance = pci_get_drvdata(pdev);
@@ -7673,16 +7672,15 @@ megasas_resume(struct pci_dev *pdev) · 62 unmodified lines
76737672 atomic_set(&instance->ldio_outstanding, 0);
76747673
76757674 /* Now re-enable MSI-X */
7676− if (instance->msix_vectors) {
7677− irq_flags = PCI_IRQ_MSIX;
7678− if (instance->smp_affinity_enable)
7679− irq_flags |= PCI_IRQ_AFFINITY;
7680− }
7681− rval = pci_alloc_irq_vectors(instance->pdev, 1,
7682− instance->msix_vectors ?
7683− instance->msix_vectors : 1, irq_flags);
7684− if (rval < 0)
7685− goto fail_reenable_msix;
7675+ if (instance->msix_vectors)
7676+ megasas_alloc_irq_vectors(instance);
7677+
7678+ if (!instance->msix_vectors) {
7679+ rval = pci_alloc_irq_vectors(instance->pdev, 1, 1,
7680+ PCI_IRQ_LEGACY);
7681+ if (rval < 0)
7682+ goto fail_reenable_msix;
7683+ }
76867684
76877685 megasas_setup_reply_map(instance);
76887686
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
23772377 ts->buf_valid_size = sizeof(*resp);
23782378 } else
23792379 PM8001_IO_DBG(pm8001_ha,
2380− pm8001_printk("response to large\n"));
2380+ pm8001_printk("response too large\n"));
23812381 }
23822382 if (pm8001_dev)
23832383 pm8001_dev->running_req--;
drivers/scsi/qla2xxx/qla_dbg.c+0−6
@@ -2519,12 +2519,6 @@ qla83xx_fw_dump_failed: · 2518 unmodified lines
25192519 /* Driver Debug Functions. */
25202520 /****************************************************************************/
25212521
2522−static inline int
2523−ql_mask_match(uint level)
2524−{
2525− return (level & ql2xextended_error_logging) == level;
2526−}
2527−
25282522 /*
25292523 * This function is for formatting and logging debug information.
25302524 * 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
374374 extern void qla24xx_pause_risc(struct device_reg_24xx __iomem *,
375375 struct qla_hw_data *);
376376 extern int qla24xx_soft_reset(struct qla_hw_data *);
377+
378+static inline int
379+ql_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
19391939 inbuf = (uint32_t *)&sts->nvme_ersp_data;
19401940 outbuf = (uint32_t *)fd->rspaddr;
19411941 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+ }
19421954 iter = iocb->u.nvme.rsp_pyld_len >> 2;
19431955 for (; iter; iter--)
19441956 *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
546546 u8 lun)
547547 {
548548 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");
550550 return false;
551551 }
552552

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