Commit 6bff9bb8 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:
 "Five small fixes.  Four in drivers:

   - hisi_sas: fix internal queue timeout

   - be2iscsi: revert a prior fix causing problems

   - bnx2i: add missing dependency

   - storvsc: late arriving revert of a problem fix

  and one in the core.

  The core one is a minor change to stop paying attention to the busy
  count when returning out of resources because there's a race window
  where the queue might not restart due to missing returning I/O"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  Revert "scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()"
  scsi: hisi_sas: Select a suitable queue for internal I/Os
  scsi: core: Fix race between handling STS_RESOURCE and completion
  scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()"
  scsi: bnx2i: Requires MMU
parents 5ee595d9 4da3a54f

drivers/scsi/be2iscsi/be_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, 
			goto create_eq_error;

		}



		mem->dma = paddr;

		mem->va = eq_vaddress;

		ret = be_fill_queue(eq, phba->params.num_eq_entries,

				    sizeof(struct be_eq_entry), eq_vaddress);
@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, 
			goto create_eq_error;

		}



		mem->dma = paddr;

		ret = beiscsi_cmd_eq_create(&phba->ctrl, eq,

					    BEISCSI_EQ_DELAY_DEF);

		if (ret) {
@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, 
			goto create_cq_error;

		}



		mem->dma = paddr;

		ret = be_fill_queue(cq, phba->params.num_cq_entries,

				    sizeof(struct sol_cqe), cq_vaddress);

		if (ret) {
@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, 
			goto create_cq_error;

		}



		mem->dma = paddr;

		ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false,

					    false, 0);

		if (ret) {

drivers/scsi/bnx2i/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config SCSI_BNX2_ISCSI 
	depends on NET

	depends on PCI

	depends on (IPV6 || IPV6=n)

	depends on MMU

	select SCSI_ISCSI_ATTRS

	select NETDEVICES

	select ETHERNET

drivers/scsi/hisi_sas/hisi_sas_main.c

+6 −0
Original line number Diff line number Diff line
@@ -452,6 +452,12 @@ static int hisi_sas_task_prep(struct sas_task *task, 
		blk_tag = blk_mq_unique_tag(scmd->request);

		dq_index = blk_mq_unique_tag_to_hwq(blk_tag);

		*dq_pointer = dq = &hisi_hba->dq[dq_index];

	} else if (hisi_hba->shost->nr_hw_queues)  {

		struct Scsi_Host *shost = hisi_hba->shost;

		struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT];

		int queue = qmap->mq_map[raw_smp_processor_id()];



		*dq_pointer = dq = &hisi_hba->dq[queue];

	} else {

		*dq_pointer = dq = sas_dev->dq;

	}

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+5 −0
Original line number Diff line number Diff line
@@ -2452,6 +2452,11 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) 
			rc = -ENOENT;

			goto free_irq_vectors;

		}

		cq->irq_mask = pci_irq_get_affinity(pdev, i + BASE_VECTORS_V3_HW);

		if (!cq->irq_mask) {

			dev_err(dev, "could not get cq%d irq affinity!\n", i);

			return -ENOENT;

		}

	}



	return 0;

drivers/scsi/scsi_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -1703,8 +1703,7 @@ out_put_budget: 
		break;

	case BLK_STS_RESOURCE:

	case BLK_STS_ZONE_RESOURCE:

		if (atomic_read(&sdev->device_busy) ||

		    scsi_device_blocked(sdev))

		if (scsi_device_blocked(sdev))

			ret = BLK_STS_DEV_RESOURCE;

		break;

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE