qed: align DPI configuration to HW requirements

When calculating doorbell BAR partitioning round up the number of
CPUs to the nearest power of 2 so the size of the DPI (per user
section) configured in the hardware will be stored properly and
not truncated.

Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index c07191cb76313adf45603b922da7fc91fdd709b5..edf3b68bf9351dfa4e7794690e411ed670fa6bbd 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -72,6 +72,7 @@ extern const struct qed_common_ops qed_common_ops_pass;
 #define QED_WFQ_UNIT   100
 
 #define QED_WID_SIZE            (1024)
+#define QED_MIN_WIDS           (4)
 #define QED_PF_DEMS_SIZE        (4)
 
 /* cau states */

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index aa1a4d5c864ce5683946ac6d0e9796f1bbf3a16c..c478e079b03969866395ba02fedfa71fbd7b10b4 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1318,17 +1318,15 @@ static int
 qed_hw_init_dpi_size(struct qed_hwfn *p_hwfn,
                     struct qed_ptt *p_ptt, u32 pwm_region_size, u32 n_cpus)
 {
-       u32 dpi_page_size_1, dpi_page_size_2, dpi_page_size;
-       u32 dpi_bit_shift, dpi_count;
+       u32 dpi_bit_shift, dpi_count, dpi_page_size;
        u32 min_dpis;
+       u32 n_wids;
 
        /* Calculate DPI size */
-       dpi_page_size_1 = QED_WID_SIZE * n_cpus;
-       dpi_page_size_2 = max_t(u32, QED_WID_SIZE, PAGE_SIZE);
-       dpi_page_size = max_t(u32, dpi_page_size_1, dpi_page_size_2);
-       dpi_page_size = roundup_pow_of_two(dpi_page_size);
+       n_wids = max_t(u32, QED_MIN_WIDS, n_cpus);
+       dpi_page_size = QED_WID_SIZE * roundup_pow_of_two(n_wids);
+       dpi_page_size = (dpi_page_size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
        dpi_bit_shift = ilog2(dpi_page_size / 4096);
-
        dpi_count = pwm_region_size / dpi_page_size;
 
        min_dpis = p_hwfn->pf_params.rdma_pf_params.min_dpis;