qed: output the DPM status and WID count

Orabug: 26783820

Output to the RDMA driver whether DPM mode is enabled or disabled in
the HW and if so what is the number of WIDs it supports

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>
[ Upstream commit 20b1bd96e9f4feeffc9206284df3c6a4438e9ca8 ]
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index dc3ff55c155bf2f849f8335010ab416f96512994..c71d02d35d6227fe5096a66e14af81f8afa9919a 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -527,6 +527,7 @@ struct qed_hwfn {
        struct dbg_tools_data           dbg_info;
 
        /* PWM region specific data */
+       u16                             wid_count;
        u32                             dpi_size;
        u32                             dpi_count;
 

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index e566438cf36f5a6867d12abff0eb23a925cdf2ed..05c46691f05eed34474fd64fe368557059e6956c 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1329,7 +1329,7 @@ qed_hw_init_pf_doorbell_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
 {
        u32 pwm_regsize, norm_regsize;
        u32 non_pwm_conn, min_addr_reg1;
-       u32 db_bar_size, n_cpus;
+       u32 db_bar_size, n_cpus = 1;
        u32 roce_edpm_mode;
        u32 pf_dems_shift;
        int rc = 0;
@@ -1390,6 +1390,8 @@ qed_hw_init_pf_doorbell_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
                        qed_rdma_dpm_bar(p_hwfn, p_ptt);
        }
 
+       p_hwfn->wid_count = (u16) n_cpus;
+
        DP_INFO(p_hwfn,
                "doorbell bar: normal_region_size=%d, pwm_region_size=%d, dpi_size=%d, dpi_count=%d, roce_edpm=%s\n",
                norm_regsize,

diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c
index 131ed24f6438017b7d70f526a30403ca48be48c1..9f2d27a8e7a42cfc0b9e748948f6e605f61dc412 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_roce.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c
@@ -784,6 +784,7 @@ static int qed_rdma_add_user(void *rdma_cxt,
                                    ((out_params->dpi) * p_hwfn->dpi_size);
 
        out_params->dpi_size = p_hwfn->dpi_size;
+       out_params->wid_count = p_hwfn->wid_count;
 
        DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Adding user - done, rc = %d\n", rc);
        return rc;
@@ -856,9 +857,12 @@ static void qed_rdma_cnq_prod_update(void *rdma_cxt, u8 qz_offset, u16 prod)
 static int qed_fill_rdma_dev_info(struct qed_dev *cdev,
                                  struct qed_dev_rdma_info *info)
 {
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+
        memset(info, 0, sizeof(*info));
 
        info->rdma_type = QED_RDMA_TYPE_ROCE;
+       info->user_dpm_enabled = (p_hwfn->db_bar_no_edpm == 0);
 
        qed_fill_dev_info(cdev, &info->common);
 

diff --git a/include/linux/qed/qed_roce_if.h b/include/linux/qed/qed_roce_if.h
index f742d4312c9d96f1498554edee09654e065e9e74..cbb2ff0ce4bc34c5179a5ad77167ac0b721f6a30 100644 (file)
--- a/include/linux/qed/qed_roce_if.h
+++ b/include/linux/qed/qed_roce_if.h
@@ -240,6 +240,7 @@ struct qed_rdma_add_user_out_params {
        u64 dpi_addr;
        u64 dpi_phys_addr;
        u32 dpi_size;
+       u16 wid_count;
 };
 
 enum roce_mode {
@@ -533,6 +534,7 @@ enum qed_rdma_type {
 struct qed_dev_rdma_info {
        struct qed_dev_info common;
        enum qed_rdma_type rdma_type;
+       u8 user_dpm_enabled;
 };
 
 struct qed_rdma_ops {