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

Commit dc4e3ec9 authored by Shivasharan S's avatar Shivasharan S Committed by Greg Kroah-Hartman
Browse files

scsi: megaraid_sas: Fix combined reply queue mode detection 



[ Upstream commit e29c322133472628c6de85efb99ccd3b3df5571e ]

For Invader series, if FW supports more than 8 MSI-x vectors, driver needs
to enable combined reply queue mode. For Ventura series, driver enables
combined reply queue mode in case of more than 16 MSI-x vectors.

Signed-off-by: default avatarSumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent eb124aaa

drivers/scsi/megaraid/megaraid_sas_base.c

+20 −3
Original line number Diff line number Diff line
@@ -5325,12 +5325,29 @@ static int megasas_init_fw(struct megasas_instance *instance) 
				instance->msix_vectors = (scratch_pad_2

					& MR_MAX_REPLY_QUEUES_OFFSET) + 1;

				fw_msix_count = instance->msix_vectors;

			} else { /* Invader series supports more than 8 MSI-x vectors*/

			} else {

				instance->msix_vectors = ((scratch_pad_2

					& MR_MAX_REPLY_QUEUES_EXT_OFFSET)

					>> MR_MAX_REPLY_QUEUES_EXT_OFFSET_SHIFT) + 1;



				/*

				 * For Invader series, > 8 MSI-x vectors

				 * supported by FW/HW implies combined

				 * reply queue mode is enabled.

				 * For Ventura series, > 16 MSI-x vectors

				 * supported by FW/HW implies combined

				 * reply queue mode is enabled.

				 */

				switch (instance->adapter_type) {

				case INVADER_SERIES:

					if (instance->msix_vectors > 8)

						instance->msix_combined = true;

					break;

				case VENTURA_SERIES:

					if (instance->msix_vectors > 16)

						instance->msix_combined = true;

					break;

				}



				if (rdpq_enable)

					instance->is_rdpq = (scratch_pad_2 & MR_RDPQ_MODE_OFFSET) ?