net/sfc/base: round number of queue buffers up

Functions efx_*q_nbufs return the number of a queue buffers by dividing
the queue size by page size. If minimum size of a queue is smaller than
one page, we still need the page and number of buffers should not be 0.

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c
index 21f4c226c54be252c73de50087bac7a8b3bb0b1f..b986239951215835afcd69ed489dfcc1e230ead0 100644 (file)
--- a/drivers/net/sfc/base/efx_ev.c
+++ b/drivers/net/sfc/base/efx_ev.c
@@ -188,7 +188,7 @@ efx_evq_nbufs(
        __in    const efx_nic_t *enp,
        __in    unsigned int ndescs)
 {
-       return (efx_evq_size(enp, ndescs) / EFX_BUF_SIZE);
+       return (EFX_DIV_ROUND_UP(efx_evq_size(enp, ndescs), EFX_BUF_SIZE));
 }
 
                void

diff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c
index c0d73812879637b053235afa06aa56d8e940ef9d..8a12ef705a4f53f60cb1036f4434486f35f9acd7 100644 (file)
--- a/drivers/net/sfc/base/efx_rx.c
+++ b/drivers/net/sfc/base/efx_rx.c
@@ -781,7 +781,7 @@ efx_rxq_nbufs(
        __in    const efx_nic_t *enp,
        __in    unsigned int ndescs)
 {
-       return (efx_rxq_size(enp, ndescs) / EFX_BUF_SIZE);
+       return (EFX_DIV_ROUND_UP(efx_rxq_size(enp, ndescs), EFX_BUF_SIZE));
 }
 
                        void

diff --git a/drivers/net/sfc/base/efx_tx.c b/drivers/net/sfc/base/efx_tx.c
index bbe2bd1b7ce1fa1736f06572bf6dbd052f8264a0..5cf3dcd3ac3e7f8b77b34d74f1bbc924eda706d5 100644 (file)
--- a/drivers/net/sfc/base/efx_tx.c
+++ b/drivers/net/sfc/base/efx_tx.c
@@ -312,7 +312,7 @@ efx_txq_nbufs(
        __in    const efx_nic_t *enp,
        __in    unsigned int ndescs)
 {
-       return (efx_txq_size(enp, ndescs) / EFX_BUF_SIZE);
+       return (EFX_DIV_ROUND_UP(efx_txq_size(enp, ndescs), EFX_BUF_SIZE));
 }
 
        __checkReturn   efx_rc_t