diff options
| author |   Mike Marciniszyn <mike.marciniszyn@intel.com> | 2013-07-12 09:24:56 -0400 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2013-07-30 10:13:00 -0700 |
| commit | b268e4db3d04ed83ecc76b0454b12a8884445f88 (patch) | |
| tree | aa5c18ecd3ade19fc76fabfe1b71e72ed18e5af6 /drivers/infiniband/hw/qib | |
| parent | Linux 3.11-rc2 (diff) | |
| download | linux-dev-b268e4db3d04ed83ecc76b0454b12a8884445f88.tar.xz linux-dev-b268e4db3d04ed83ecc76b0454b12a8884445f88.zip | |
IB/qib: Add err_decode() call for ring dump
Commit 0b3ddf380ca7 ("Log all SDMA errors unconditionally") missed
part of the patch.
This also corrects a format warning when dma_addr_t is 32 bits
on a 64 bit system.
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/qib')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_iba7322.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_sdma.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c index 21e8b09d4bf8..016e7429adf6 100644 --- a/drivers/infiniband/hw/qib/qib_iba7322.c +++ b/drivers/infiniband/hw/qib/qib_iba7322.c @@ -1596,6 +1596,8 @@ static void sdma_7322_p_errors(struct qib_pportdata *ppd, u64 errs) struct qib_devdata *dd = ppd->dd; errs &= QIB_E_P_SDMAERRS; + err_decode(ppd->cpspec->sdmamsgbuf, sizeof(ppd->cpspec->sdmamsgbuf), + errs, qib_7322p_error_msgs); if (errs & QIB_E_P_SDMAUNEXPDATA) qib_dev_err(dd, "IB%u:%u SDmaUnexpData\n", dd->unit, diff --git a/drivers/infiniband/hw/qib/qib_sdma.c b/drivers/infiniband/hw/qib/qib_sdma.c index 32162d355370..9b5322d8cd5a 100644 --- a/drivers/infiniband/hw/qib/qib_sdma.c +++ b/drivers/infiniband/hw/qib/qib_sdma.c @@ -717,7 +717,7 @@ void dump_sdma_state(struct qib_pportdata *ppd) struct qib_sdma_txreq *txp, *txpnext; __le64 *descqp; u64 desc[2]; - dma_addr_t addr; + u64 addr; u16 gen, dwlen, dwoffset; u16 head, tail, cnt; |