diff options
| author | Mike Marciniszyn <mike.marciniszyn@qlogic.com> | 2011-01-11 02:42:20 +0100 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2011-01-11 02:42:20 +0100 |
| commit | 5dbbcb97cc55dd6e0c34cf06f9e1ee181247d054 (patch) | |
| tree | 14eb055d1e816e494d29db014d4c3b0c0fec6de2 /drivers/infiniband | |
| parent | IB/qib: Handle transitions from ACTIVE_DEFERRED to ACTIVE better (diff) | |
| download | linux-5dbbcb97cc55dd6e0c34cf06f9e1ee181247d054.tar.xz linux-5dbbcb97cc55dd6e0c34cf06f9e1ee181247d054.zip | |
IB/qib: Fix multi-Florida HCA host panic on reboot
Add check when setting configured contexts that the value does not
exceed the number of contexts allocated for the card. If the value
exceeds the already allocated count, set it to what is already
allocated.
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index f3b503936043..7896afbb9ce8 100644 --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c @@ -92,9 +92,11 @@ unsigned long *qib_cpulist; /* set number of contexts we'll actually use */ void qib_set_ctxtcnt(struct qib_devdata *dd) { - if (!qib_cfgctxts) + if (!qib_cfgctxts) { dd->cfgctxts = dd->first_user_ctxt + num_online_cpus(); - else if (qib_cfgctxts < dd->num_pports) + if (dd->cfgctxts > dd->ctxtcnt) + dd->cfgctxts = dd->ctxtcnt; + } else if (qib_cfgctxts < dd->num_pports) dd->cfgctxts = dd->ctxtcnt; else if (qib_cfgctxts <= dd->ctxtcnt) dd->cfgctxts = qib_cfgctxts; |