A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3529ba79c9 on remote branch

Browse source 
Change-Id: I933ac6e5464eaaabcec3ebf7a740262db9e65c34
This commit is contained in:
Linux Build Service Account 2021-09-17 02:46:10 -07:00
commit 174fa50724
17 changed files with 338 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dp/inc/cdp_txrx_stats_struct.h
View file

@ -365,7 +365,9 @@ enum WDI_EVENT {
WDI_EVENT_PEER_QOS_STATS,
WDI_EVENT_PKT_CAPTURE_TX_DATA,
WDI_EVENT_PKT_CAPTURE_RX_DATA,
WDI_EVENT_PKT_CAPTURE_RX_DATA_NO_PEER,
WDI_EVENT_PKT_CAPTURE_OFFLOAD_TX_DATA,
WDI_EVENT_PKT_CAPTURE_PPDU_STATS,
/* End of new event items */
WDI_EVENT_LAST
};

48
dp/wifi3.0/dp_htt.c
View file

@ -4094,6 +4094,45 @@ static struct ppdu_info *dp_htt_process_tlv(struct dp_pdev *pdev,
}
#endif /* FEATURE_PERPKT_INFO */
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
static void dp_htt_process_stats_tlv(struct dp_soc *soc,
qdf_nbuf_t htt_t2h_msg)
{
uint32_t length;
uint8_t tlv_type;
uint32_t tlv_length, tlv_expected_size;
uint8_t *tlv_buf;
uint32_t *msg_word = (uint32_t *) qdf_nbuf_data(htt_t2h_msg);
length = HTT_T2H_PPDU_STATS_PAYLOAD_SIZE_GET(*msg_word);
msg_word = msg_word + 4;
while (length > 0) {
tlv_buf = (uint8_t *)msg_word;
tlv_type = HTT_STATS_TLV_TAG_GET(*msg_word);
tlv_length = HTT_STATS_TLV_LENGTH_GET(*msg_word);
if (tlv_length == 0)
break;
tlv_length += HTT_TLV_HDR_LEN;
if (tlv_type == HTT_PPDU_STATS_FOR_SMU_TLV) {
tlv_expected_size = sizeof(htt_ppdu_stats_for_smu_tlv);
if (tlv_length >= tlv_expected_size)
dp_wdi_event_handler(
WDI_EVENT_PKT_CAPTURE_PPDU_STATS,
soc, msg_word, HTT_INVALID_VDEV,
WDI_NO_VAL, 0);
}
msg_word = (uint32_t *)((uint8_t *)tlv_buf + tlv_length);
length -= (tlv_length);
}
}
#endif
/**
* dp_txrx_ppdu_stats_handler() - Function to process HTT PPDU stats from FW
* @soc: DP SOC handle
@ -4140,6 +4179,15 @@ static bool dp_txrx_ppdu_stats_handler(struct dp_soc *soc,
return free_buf;
}
#elif defined(WLAN_FEATURE_PKT_CAPTURE_V2)
static bool dp_txrx_ppdu_stats_handler(struct dp_soc *soc,
uint8_t pdev_id, qdf_nbuf_t htt_t2h_msg)
{
if (wlan_cfg_get_pkt_capture_mode(soc->wlan_cfg_ctx))
dp_htt_process_stats_tlv(soc, htt_t2h_msg);
return true;
}
#else
static bool dp_txrx_ppdu_stats_handler(struct dp_soc *soc,
uint8_t pdev_id, qdf_nbuf_t htt_t2h_msg)

31
dp/wifi3.0/dp_rx.c
View file

@ -2250,35 +2250,18 @@ void dp_rx_deliver_to_pkt_capture(struct dp_soc *soc, struct dp_pdev *pdev,
uint16_t peer_id, uint32_t is_offload,
qdf_nbuf_t netbuf)
{
dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA, soc, netbuf,
peer_id, is_offload, pdev->pdev_id);
if (wlan_cfg_get_pkt_capture_mode(soc->wlan_cfg_ctx))
dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA, soc, netbuf,
peer_id, is_offload, pdev->pdev_id);
}
void dp_rx_deliver_to_pkt_capture_no_peer(struct dp_soc *soc, qdf_nbuf_t nbuf,
uint32_t is_offload)
{
uint16_t msdu_len = 0;
uint16_t peer_id, vdev_id;
uint32_t pkt_len = 0;
uint8_t *rx_tlv_hdr;
struct hal_rx_msdu_metadata msdu_metadata;
peer_id = QDF_NBUF_CB_RX_PEER_ID(nbuf);
vdev_id = QDF_NBUF_CB_RX_VDEV_ID(nbuf);
rx_tlv_hdr = qdf_nbuf_data(nbuf);
hal_rx_msdu_metadata_get(soc->hal_soc, rx_tlv_hdr, &msdu_metadata);
msdu_len = QDF_NBUF_CB_RX_PKT_LEN(nbuf);
pkt_len = msdu_len + msdu_metadata.l3_hdr_pad +
RX_PKT_TLVS_LEN;
qdf_nbuf_set_pktlen(nbuf, pkt_len);
dp_rx_skip_tlvs(nbuf, msdu_metadata.l3_hdr_pad);
dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA, soc, nbuf,
HTT_INVALID_VDEV, is_offload, 0);
qdf_nbuf_push_head(nbuf, msdu_metadata.l3_hdr_pad +
RX_PKT_TLVS_LEN);
if (wlan_cfg_get_pkt_capture_mode(soc->wlan_cfg_ctx))
dp_wdi_event_handler(WDI_EVENT_PKT_CAPTURE_RX_DATA_NO_PEER,
soc, nbuf, HTT_INVALID_VDEV,
is_offload, 0);
}
#endif

17
dp/wifi3.0/dp_rx.h
View file

@ -1158,6 +1158,23 @@ dp_rx_update_protocol_tag(struct dp_soc *soc, struct dp_vdev *vdev,
bool is_reo_exception, bool is_update_stats)
{
}
/**
* dp_rx_err_cce_drop() - Reads CCE metadata from the RX MSDU end TLV
* and returns whether cce metadata matches
* @soc: core txrx main context
* @vdev: vdev on which the packet is received
* @nbuf: QDF pkt buffer on which the protocol tag should be set
* @rx_tlv_hdr: rBbase address where the RX TLVs starts
* Return: bool
*/
static inline bool
dp_rx_err_cce_drop(struct dp_soc *soc, struct dp_vdev *vdev,
qdf_nbuf_t nbuf, uint8_t *rx_tlv_hdr)
{
return false;
}
#endif /* WLAN_SUPPORT_RX_PROTOCOL_TYPE_TAG */
#ifndef WLAN_SUPPORT_RX_FLOW_TAG

