Commit 6ceaadee authored by Mitko Haralanov's avatar Mitko Haralanov Committed by Roland Dreier

IB/qib: Display correct value for number of contexts

A "fix" for a bug with the number of contexts on a single-port board
caused the calculation to be off by one, which causes problems with
the upper layers.  The same problem exists for number of free
contexts, which is also fixed here.
Signed-off-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 4ccf28a2
...@@ -102,6 +102,8 @@ void qib_set_ctxtcnt(struct qib_devdata *dd) ...@@ -102,6 +102,8 @@ void qib_set_ctxtcnt(struct qib_devdata *dd)
dd->cfgctxts = qib_cfgctxts; dd->cfgctxts = qib_cfgctxts;
else else
dd->cfgctxts = dd->ctxtcnt; dd->cfgctxts = dd->ctxtcnt;
dd->freectxts = (dd->first_user_ctxt > dd->cfgctxts) ? 0 :
dd->cfgctxts - dd->first_user_ctxt;
} }
/* /*
...@@ -402,7 +404,6 @@ static void enable_chip(struct qib_devdata *dd) ...@@ -402,7 +404,6 @@ static void enable_chip(struct qib_devdata *dd)
if (rcd) if (rcd)
dd->f_rcvctrl(rcd->ppd, rcvmask, i); dd->f_rcvctrl(rcd->ppd, rcvmask, i);
} }
dd->freectxts = dd->cfgctxts - dd->first_user_ctxt;
} }
static void verify_interrupt(unsigned long opaque) static void verify_interrupt(unsigned long opaque)
......
...@@ -503,8 +503,11 @@ static ssize_t show_nctxts(struct device *device, ...@@ -503,8 +503,11 @@ static ssize_t show_nctxts(struct device *device,
struct qib_devdata *dd = dd_from_dev(dev); struct qib_devdata *dd = dd_from_dev(dev);
/* Return the number of user ports (contexts) available. */ /* Return the number of user ports (contexts) available. */
return scnprintf(buf, PAGE_SIZE, "%u\n", dd->cfgctxts - /* The calculation below deals with a special case where
dd->first_user_ctxt); * cfgctxts is set to 1 on a single-port board. */
return scnprintf(buf, PAGE_SIZE, "%u\n",
(dd->first_user_ctxt > dd->cfgctxts) ? 0 :
(dd->cfgctxts - dd->first_user_ctxt));
} }
static ssize_t show_nfreectxts(struct device *device, static ssize_t show_nfreectxts(struct device *device,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment