GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi: megaraid_sas: Fix MSI-X vector print

Browse source 
Print FW supported MSI-X vector count only if FW supports
MSI-X.

Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Shivasharan S 2019-05-07 10:05:48 -07:00 • committed by Martin K. Petersen
parent 0a11c0b02a
commit ce88418dce
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/scsi/megaraid/megaraid_sas_base.c
View file

@ -5680,7 +5680,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
void *base_addr_phys; void *base_addr_phys;
struct megasas_ctrl_info *ctrl_info = NULL; struct megasas_ctrl_info *ctrl_info = NULL;
unsigned long bar_list; unsigned long bar_list;
int i, j, loop, fw_msix_count = 0; int i, j, loop;
struct IOV_111 *iovPtr; struct IOV_111 *iovPtr;
struct fusion_context *fusion; struct fusion_context *fusion;
@ -5801,7 +5801,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
/* Thunderbolt Series*/ /* Thunderbolt Series*/
instance->msix_vectors = (scratch_pad_1 instance->msix_vectors = (scratch_pad_1
& MR_MAX_REPLY_QUEUES_OFFSET) + 1; & MR_MAX_REPLY_QUEUES_OFFSET) + 1;
fw_msix_count = instance->msix_vectors;
} else { } else {
instance->msix_vectors = ((scratch_pad_1 instance->msix_vectors = ((scratch_pad_1
& MR_MAX_REPLY_QUEUES_EXT_OFFSET) & MR_MAX_REPLY_QUEUES_EXT_OFFSET)
@ -5836,7 +5835,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
instance->smp_affinity_enable = false; instance->smp_affinity_enable = false;
} }
fw_msix_count = instance->msix_vectors;
/* Save 1-15 reply post index address to local memory /* Save 1-15 reply post index address to local memory
* Index 0 is already saved from reg offset * Index 0 is already saved from reg offset
* MPI2_REPLY_POST_HOST_INDEX_OFFSET * MPI2_REPLY_POST_HOST_INDEX_OFFSET
@ -5849,6 +5847,10 @@ static int megasas_init_fw(struct megasas_instance *instance)
+ (loop * 0x10)); + (loop * 0x10));
} }
} }
dev_info(&instance->pdev->dev,
"firmware supports msix\t: (%d)",
instance->msix_vectors);
if (msix_vectors) if (msix_vectors)
instance->msix_vectors = min(msix_vectors, instance->msix_vectors = min(msix_vectors,
instance->msix_vectors); instance->msix_vectors);
@ -5891,8 +5893,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
megasas_setup_reply_map(instance); megasas_setup_reply_map(instance);
dev_info(&instance->pdev->dev,
"firmware supports msix\t: (%d)", fw_msix_count);
dev_info(&instance->pdev->dev, dev_info(&instance->pdev->dev,
"current msix/online cpus\t: (%d/%d)\n", "current msix/online cpus\t: (%d/%d)\n",
instance->msix_vectors, (unsigned int)num_online_cpus()); instance->msix_vectors, (unsigned int)num_online_cpus());