diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2021-10-04 15:59:49 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-10-04 16:01:26 -0300 |
| commit | c78d218fc5a9995d6b50aa38814bef4fbc88a77d (patch) | |
| tree | 8c647466fa60cb281556016388adf0ad80172c8c /drivers/infiniband/hw/hfi1/ipoib_tx.c | |
| parent | RDMA/rxe: Bump up default maximum values used via uverbs (diff) | |
| parent | Linux 5.15-rc4 (diff) | |
| download | linux-dev-c78d218fc5a9995d6b50aa38814bef4fbc88a77d.tar.xz linux-dev-c78d218fc5a9995d6b50aa38814bef4fbc88a77d.zip | |
Merge tag 'v5.15-rc4' into rdma.get for-next
Merged due to dependencies in following patches.
Conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c resolved by hand to take
the %p change and txq stats rename together.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/ipoib_tx.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/ipoib_tx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/hfi1/ipoib_tx.c b/drivers/infiniband/hw/hfi1/ipoib_tx.c index d1c2cf52ba48..f4010890309f 100644 --- a/drivers/infiniband/hw/hfi1/ipoib_tx.c +++ b/drivers/infiniband/hw/hfi1/ipoib_tx.c @@ -827,14 +827,14 @@ void hfi1_ipoib_tx_timeout(struct net_device *dev, unsigned int q) struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev); struct hfi1_ipoib_txq *txq = &priv->txqs[q]; - dd_dev_info(priv->dd, "timeout txq %llx q %u stopped %u stops %d no_desc %d ring_full %d\n", - (unsigned long long)txq, q, + dd_dev_info(priv->dd, "timeout txq %p q %u stopped %u stops %d no_desc %d ring_full %d\n", + txq, q, __netif_subqueue_stopped(dev, txq->q_idx), atomic_read(&txq->tx_ring.stops), atomic_read(&txq->tx_ring.no_desc), atomic_read(&txq->tx_ring.ring_full)); - dd_dev_info(priv->dd, "sde %llx engine %u\n", - (unsigned long long)txq->sde, + dd_dev_info(priv->dd, "sde %p engine %u\n", + txq->sde, txq->sde ? txq->sde->this_idx : 0); dd_dev_info(priv->dd, "flow %x\n", txq->flow.as_int); dd_dev_info(priv->dd, "sent %llu completed %llu used %llu\n", |