Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b8528d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

megaraid_sas: use raw_smp_processor_id() 



We only want to steer the I/O completion towards a queue, but don't
actually access any per-CPU data, so the raw_ version is fine to use
and avoids the warnings when using smp_processor_id().

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarAndy Lutomirski <luto@kernel.org>
Tested-by: default avatarAndy Lutomirski <luto@kernel.org>
Acked-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent e557990e

drivers/scsi/megaraid/megaraid_sas_fusion.c

+6 −3
Original line number Diff line number Diff line
@@ -1584,11 +1584,11 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, 
			fp_possible = io_info.fpOkForIo;

	}



	/* Use smp_processor_id() for now until cmd->request->cpu is CPU

	/* Use raw_smp_processor_id() for now until cmd->request->cpu is CPU

	   id by default, not CPU group id, otherwise all MSI-X queues won't

	   be utilized */

	cmd->request_desc->SCSIIO.MSIxIndex = instance->msix_vectors ?

		smp_processor_id() % instance->msix_vectors : 0;

		raw_smp_processor_id() % instance->msix_vectors : 0;



	if (fp_possible) {

		megasas_set_pd_lba(io_request, scp->cmd_len, &io_info, scp,
@@ -1693,7 +1693,10 @@ megasas_build_dcdb_fusion(struct megasas_instance *instance, 
			<< MR_RAID_CTX_RAID_FLAGS_IO_SUB_TYPE_SHIFT;

		cmd->request_desc->SCSIIO.DevHandle = io_request->DevHandle;

		cmd->request_desc->SCSIIO.MSIxIndex =

			instance->msix_vectors ? smp_processor_id() % instance->msix_vectors : 0;

			instance->msix_vectors ?

				raw_smp_processor_id() %

					instance->msix_vectors :

				0;

		os_timeout_value = scmd->request->timeout / HZ;



		if (instance->secure_jbod_support &&