Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e195c252 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ad79a12e on remote branch 

Change-Id: I8ddf6f1613caaff6338eda2ba39bc1df525b5f5b
parents 1af67b79 ad79a12e

dp/inc/cdp_txrx_cmn_struct.h

+4 −2
Original line number Diff line number Diff line
@@ -2333,7 +2333,8 @@ struct cdp_monitor_filter { 
 * @cfg_dp_tso_enable: get TSO enable config

 * @cfg_dp_lro_enable: get LRO enable config

 * @cfg_dp_gro_enable: get GRP enable config

 * @cfg_dp_force_gro_enable: get Force GRP enable config

 * @cfg_dp_tc_based_dyn_gro_enable: get TC based dynamic gro enable config

 * @cfg_dp_tc_ingress_prio: priority value to be checked for tc filters

 * @cfg_dp_tx_flow_start_queue_offset: get DP TX flow start queue offset

 * @cfg_dp_tx_flow_stop_queue_threshold: get DP TX flow stop queue threshold

 * @cfg_dp_ipa_uc_tx_buf_size: get IPA TX buf size config
@@ -2356,7 +2357,8 @@ enum cdp_dp_cfg { 
	cfg_dp_tso_enable,

	cfg_dp_lro_enable,

	cfg_dp_gro_enable,

	cfg_dp_force_gro_enable,

	cfg_dp_tc_based_dyn_gro_enable,

	cfg_dp_tc_ingress_prio,

	cfg_dp_tx_flow_start_queue_offset,

	cfg_dp_tx_flow_stop_queue_threshold,

	cfg_dp_ipa_uc_tx_buf_size,

dp/wifi3.0/dp_main.c

+7 −3
Original line number Diff line number Diff line
@@ -2691,7 +2691,8 @@ static void dp_soc_interrupt_detach(struct cdp_soc_t *txrx_soc) 
	}



	qdf_mem_set(&soc->mon_intr_id_lmac_map,

		    REG_BAND_UNKNOWN * sizeof(int), DP_MON_INVALID_LMAC_ID);

		    sizeof(soc->mon_intr_id_lmac_map),

		    DP_MON_INVALID_LMAC_ID);

}



#define AVG_MAX_MPDUS_PER_TID 128
@@ -11113,8 +11114,11 @@ static uint32_t dp_get_cfg(struct cdp_soc_t *soc, enum cdp_dp_cfg cfg) 
	case cfg_dp_gro_enable:

		value = dpsoc->wlan_cfg_ctx->gro_enabled;

		break;

	case cfg_dp_force_gro_enable:

		value = dpsoc->wlan_cfg_ctx->force_gro_enabled;

	case cfg_dp_tc_based_dyn_gro_enable:

		value = dpsoc->wlan_cfg_ctx->tc_based_dynamic_gro;

		break;

	case cfg_dp_tc_ingress_prio:

		value = dpsoc->wlan_cfg_ctx->tc_ingress_prio;

		break;

	case cfg_dp_tx_flow_start_queue_offset:

		value = dpsoc->wlan_cfg_ctx->tx_flow_start_queue_offset;

dp/wifi3.0/dp_stats.c

+4 −2
Original line number Diff line number Diff line
@@ -4917,8 +4917,10 @@ void dp_print_soc_cfg_params(struct dp_soc *soc) 
		       soc_cfg_ctx->sg_enabled);

	DP_PRINT_STATS("Gro enabled: %u ",

		       soc_cfg_ctx->gro_enabled);

	DP_PRINT_STATS("Force Gro enabled: %u ",

		       soc_cfg_ctx->force_gro_enabled);

	DP_PRINT_STATS("TC based dynamic GRO: %u ",

		       soc_cfg_ctx->tc_based_dynamic_gro);

	DP_PRINT_STATS("TC ingress prio: %u ",

		       soc_cfg_ctx->tc_ingress_prio);

	DP_PRINT_STATS("rawmode enabled: %u ",

		       soc_cfg_ctx->rawmode_enabled);

	DP_PRINT_STATS("peer flow ctrl enabled: %u ",

hif/src/ce/ce_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3163,7 +3163,7 @@ static void hif_update_rri_over_ddr_config(struct hif_softc *scn, 
 */

int hif_wlan_enable(struct hif_softc *scn)

{

	struct pld_wlan_enable_cfg cfg;

	struct pld_wlan_enable_cfg cfg = { 0 };

	enum pld_driver_mode mode;

	uint32_t con_mode = hif_get_conparam(scn);

wlan_cfg/cfg_dp.h

+17 −4
Original line number Diff line number Diff line
@@ -619,7 +619,8 @@ 
#define WLAN_CFG_GRO_ENABLE_MAX 3

#define WLAN_CFG_GRO_ENABLE_DEFAULT 0

#define DP_GRO_ENABLE_BIT_SET     BIT(0)

#define DP_FORCE_USE_GRO_BIT_SET  BIT(1)

#define DP_TC_BASED_DYNAMIC_GRO   BIT(1)



/*

 * <ini>

 * CFG_DP_GRO - Enable the GRO feature standalonely
@@ -629,9 +630,9 @@ 
 *

 * This ini entry is used to enable/disable GRO feature standalonely.

 * Value 0: Disable GRO feature

 * Value 1: Enable Dynamic GRO feature, TC rule can control GRO

 *          behavior of STA mode

 * Value 3: Enable GRO feature forcibly

 * Value 1: Enable GRO feature always

 * Value 3: Enable GRO dynamic feature where TC rule can control GRO

 *          behavior

 *

 * Usage: External

 *
@@ -644,6 +645,17 @@ 
		WLAN_CFG_GRO_ENABLE_DEFAULT, \

		CFG_VALUE_OR_DEFAULT, "DP GRO Enable")



#define WLAN_CFG_TC_INGRESS_PRIO_MIN 0

#define WLAN_CFG_TC_INGRESS_PRIO_MAX 0xFFFF

#define WLAN_CFG_TC_INGRESS_PRIO_DEFAULT 0



#define CFG_DP_TC_INGRESS_PRIO \

		CFG_INI_UINT("tc_ingress_prio", \

		WLAN_CFG_TC_INGRESS_PRIO_MIN, \

		WLAN_CFG_TC_INGRESS_PRIO_MAX, \

		WLAN_CFG_TC_INGRESS_PRIO_DEFAULT, \

		CFG_VALUE_OR_DEFAULT, "DP tc ingress prio")



#define CFG_DP_OL_TX_CSUM \

	CFG_INI_BOOL("dp_offload_tx_csum_support", false, \

	"DP tx csum Enable")
@@ -1165,6 +1177,7 @@ 
		CFG(CFG_DP_LRO) \

		CFG(CFG_DP_SG) \

		CFG(CFG_DP_GRO) \

		CFG(CFG_DP_TC_INGRESS_PRIO) \

		CFG(CFG_DP_OL_TX_CSUM) \

		CFG(CFG_DP_OL_RX_CSUM) \

		CFG(CFG_DP_RAWMODE) \