28
dp/wifi3.0/dp_rx_err.c
View file

@ -779,6 +779,16 @@ dp_rx_chain_msdus(struct dp_soc *soc, qdf_nbuf_t nbuf,
return mpdu_done;
}
#ifdef WLAN_SKIP_BAR_UPDATE
static
void dp_rx_err_handle_bar(struct dp_soc *soc,
struct dp_peer *peer,
qdf_nbuf_t nbuf)
{
dp_info_rl("BAR update to H.W is skipped");
DP_STATS_INC(soc, rx.err.bar_handle_fail_count, 1);
}
#else
static
void dp_rx_err_handle_bar(struct dp_soc *soc,
struct dp_peer *peer,
@ -828,6 +838,7 @@ void dp_rx_err_handle_bar(struct dp_soc *soc,
DP_STATS_INC(soc, rx.err.ssn_update_count, 1);
}
}
#endif
/**
* dp_rx_bar_frame_handle() - Function to handle err BAR frames
@ -1283,6 +1294,23 @@ dp_rx_null_q_desc_handle(struct dp_soc *soc, qdf_nbuf_t nbuf,
/* IEEE80211_SEQ_MAX indicates invalid start_seq */
}
/*
* Drop packets in this path if cce_match is found. Packets will come
* in following path depending on whether tidQ is setup.
* 1. If tidQ is setup: WIFILI_HAL_RX_WBM_REO_PSH_RSN_ROUTE and
* cce_match = 1
* Packets with WIFILI_HAL_RX_WBM_REO_PSH_RSN_ROUTE are already
* dropped.
* 2. If tidQ is not setup: WIFILI_HAL_RX_WBM_REO_PSH_RSN_ERROR and
* cce_match = 1
* These packets need to be dropped and should not get delivered
* to stack.
*/
if (qdf_unlikely(dp_rx_err_cce_drop(soc, vdev, nbuf, rx_tlv_hdr))) {
qdf_nbuf_free(nbuf);
return QDF_STATUS_E_FAILURE;
}
if (qdf_unlikely(vdev->rx_decap_type == htt_cmn_pkt_type_raw)) {
qdf_nbuf_set_next(nbuf, NULL);
dp_rx_deliver_raw(vdev, nbuf, peer);

1
hif/src/ipcie/if_ipci.c
View file

@ -842,6 +842,7 @@ int hif_force_wake_request(struct hif_opaque_softc *hif_handle)
if (pld_is_device_awake(scn->qdf_dev->dev) <= 0) {
hif_err("Unable to wake up mhi");
HIF_STATS_INC(ipci_scn, mhi_force_wake_failure, 1);
hif_force_wake_release(hif_handle);
return -EINVAL;
}
HIF_STATS_INC(ipci_scn, mhi_force_wake_success, 1);

50
os_if/linux/qca_vendor.h
View file

@ -5344,6 +5344,14 @@ enum qca_wlan_vendor_attr_thermal_cmd {
* there is any critical ongoing operation.
*/
QCA_WLAN_VENDOR_ATTR_THERMAL_COMPLETION_WINDOW = 3,
/* Nested attribute, driver/firmware uses this attribute to report
* thermal stats of different thermal levels to userspace when requested
* using QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_GET_THERMAL_STATS command
* type. This attribute contains nested array of records of thermal
* statistics of multiple levels. The attributes used inside this nested
* attribute are defined in enum qca_wlan_vendor_attr_thermal_stats.
*/
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS = 4,
/* keep last */
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_AFTER_LAST,
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_MAX =
@ -5368,6 +5376,16 @@ enum qca_wlan_vendor_attr_thermal_cmd {
* resume action.
* @QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_SET_LEVEL: Configure thermal level to
* the driver/firmware.
* @QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_GET_LEVEL: Request to get the current
* thermal level from the driver/firmware. The driver should respond with a
* thermal level defined in enum qca_wlan_vendor_thermal_level.
* @QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_GET_THERMAL_STATS: Request to get the
* current thermal stats from the driver/firmware. The driver should respond
* with stats of all thermal levels encapsulated in attribute
* QCA_WLAN_VENDOR_ATTR_THERMAL_STATS.
* @QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_CLEAR_THERMAL_STATS: Request to clear
* the current thermal stats all thermal levels maintained in the
* driver/firmware and start counting from zero again.
*/
enum qca_wlan_vendor_attr_thermal_cmd_type {
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_GET_PARAMS,
@ -5375,6 +5393,9 @@ enum qca_wlan_vendor_attr_thermal_cmd_type {
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_SUSPEND,
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_RESUME,
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_SET_LEVEL,
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_GET_LEVEL,
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_GET_THERMAL_STATS,
QCA_WLAN_VENDOR_ATTR_THERMAL_CMD_TYPE_CLEAR_THERMAL_STATS,
};
/**
@ -7676,6 +7697,35 @@ enum qca_wlan_vendor_attr_mac_info {
};
/**
* enum qca_wlan_vendor_attr_thermal_stats - vendor subcmd attributes
* to get thermal status from driver/firmware.
* enum values are used for NL attributes encapsulated inside
* QCA_WLAN_VENDOR_ATTR_THERMAL_STATS nested attribute.
*
* QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_MIN_TEMPERATURE: Minimum temperature
* of a thermal level in Celsius. u32 size.
* QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_MAX_TEMPERATURE: Maximum temperature
* of a thermal level in Celsius. u32 size.
* QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_DWELL_TIME: The total time spent on each
* thermal level in milliseconds. u32 size.
* QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_TEMP_LEVEL_COUNTER: Indicates the number
* of times the temperature crossed into the temperature range defined by the
* thermal level from both higher and lower directions. u32 size.
*/
enum qca_wlan_vendor_attr_thermal_stats {
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_INVALID = 0,
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_MIN_TEMPERATURE,
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_MAX_TEMPERATURE,
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_DWELL_TIME,
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_TEMP_LEVEL_COUNTER,
/* keep last */
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_AFTER_LAST,
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_MAX =
QCA_WLAN_VENDOR_ATTR_THERMAL_STATS_AFTER_LAST - 1,
};
/**
* enum he_fragmentation_val - HE fragmentation support values
* Indicates level of dynamic fragmentation that is supported by

23
qdf/inc/qdf_nbuf.h
View file

@ -254,6 +254,9 @@
* @tx_status: packet tx status
* @tx_retry_cnt: tx retry count
* @add_rtap_ext: add radio tap extension
* @start_seq: starting sequence number
* @ba_bitmap: 256 bit block ack bitmap
* @add_rtap_ext2: add radiotap extension2
*/
struct mon_rx_status {
uint64_t tsft;
@ -338,6 +341,9 @@ struct mon_rx_status {
uint8_t tx_status;
uint8_t tx_retry_cnt;
bool add_rtap_ext;
uint16_t start_seq;
uint32_t ba_bitmap[8];
bool add_rtap_ext2;
};
/**
@ -434,6 +440,23 @@ struct qdf_radiotap_vendor_ns_ath {
uint32_t ppdu_start_timestamp;
} __attribute__((__packed__));
/**
* struct qdf_radiotap_ext2 - radiotap ext2 fields
* ppdu_id: ppdu_id of current msdu
* prev_ppdu_id: ppdu_id of previous msdu
* tid: tid number of previous msdu
* start_seq: start sequence of previous msdu
* ba_bitmap: block ack bitmap of previous msdu
*/
struct qdf_radiotap_ext2 {
uint32_t ppdu_id;
uint32_t prev_ppdu_id;
uint16_t tid:8,
reserved:8;
uint16_t start_seq;
uint32_t ba_bitmap[8];
} __attribute__((__packed__));
#define QDF_MEM_FUNC_NAME_SIZE 48
/* Masks for HE SIG known fields in mon_rx_status structure */

25
qdf/linux/src/qdf_nbuf.c
View file

@ -4361,6 +4361,7 @@ qdf_nbuf_update_radiotap_he_mu_other_flags(struct mon_rx_status *rx_status,
#define IEEE80211_RADIOTAP_TX_STATUS 0
#define IEEE80211_RADIOTAP_RETRY_COUNT 1
#define IEEE80211_RADIOTAP_EXTENSION2 2
/**
* This is the length for radiotap, combined length
@ -4384,6 +4385,8 @@ qdf_nbuf_update_radiotap_he_mu_other_flags(struct mon_rx_status *rx_status,
* 4 bytes padding for alignment
*/
#define RADIOTAP_HEADER_EXT_LEN (2 * sizeof(uint32_t))
#define RADIOTAP_HEADER_EXT2_LEN \
(sizeof(struct qdf_radiotap_ext2))
#define RADIOTAP_HEADER_LEN (sizeof(struct ieee80211_radiotap_header) + \
RADIOTAP_FIXED_HEADER_LEN + \
RADIOTAP_HT_FLAGS_LEN + \
@ -4393,7 +4396,8 @@ qdf_nbuf_update_radiotap_he_mu_other_flags(struct mon_rx_status *rx_status,
RADIOTAP_HE_MU_FLAGS_LEN + \
RADIOTAP_HE_MU_OTHER_FLAGS_LEN + \
RADIOTAP_VENDOR_NS_LEN + \
RADIOTAP_HEADER_EXT_LEN)
RADIOTAP_HEADER_EXT_LEN + \
RADIOTAP_HEADER_EXT2_LEN)
#define IEEE80211_RADIOTAP_HE 23
#define IEEE80211_RADIOTAP_HE_MU 24
@ -4452,6 +4456,7 @@ unsigned int qdf_nbuf_update_radiotap(struct mon_rx_status *rx_status,
uint32_t rtap_len = rtap_hdr_len;
uint8_t length = rtap_len;
struct qdf_radiotap_vendor_ns_ath *radiotap_vendor_ns_ath;
struct qdf_radiotap_ext2 *rtap_ext2;
uint32_t *rtap_ext = NULL;
/* Adding Extended Header space */
@ -4657,6 +4662,24 @@ unsigned int qdf_nbuf_update_radiotap(struct mon_rx_status *rx_status,
rtap_len += 1;
}
/* Add Extension2 to Radiotap Header */
if (rx_status->add_rtap_ext2) {
rthdr->it_present |= cpu_to_le32(1 << IEEE80211_RADIOTAP_EXT);
rtap_ext = (uint32_t *)&rthdr->it_present;
rtap_ext++;
*rtap_ext |= cpu_to_le32(1 << IEEE80211_RADIOTAP_EXTENSION2);
rtap_ext2 = (struct qdf_radiotap_ext2 *)(rtap_buf + rtap_len);
rtap_ext2->ppdu_id = rx_status->ppdu_id;
rtap_ext2->prev_ppdu_id = rx_status->prev_ppdu_id;
rtap_ext2->tid = rx_status->tid;
rtap_ext2->start_seq = rx_status->start_seq;
qdf_mem_copy(rtap_ext2->ba_bitmap,
rx_status->ba_bitmap, 8 * (sizeof(uint32_t)));
rtap_len += sizeof(*rtap_ext2);
}
rthdr->it_len = cpu_to_le16(rtap_len);
rthdr->it_present = cpu_to_le32(rthdr->it_present);

9
target_if/cfr/src/target_if_cfr_enh.c
View file

@ -44,6 +44,14 @@ static u_int32_t end_magic = 0xBEAFDEAD;
*
* Return: signal strength in dBm
*/
#if defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_WCN7850)
static inline
u_int32_t snr_to_signal_strength(uint8_t snr)
{
/* target onverts snr to dBm */
return snr;
}
#else
static inline
u_int32_t snr_to_signal_strength(uint8_t snr)
{
@ -52,6 +60,7 @@ u_int32_t snr_to_signal_strength(uint8_t snr)
(((int8_t)snr) + CMN_NOISE_FLOOR) :
((int8_t)snr);
}
#endif
/**
* get_lut_entry() - Retrieve LUT entry using cookie number

4
umac/scan/dispatcher/inc/wlan_scan_cfg.h
View file

@ -802,7 +802,7 @@ enum scan_mode_6ghz {
* mawc_nlo_enabled - For NLO/PNO, enable MAWC based scan
* @Min: 0
* @Max: 1
* @Default: 1
* @Default: 0
*
* Enable/Disable the Motion Aided Wireless Connectivity
* based NLO using this parameter
@ -815,7 +815,7 @@ enum scan_mode_6ghz {
*/
#define CFG_MAWC_NLO_ENABLED CFG_INI_BOOL( \
"mawc_nlo_enabled", \
1, \
0, \
"Enable MAWC based scan")
/*

2
umac/scan/dispatcher/inc/wlan_scan_utils_api.h
View file

@ -713,7 +713,9 @@ util_scan_copy_beacon_data(struct scan_cache_entry *new_entry,
ie_lst->bwnss_map = conv_ptr(ie_lst->bwnss_map, old_ptr, new_ptr);
ie_lst->mdie = conv_ptr(ie_lst->mdie, old_ptr, new_ptr);
ie_lst->hecap = conv_ptr(ie_lst->hecap, old_ptr, new_ptr);
ie_lst->hecap_6g = conv_ptr(ie_lst->hecap_6g, old_ptr, new_ptr);
ie_lst->heop = conv_ptr(ie_lst->heop, old_ptr, new_ptr);
ie_lst->srp = conv_ptr(ie_lst->srp, old_ptr, new_ptr);
ie_lst->fils_indication = conv_ptr(ie_lst->fils_indication,
old_ptr, new_ptr);
ie_lst->esp = conv_ptr(ie_lst->esp, old_ptr, new_ptr);

47
umac/scan/dispatcher/src/wlan_scan_utils_api.c
View file

@ -2147,18 +2147,6 @@ util_handle_nontx_prof(uint8_t *mbssid_elem, uint8_t *subelement,
uint32_t prof_len;
prof_len = subelement[TAG_LEN_POS];
/*
* if prof_residue is true, that means we are
* in the continuation of the fragmented profile part,
* present in the next MBSSD IE else this profile
* is a non fragmented non tx BSSID profile.
*/
if (mbssid_info->prof_residue)
mbssid_info->split_prof_continue = true;
else
mbssid_info->split_prof_continue = false;
/*
* If we are executing the split portion of the nontx
* profile present in the subsequent MBSSID, then there
@ -2221,6 +2209,12 @@ util_handle_nontx_prof(uint8_t *mbssid_elem, uint8_t *subelement,
mbssid_index_ie[BSS_INDEX_POS],
new_bssid);
}
/* In single MBSS IE, there could be subelement holding
* remaining vendor IEs of non tx profile from last MBSS IE
* [split profile] and new non tx profile, hence reset
* skip_bssid_copy flag after each subelement processing
*/
mbssid_info->skip_bssid_copy = false;
return VALID_NONTX_PROF;
}
@ -2331,13 +2325,30 @@ static QDF_STATUS util_scan_parse_mbssid(struct wlan_objmgr_pdev *pdev,
mbssid_info.split_profile =
util_scan_is_split_prof_found(next_elem, ie, ielen);
mbssid_info.skip_bssid_copy = false;
for (subelement = mbssid_elem + SUBELEMENT_START_POS;
subelement < (next_elem - 1);
subelement += MIN_IE_LEN + subelement[TAG_LEN_POS]) {
subie_len = subelement[TAG_LEN_POS];
/*
* if prof_residue is true, that means we are
* in the continuation of the fragmented profile part,
* present in the next MBSSD IE else this profile
* is a non fragmented non tx BSSID profile.
*/
if (mbssid_info.prof_residue)
mbssid_info.split_prof_continue = true;
else
mbssid_info.split_prof_continue = false;
if (subie_len > MAX_SUBELEM_LEN) {
scm_err_rl("Corrupt frame with subie_len: %d\n"
"split_prof_continue: %d\n"
"prof_residue: %d\n",
subie_len,
mbssid_info.split_prof_continue,
mbssid_info.prof_residue);
if (mbssid_info.split_prof_continue)
qdf_mem_free(split_prof_start);
@ -2356,6 +2367,10 @@ static QDF_STATUS util_scan_parse_mbssid(struct wlan_objmgr_pdev *pdev,
bssid, new_bssid);
if (retval == INVALID_SPLIT_PROF) {
scm_err_rl("Corrupt frame with ID_POS: %d\n"
"TAG_LEN_POS: %d\n",
subelement[ID_POS],
subelement[TAG_LEN_POS]);
qdf_mem_free(split_prof_start);
qdf_mem_free(new_ie);
return QDF_STATUS_E_INVAL;
@ -2390,6 +2405,7 @@ static QDF_STATUS util_scan_parse_mbssid(struct wlan_objmgr_pdev *pdev,
split_prof_start =
qdf_mem_malloc(ielen);
if (!split_prof_start) {
scm_err_rl("Malloc failed");
qdf_mem_free(new_ie);
return QDF_STATUS_E_NOMEM;
}
@ -2487,6 +2503,9 @@ static QDF_STATUS util_scan_parse_mbssid(struct wlan_objmgr_pdev *pdev,
if (mbssid_info.split_prof_continue)
qdf_mem_free(split_prof_start);
qdf_mem_free(new_ie);
scm_err_rl("Malloc for new_frame failed");
scm_err_rl("split_prof_continue: %d",
mbssid_info.split_prof_continue);
return QDF_STATUS_E_NOMEM;
}
@ -2527,6 +2546,8 @@ static QDF_STATUS util_scan_parse_mbssid(struct wlan_objmgr_pdev *pdev,
}
qdf_mem_free(new_frame);
scm_err_rl("failed to generate a scan entry");
scm_err_rl("split_prof_continue: %d",
mbssid_info.split_prof_continue);
break;
}
/* scan entry makes its own copy so free the frame*/

2
utils/fwlog/dbglog_host.c
View file

@ -1693,7 +1693,7 @@ process_fw_diag_event_data(uint8_t *datap, uint32_t num_data)
uint32_t diag_data_len; /* each fw diag payload */
struct wlan_diag_data *diag_data;
while (num_data > 0) {
while (num_data >= sizeof(struct wlan_diag_data)) {
diag_data = (struct wlan_diag_data *)datap;
diag_type = WLAN_DIAG_0_TYPE_GET(diag_data->word0);
diag_data_len = WLAN_DIAG_0_LEN_GET(diag_data->word0);

31
wlan_cfg/wlan_cfg.c
View file

@ -657,6 +657,10 @@ wlan_cfg_soc_attach(struct cdp_ctrl_objmgr_psoc *psoc)
wlan_cfg_ctx->wow_check_rx_pending_enable =
cfg_get(psoc, CFG_DP_WOW_CHECK_RX_PENDING);
wlan_soc_ipa_cfg_attach(psoc, wlan_cfg_ctx);
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
wlan_cfg_ctx->pkt_capture_mode = cfg_get(psoc, CFG_PKT_CAPTURE_MODE) &
PKT_CAPTURE_MODE_DATA_ONLY;
#endif
return wlan_cfg_ctx;
}
@ -1520,3 +1524,30 @@ uint32_t wlan_cfg_ipa_tx_comp_ring_size(struct wlan_cfg_dp_soc_ctxt *cfg)
return cfg->ipa_tx_comp_ring_size;
}
#endif
void
wlan_cfg_get_prealloc_cfg(struct cdp_ctrl_objmgr_psoc *ctrl_psoc,
struct wlan_dp_prealloc_cfg *cfg)
{
if (!ctrl_psoc || !cfg)
return;
cfg->num_tx_ring_entries = cfg_get(ctrl_psoc, CFG_DP_TX_RING_SIZE);
cfg->num_tx_comp_ring_entries = cfg_get(ctrl_psoc,
CFG_DP_TX_COMPL_RING_SIZE);
cfg->num_wbm_rel_ring_entries = cfg_get(ctrl_psoc,
CFG_DP_WBM_RELEASE_RING);
cfg->num_rxdma_err_dst_ring_entries = cfg_get(ctrl_psoc,
CFG_DP_RXDMA_ERR_DST_RING);
cfg->num_reo_exception_ring_entries = cfg_get(ctrl_psoc,
CFG_DP_REO_EXCEPTION_RING);
cfg->num_tx_desc = cfg_get(ctrl_psoc, CFG_DP_TX_DESC);
cfg->num_tx_ext_desc = cfg_get(ctrl_psoc, CFG_DP_TX_EXT_DESC);
}
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
uint32_t wlan_cfg_get_pkt_capture_mode(struct wlan_cfg_dp_soc_ctxt *cfg)
{
return cfg->pkt_capture_mode;
}
#endif

51
wlan_cfg/wlan_cfg.h
View file

@ -197,6 +197,7 @@ struct wlan_srng_cfg {
* @wow_check_rx_pending_enable: Enable RX frame pending check in WoW
* @ipa_tx_ring_size: IPA tx ring size
* @ipa_tx_comp_ring_size: IPA tx completion ring size
* @pkt_capture_mode: Packet capture mode config
*/
struct wlan_cfg_dp_soc_ctxt {
int num_int_ctxts;
@ -316,6 +317,9 @@ struct wlan_cfg_dp_soc_ctxt {
uint32_t ipa_tx_ring_size;
uint32_t ipa_tx_comp_ring_size;
#endif
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
uint32_t pkt_capture_mode;
#endif
};
/**
@ -336,6 +340,26 @@ struct wlan_cfg_dp_pdev_ctxt {
int nss_enabled;
};
/**
* struct wlan_dp_prealloc_cfg - DP prealloc related config
* @num_tx_ring_entries: num of tcl data ring entries
* @num_tx_comp_ring_entries: num of tx comp ring entries
* @num_wbm_rel_ring_entries: num of wbm err ring entries
* @num_rxdma_err_dst_ring_entries: num of rxdma err ring entries
* @num_reo_exception_ring_entries: num of rx exception ring entries
* @num_tx_desc: num of tx descriptors
* @num_tx_ext_desc: num of tx ext descriptors
*/
struct wlan_dp_prealloc_cfg {
int num_tx_ring_entries;
int num_tx_comp_ring_entries;
int num_wbm_rel_ring_entries;
int num_rxdma_err_dst_ring_entries;
int num_reo_exception_ring_entries;
int num_tx_desc;
int num_tx_ext_desc;
};
/**
* wlan_cfg_soc_attach() - Attach configuration interface for SoC
* @ctrl_obj - PSOC object
@ -1535,4 +1559,31 @@ uint32_t wlan_cfg_ipa_tx_comp_ring_size(struct wlan_cfg_dp_soc_ctxt *cfg)
return 0;
}
#endif
/**
* wlan_cfg_get_prealloc_cfg() - Get dp prealloc related cfg param
* @ctrl_psoc - PSOC object
* @cfg - cfg ctx where values will be populated
*
* Return: None
*/
void
wlan_cfg_get_prealloc_cfg(struct cdp_ctrl_objmgr_psoc *ctrl_psoc,
struct wlan_dp_prealloc_cfg *cfg);
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
/**
* wlan_cfg_get_pkt_capture_mode() - Get packet capture mode config
* @cfg: config context
*
* Return: value of packet capture mode
*/
uint32_t wlan_cfg_get_pkt_capture_mode(struct wlan_cfg_dp_soc_ctxt *cfg);
#else
static inline
uint32_t wlan_cfg_get_pkt_capture_mode(struct wlan_cfg_dp_soc_ctxt *cfg)
{
return 0;
}
#endif
#endif

8
wmi/src/wmi_unified_tlv.c
View file

@ -10249,6 +10249,11 @@ static QDF_STATUS extract_mgmt_rx_params_tlv(wmi_unified_t wmi_handle,
return QDF_STATUS_E_INVAL;
}
if (ev_hdr->buf_len > param_tlvs->num_bufp) {
wmi_err("Rx mgmt frame length mismatch, discard it");
return QDF_STATUS_E_INVAL;
}
hdr->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
wmi_handle,
ev_hdr->pdev_id);
@ -11665,6 +11670,9 @@ static QDF_STATUS extract_fips_event_data_tlv(wmi_unified_t wmi_handle,
param_buf = (WMI_PDEV_FIPS_EVENTID_param_tlvs *) evt_buf;
event = (wmi_pdev_fips_event_fixed_param *) param_buf->fixed_param;
if (event->data_len > param_buf->num_data)
return QDF_STATUS_E_FAILURE;
if (fips_conv_data_be(event->data_len, param_buf->data) !=
QDF_STATUS_SUCCESS)
return QDF_STATUS_E_FAILURE;