bnx2x: changed initial dcb configuration

The changes were mostly made to enable back-to-back data flow with dcb.
Other changes were simply deemed as a better 'clean' initial configuration.

(cherry picked from commit 9d4884f9d470cd696d7a7cd7a6d7099d13909dd9)
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/bnx2x/bnx2x_dcb.c
index 0d6fa7acbef4f06ec85adee2a652144194b074f1..7eade9da1eff39b277d9937d7bb34a9685db0d34 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/bnx2x/bnx2x_dcb.c
@@ -925,30 +925,30 @@ void bnx2x_dcbx_init_params(struct bnx2x *bp)
        bp->dcbx_config_params.admin_application_priority_tx_enable = 1;
        bp->dcbx_config_params.admin_ets_reco_valid = 1;
        bp->dcbx_config_params.admin_app_priority_willing = 1;
-       bp->dcbx_config_params.admin_configuration_bw_precentage[0] = 00;
-       bp->dcbx_config_params.admin_configuration_bw_precentage[1] = 50;
-       bp->dcbx_config_params.admin_configuration_bw_precentage[2] = 50;
+       bp->dcbx_config_params.admin_configuration_bw_precentage[0] = 100;
+       bp->dcbx_config_params.admin_configuration_bw_precentage[1] = 0;
+       bp->dcbx_config_params.admin_configuration_bw_precentage[2] = 0;
        bp->dcbx_config_params.admin_configuration_bw_precentage[3] = 0;
        bp->dcbx_config_params.admin_configuration_bw_precentage[4] = 0;
        bp->dcbx_config_params.admin_configuration_bw_precentage[5] = 0;
        bp->dcbx_config_params.admin_configuration_bw_precentage[6] = 0;
        bp->dcbx_config_params.admin_configuration_bw_precentage[7] = 0;
-       bp->dcbx_config_params.admin_configuration_ets_pg[0] = 1;
+       bp->dcbx_config_params.admin_configuration_ets_pg[0] = 0;
        bp->dcbx_config_params.admin_configuration_ets_pg[1] = 0;
        bp->dcbx_config_params.admin_configuration_ets_pg[2] = 0;
-       bp->dcbx_config_params.admin_configuration_ets_pg[3] = 2;
+       bp->dcbx_config_params.admin_configuration_ets_pg[3] = 0;
        bp->dcbx_config_params.admin_configuration_ets_pg[4] = 0;
        bp->dcbx_config_params.admin_configuration_ets_pg[5] = 0;
        bp->dcbx_config_params.admin_configuration_ets_pg[6] = 0;
        bp->dcbx_config_params.admin_configuration_ets_pg[7] = 0;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[0] = 0;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[1] = 1;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[2] = 2;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[0] = 100;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[1] = 0;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[2] = 0;
        bp->dcbx_config_params.admin_recommendation_bw_precentage[3] = 0;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[4] = 7;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[5] = 5;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[6] = 6;
-       bp->dcbx_config_params.admin_recommendation_bw_precentage[7] = 7;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[4] = 0;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[5] = 0;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[6] = 0;
+       bp->dcbx_config_params.admin_recommendation_bw_precentage[7] = 0;
        bp->dcbx_config_params.admin_recommendation_ets_pg[0] = 0;
        bp->dcbx_config_params.admin_recommendation_ets_pg[1] = 1;
        bp->dcbx_config_params.admin_recommendation_ets_pg[2] = 2;
@@ -957,25 +957,12 @@ void bnx2x_dcbx_init_params(struct bnx2x *bp)
        bp->dcbx_config_params.admin_recommendation_ets_pg[5] = 5;
        bp->dcbx_config_params.admin_recommendation_ets_pg[6] = 6;
        bp->dcbx_config_params.admin_recommendation_ets_pg[7] = 7;
-       bp->dcbx_config_params.admin_pfc_bitmap = 0x8; /* FCoE(3) enable */
-       bp->dcbx_config_params.admin_priority_app_table[0].valid = 1;
-       bp->dcbx_config_params.admin_priority_app_table[1].valid = 1;
+       bp->dcbx_config_params.admin_pfc_bitmap = 0x0;
+       bp->dcbx_config_params.admin_priority_app_table[0].valid = 0;
+       bp->dcbx_config_params.admin_priority_app_table[1].valid = 0;
        bp->dcbx_config_params.admin_priority_app_table[2].valid = 0;
        bp->dcbx_config_params.admin_priority_app_table[3].valid = 0;
-       bp->dcbx_config_params.admin_priority_app_table[0].priority = 3;
-       bp->dcbx_config_params.admin_priority_app_table[1].priority = 0;
-       bp->dcbx_config_params.admin_priority_app_table[2].priority = 0;
-       bp->dcbx_config_params.admin_priority_app_table[3].priority = 0;
-       bp->dcbx_config_params.admin_priority_app_table[0].traffic_type = 0;
-       bp->dcbx_config_params.admin_priority_app_table[1].traffic_type = 1;
-       bp->dcbx_config_params.admin_priority_app_table[2].traffic_type = 0;
-       bp->dcbx_config_params.admin_priority_app_table[3].traffic_type = 0;
-       bp->dcbx_config_params.admin_priority_app_table[0].app_id = 0x8906;
-       bp->dcbx_config_params.admin_priority_app_table[1].app_id = 3260;
-       bp->dcbx_config_params.admin_priority_app_table[2].app_id = 0;
-       bp->dcbx_config_params.admin_priority_app_table[3].app_id = 0;
-       bp->dcbx_config_params.admin_default_priority =
-               bp->dcbx_config_params.admin_priority_app_table[1].priority;
+       bp->dcbx_config_params.admin_default_priority = 0;
 }
 
 void bnx2x_dcbx_init(struct bnx2x *bp)