qed: Use BDQ resource for storage protocols

Until now, qed used some port-defined value as BDQ index for both iSCSI
and FCoE.

As management firmware now treats BDQ as a resource and tells each PF
its BDQ-range, start using a valure from that range instead.

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 cf7129550f1cc5d742afdb4cc847e91d449c07c6..8c85fd2f3949118fa41c346c03023620d6d78b71 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -71,8 +71,6 @@ extern const struct qed_common_ops qed_common_ops_pass;
 
 #define QED_WFQ_UNIT   100
 
-#define ISCSI_BDQ_ID(_port_id) (_port_id)
-#define FCOE_BDQ_ID(_port_id) ((_port_id) + 2)
 #define QED_WID_SIZE            (1024)
 #define QED_PF_DEMS_SIZE        (4)
 

diff --git a/drivers/net/ethernet/qlogic/qed/qed_fcoe.c b/drivers/net/ethernet/qlogic/qed/qed_fcoe.c
index cbc81412174f9e1ea07a763a90072348e883699f..60921b72c99502ae936dfa86fc69982b23952e79 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_fcoe.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_fcoe.c
@@ -191,7 +191,7 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn,
        p_data->q_params.cq_sb_pi = fcoe_pf_params->gl_rq_pi;
        p_data->q_params.cmdq_sb_pi = fcoe_pf_params->gl_cmd_pi;
 
-       p_data->q_params.bdq_resource_id = FCOE_BDQ_ID(p_hwfn->port_id);
+       p_data->q_params.bdq_resource_id = (u8)RESC_START(p_hwfn, QED_BDQ);
 
        DMA_REGPAIR_LE(p_data->q_params.bdq_pbl_base_address[BDQ_ID_RQ],
                       fcoe_pf_params->bdq_pbl_base_addr[BDQ_ID_RQ]);
@@ -512,19 +512,31 @@ static void __iomem *qed_fcoe_get_db_addr(struct qed_hwfn *p_hwfn, u32 cid)
 static void __iomem *qed_fcoe_get_primary_bdq_prod(struct qed_hwfn *p_hwfn,
                                                   u8 bdq_id)
 {
-       u8 bdq_function_id = FCOE_BDQ_ID(p_hwfn->port_id);
-
-       return (u8 __iomem *)p_hwfn->regview + GTT_BAR0_MAP_REG_MSDM_RAM +
-              MSTORM_SCSI_BDQ_EXT_PROD_OFFSET(bdq_function_id, bdq_id);
+       if (RESC_NUM(p_hwfn, QED_BDQ)) {
+               return (u8 __iomem *)p_hwfn->regview +
+                      GTT_BAR0_MAP_REG_MSDM_RAM +
+                      MSTORM_SCSI_BDQ_EXT_PROD_OFFSET(RESC_START(p_hwfn,
+                                                                 QED_BDQ),
+                                                      bdq_id);
+       } else {
+               DP_NOTICE(p_hwfn, "BDQ is not allocated!\n");
+               return NULL;
+       }
 }
 
 static void __iomem *qed_fcoe_get_secondary_bdq_prod(struct qed_hwfn *p_hwfn,
                                                     u8 bdq_id)
 {
-       u8 bdq_function_id = FCOE_BDQ_ID(p_hwfn->port_id);
-
-       return (u8 __iomem *)p_hwfn->regview + GTT_BAR0_MAP_REG_TSDM_RAM +
-              TSTORM_SCSI_BDQ_EXT_PROD_OFFSET(bdq_function_id, bdq_id);
+       if (RESC_NUM(p_hwfn, QED_BDQ)) {
+               return (u8 __iomem *)p_hwfn->regview +
+                      GTT_BAR0_MAP_REG_TSDM_RAM +
+                      TSTORM_SCSI_BDQ_EXT_PROD_OFFSET(RESC_START(p_hwfn,
+                                                                 QED_BDQ),
+                                                      bdq_id);
+       } else {
+               DP_NOTICE(p_hwfn, "BDQ is not allocated!\n");
+               return NULL;
+       }
 }
 
 struct qed_fcoe_info *qed_fcoe_alloc(struct qed_hwfn *p_hwfn)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_iscsi.c b/drivers/net/ethernet/qlogic/qed/qed_iscsi.c
index 098766f7fe88a6e0a131712330cfa3b144c32738..2f8ac75ebd848b8d4448d90c492708fe149fecfc 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_iscsi.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_iscsi.c
@@ -216,7 +216,7 @@ qed_sp_iscsi_func_start(struct qed_hwfn *p_hwfn,
                p_queue->cq_cmdq_sb_num_arr[i] = cpu_to_le16(val);
        }
 
-       p_queue->bdq_resource_id = ISCSI_BDQ_ID(p_hwfn->port_id);
+       p_queue->bdq_resource_id = (u8)RESC_START(p_hwfn, QED_BDQ);
 
        DMA_REGPAIR_LE(p_queue->bdq_pbl_base_address[BDQ_ID_RQ],
                       p_params->bdq_pbl_base_addr[BDQ_ID_RQ]);
@@ -593,21 +593,31 @@ static void __iomem *qed_iscsi_get_db_addr(struct qed_hwfn *p_hwfn, u32 cid)
 static void __iomem *qed_iscsi_get_primary_bdq_prod(struct qed_hwfn *p_hwfn,
                                                    u8 bdq_id)
 {
-       u8 bdq_function_id = ISCSI_BDQ_ID(p_hwfn->port_id);
-
-       return (u8 __iomem *)p_hwfn->regview + GTT_BAR0_MAP_REG_MSDM_RAM +
-                            MSTORM_SCSI_BDQ_EXT_PROD_OFFSET(bdq_function_id,
-                                                            bdq_id);
+       if (RESC_NUM(p_hwfn, QED_BDQ)) {
+               return (u8 __iomem *)p_hwfn->regview +
+                      GTT_BAR0_MAP_REG_MSDM_RAM +
+                      MSTORM_SCSI_BDQ_EXT_PROD_OFFSET(RESC_START(p_hwfn,
+                                                                 QED_BDQ),
+                                                      bdq_id);
+       } else {
+               DP_NOTICE(p_hwfn, "BDQ is not allocated!\n");
+               return NULL;
+       }
 }
 
 static void __iomem *qed_iscsi_get_secondary_bdq_prod(struct qed_hwfn *p_hwfn,
                                                      u8 bdq_id)
 {
-       u8 bdq_function_id = ISCSI_BDQ_ID(p_hwfn->port_id);
-
-       return (u8 __iomem *)p_hwfn->regview + GTT_BAR0_MAP_REG_TSDM_RAM +
-                            TSTORM_SCSI_BDQ_EXT_PROD_OFFSET(bdq_function_id,
-                                                            bdq_id);
+       if (RESC_NUM(p_hwfn, QED_BDQ)) {
+               return (u8 __iomem *)p_hwfn->regview +
+                      GTT_BAR0_MAP_REG_TSDM_RAM +
+                      TSTORM_SCSI_BDQ_EXT_PROD_OFFSET(RESC_START(p_hwfn,
+                                                                 QED_BDQ),
+                                                      bdq_id);
+       } else {
+               DP_NOTICE(p_hwfn, "BDQ is not allocated!\n");
+               return NULL;
+       }
 }
 
 static int qed_iscsi_setup_connection(struct qed_hwfn *p_hwfn,