Skip to content

Commit

Permalink
scsi: mpt3sas: Fix for incorrect numbers for MSIX vectors enabled whe…
Browse files Browse the repository at this point in the history
…n non RDPQ card is enumerated first.

No. of MSIX vectors supported = min (Total no. of CPU cores,
MSIX vectors supported by card)

when RDPQ is disabled "max_msix_vectors" module parameter which was
declared as global was set to '8' and hence if there are more than one card
in system among which if RDPQ disabled card is enumerated first then only 8
MSIX vectors was getting enabled for all the cards(including RDPQ enabled
card,which can support more than 8 MSIX vectors).

Used local variable instead of global variable ,if RDPQ is disabled this
local variable is set to '8' else it is set to "max_msix_vectors" (by
default this is set to -1, whose value can be set by user during driver
load time).So now regardless of whether RDPQ disabled card is enumerated
first or RDPQ enabled card is enumerated first , MSIX vectors enabled
depends on the cards capability.

Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
Suganath Prabu Subramani authored and Martin K. Petersen committed Nov 8, 2016
1 parent b2fe6be commit bb35066
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/scsi/mpt3sas/mpt3sas_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1959,7 +1959,7 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc)
{
struct msix_entry *entries, *a;
int r;
int i;
int i, local_max_msix_vectors;
u8 try_msix = 0;

if (msix_disable == -1 || msix_disable == 0)
Expand All @@ -1979,13 +1979,15 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc)
ioc->cpu_count, max_msix_vectors);

if (!ioc->rdpq_array_enable && max_msix_vectors == -1)
max_msix_vectors = 8;
local_max_msix_vectors = 8;
else
local_max_msix_vectors = max_msix_vectors;

if (max_msix_vectors > 0) {
ioc->reply_queue_count = min_t(int, max_msix_vectors,
if (local_max_msix_vectors > 0) {
ioc->reply_queue_count = min_t(int, local_max_msix_vectors,
ioc->reply_queue_count);
ioc->msix_vector_count = ioc->reply_queue_count;
} else if (max_msix_vectors == 0)
} else if (local_max_msix_vectors == 0)
goto try_ioapic;

if (ioc->msix_vector_count < ioc->cpu_count)
Expand Down

0 comments on commit bb35066

Please sign in to comment.