From d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 02:45:28 +0000
Subject: [PATCH] add boot partition size
---
kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/dhd_common.c | 6200 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 5,277 insertions(+), 923 deletions(-)
diff --git a/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/dhd_common.c b/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/dhd_common.c
index 9e5aa7e..97f74a8 100644
--- a/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/dhd_common.c
+++ b/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/dhd_common.c
@@ -1,15 +1,16 @@
-/* SPDX-License-Identifier: GPL-2.0 */
/*
* Broadcom Dongle Host Driver (DHD), common DHD core.
*
- * Copyright (C) 1999-2019, Broadcom Corporation
- *
+ * Portions of this code are copyright (c) 2022 Cypress Semiconductor Corporation
+ *
+ * Copyright (C) 1999-2017, Broadcom Corporation
+ *
* Unless you and Broadcom execute a separate written software license
* agreement governing use of this software, this software is licensed to you
* under the terms of the GNU General Public License version 2 (the "GPL"),
* available at http://www.broadcom.com/licenses/GPLv2.php, with the
* following added to such license:
- *
+ *
* As a special exception, the copyright holders of this software give you
* permission to link this software with independent modules, and to copy and
* distribute the resulting executable under terms of your choice, provided that
@@ -17,7 +18,7 @@
* the license of that module. An independent module is a module which is not
* derived from this software. The special exception does not apply to any
* modifications of the software.
- *
+ *
* Notwithstanding the above, under no circumstances may you combine this
* software in any way with any other Broadcom software provided under a license
* other than the GPL, without Broadcom's express prior written consent.
@@ -25,20 +26,25 @@
*
* <<Broadcom-WL-IPTag/Open:>>
*
- * $Id: dhd_common.c 715966 2019-05-30 02:36:59Z $
+ * $Id: dhd_common.c 701858 2017-05-26 20:20:58Z $
*/
#include <typedefs.h>
#include <osl.h>
#include <epivers.h>
#include <bcmutils.h>
+#include <bcmstdlib_s.h>
#include <bcmendian.h>
#include <dngl_stats.h>
-#include <wlioctl.h>
#include <dhd.h>
#include <dhd_ip.h>
-#include <proto/bcmevent.h>
+#include <bcmevent.h>
+#include <dhdioctl.h>
+
+#ifdef PCIE_FULL_DONGLE
+#include <bcmmsgbuf.h>
+#endif /* PCIE_FULL_DONGLE */
#ifdef SHOW_LOGTRACE
#include <event_log.h>
@@ -46,37 +52,47 @@
#ifdef BCMPCIE
#include <dhd_flowring.h>
-#endif
+#endif // endif
-#ifdef BCMDBUS
-#include <dbus.h>
-#else
#include <dhd_bus.h>
-#endif /* BCMDBUS */
#include <dhd_proto.h>
#include <dhd_dbg.h>
+#include <802.1d.h>
#include <dhd_debug.h>
+#include <dhd_dbg_ring.h>
+#include <dhd_mschdbg.h>
#include <msgtrace.h>
#ifdef WL_CFG80211
#include <wl_cfg80211.h>
-#endif
-#ifdef PNO_SUPPORT
+#endif // endif
+#if defined(OEM_ANDROID) && defined(PNO_SUPPORT)
#include <dhd_pno.h>
-#endif
+#endif /* OEM_ANDROID && PNO_SUPPORT */
#ifdef RTT_SUPPORT
#include <dhd_rtt.h>
-#endif
+#endif // endif
+
+#ifdef DNGL_EVENT_SUPPORT
+#include <dnglevent.h>
+#endif // endif
+
+#define htod32(i) (i)
+#define htod16(i) (i)
+#define dtoh32(i) (i)
+#define dtoh16(i) (i)
+#define htodchanspec(i) (i)
+#define dtohchanspec(i) (i)
#ifdef PROP_TXSTATUS
#include <wlfc_proto.h>
#include <dhd_wlfc.h>
-#endif
+#endif // endif
-#ifdef DHD_WMF
+#include <dhd_linux_priv.h>
+#if defined(DHD_POST_EAPOL_M1_AFTER_ROAM_EVT)
#include <dhd_linux.h>
-#include <dhd_wmf_linux.h>
-#endif /* DHD_WMF */
+#endif // endif
#ifdef DHD_L2_FILTER
#include <dhd_l2_filter.h>
@@ -90,32 +106,77 @@
#include <dhd_wet.h>
#endif /* DHD_WET */
-#ifdef WLMEDIA_HTSF
-extern void htsf_update(struct dhd_info *dhd, void *data);
-#endif
+#ifdef DHD_LOG_DUMP
+#include <dhd_dbg.h>
+#ifdef DHD_PKT_LOGGING
+#include <dhd_pktlog.h>
+#endif /* DHD_PKT_LOGGING */
+#endif /* DHD_LOG_DUMP */
-int dhd_msg_level = DHD_ERROR_VAL | DHD_MSGTRACE_VAL | DHD_EVENT_VAL;
+#ifdef DHD_LOG_PRINT_RATE_LIMIT
+int log_print_threshold = 0;
+#endif /* DHD_LOG_PRINT_RATE_LIMIT */
+int dhd_msg_level = DHD_ERROR_VAL | DHD_FWLOG_VAL | DHD_EVENT_VAL
+ /* For CUSTOMER_HW4 do not enable DHD_IOVAR_MEM_VAL by default */
+#if !defined(BOARD_HIKEY)
+ | DHD_IOVAR_MEM_VAL
+#endif // endif
+#ifndef OEM_ANDROID
+ | DHD_MSGTRACE_VAL
+#endif /* OEM_ANDROID */
+ | DHD_PKT_MON_VAL;
-
-#if defined(WL_WLC_SHIM)
-#include <wl_shim.h>
-#else
-#endif /* WL_WLC_SHIM */
-
+#if defined(OEM_ANDROID) && defined(WL_WIRELESS_EXT)
#include <wl_iw.h>
+#endif /* defined(OEM_ANDROID) && defined(WL_WIRELESS_EXT) */
#ifdef DHD_ULP
#include <dhd_ulp.h>
#endif /* DHD_ULP */
-#ifdef SOFTAP
-char fw_path2[MOD_PARAM_PATHLEN];
-extern bool softap_enabled;
-#endif
-
#ifdef DHD_DEBUG
#include <sdiovar.h>
#endif /* DHD_DEBUG */
+
+#ifdef DHD_PCIE_NATIVE_RUNTIMEPM
+#include <linux/pm_runtime.h>
+#endif /* DHD_PCIE_NATIVE_RUNTIMEPM */
+
+#ifdef SOFTAP
+char fw_path2[MOD_PARAM_PATHLEN];
+extern bool softap_enabled;
+#endif // endif
+
+#ifdef SHOW_LOGTRACE
+#define BYTES_AHEAD_NUM 10 /* address in map file is before these many bytes */
+#define READ_NUM_BYTES 1000 /* read map file each time this No. of bytes */
+#define GO_BACK_FILE_POS_NUM_BYTES 100 /* set file pos back to cur pos */
+static char *ramstart_str = " text_start"; /* string in mapfile has addr ramstart */
+static char *rodata_start_str = " rodata_start"; /* string in mapfile has addr rodata start */
+static char *rodata_end_str = " rodata_end"; /* string in mapfile has addr rodata end */
+#define RAMSTART_BIT 0x01
+#define RDSTART_BIT 0x02
+#define RDEND_BIT 0x04
+#define ALL_MAP_VAL (RAMSTART_BIT | RDSTART_BIT | RDEND_BIT)
+#endif /* SHOW_LOGTRACE */
+
+#ifdef SHOW_LOGTRACE
+/* the fw file path is taken from either the module parameter at
+ * insmod time or is defined as a constant of different values
+ * for different platforms
+ */
+extern char *st_str_file_path;
+#endif /* SHOW_LOGTRACE */
+
+#define DHD_TPUT_MAX_TX_PKTS_BATCH 1000
+
+#ifdef EWP_EDL
+typedef struct msg_hdr_edl {
+ uint32 infobuf_ver;
+ info_buf_payload_hdr_t pyld_hdr;
+ msgtrace_hdr_t trace_hdr;
+} msg_hdr_edl_t;
+#endif /* EWP_EDL */
/* Last connection success/failure status */
uint32 dhd_conn_event;
@@ -128,46 +189,55 @@
void dhd_iscan_lock(void);
void dhd_iscan_unlock(void);
extern int dhd_change_mtu(dhd_pub_t *dhd, int new_mtu, int ifidx);
-#if !defined(AP) && defined(WLP2P)
+#if defined(OEM_ANDROID) && !defined(AP) && defined(WLP2P)
extern int dhd_get_concurrent_capabilites(dhd_pub_t *dhd);
-#endif
+#endif // endif
-#ifdef BCMDHDUSB
-int dhd_socram_dump(struct dhd_bus *bus) { return -1; }
-#else
extern int dhd_socram_dump(struct dhd_bus *bus);
-#endif /* BCMDHDUSB */
+extern void dhd_set_packet_filter(dhd_pub_t *dhd);
+
+#ifdef DNGL_EVENT_SUPPORT
+static void dngl_host_event_process(dhd_pub_t *dhdp, bcm_dngl_event_t *event,
+ bcm_dngl_event_msg_t *dngl_event, size_t pktlen);
+static int dngl_host_event(dhd_pub_t *dhdp, void *pktdata, bcm_dngl_event_msg_t *dngl_event,
+ size_t pktlen);
+#endif /* DNGL_EVENT_SUPPORT */
+
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+static void copy_hang_info_ioctl_timeout(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc);
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
#define MAX_CHUNK_LEN 1408 /* 8 * 8 * 22 */
+#if defined(OEM_ANDROID)
bool ap_cfg_running = FALSE;
bool ap_fw_loaded = FALSE;
+#endif /* defined(OEM_ANDROID) && defined(SOFTAP) */
/* Version string to report */
#ifdef DHD_DEBUG
#ifndef SRCBASE
#define SRCBASE "drivers/net/wireless/bcmdhd"
-#endif
+#endif // endif
#define DHD_COMPILED "\nCompiled in " SRCBASE
#endif /* DHD_DEBUG */
+#define CHIPID_MISMATCH 8
+
#if defined(DHD_DEBUG)
const char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR
- DHD_COMPILED;
+ DHD_COMPILED " on " __DATE__ " at " __TIME__;
#else
const char dhd_version[] = "\nDongle Host Driver, version " EPI_VERSION_STR "\nCompiled from ";
-#endif
+#endif // endif
+char fw_version[FW_VER_STR_LEN] = "\0";
+char clm_version[CLM_VER_STR_LEN] = "\0";
+
+char bus_api_revision[BUS_API_REV_STR_LEN] = "\0";
void dhd_set_timer(void *bus, uint wdtick);
-#if defined(TRAFFIC_MGMT_DWM)
-static int traffic_mgmt_add_dwm_filter(dhd_pub_t *dhd,
- trf_mgmt_filter_list_t * trf_mgmt_filter_list, int len);
-#endif
-
-#ifdef HOST_FLAG
-extern int hostsleep;
-#endif
+static char* ioctl2str(uint32 ioctl);
/* IOVar table */
enum {
@@ -183,11 +253,15 @@
IOV_LOGSTAMP,
IOV_GPIOOB,
IOV_IOCTLTIMEOUT,
-#if defined(DHD_DEBUG)
IOV_CONS,
IOV_DCONSOLE_POLL,
+#if defined(DHD_DEBUG)
IOV_DHD_JOIN_TIMEOUT_DBG,
IOV_SCAN_TIMEOUT,
+ IOV_MEM_DEBUG,
+#ifdef BCMPCIE
+ IOV_FLOW_RING_DEBUG,
+#endif /* BCMPCIE */
#endif /* defined(DHD_DEBUG) */
#ifdef PROP_TXSTATUS
IOV_PROPTXSTATUS_ENABLE,
@@ -199,35 +273,18 @@
IOV_PROPTXSTATUS_RXPKT_CHK,
#endif /* PROP_TXSTATUS */
IOV_BUS_TYPE,
-#ifdef WLMEDIA_HTSF
- IOV_WLPKTDLYSTAT_SZ,
-#endif
IOV_CHANGEMTU,
IOV_HOSTREORDER_FLOWS,
#ifdef DHDTCPACK_SUPPRESS
IOV_TCPACK_SUPPRESS,
#endif /* DHDTCPACK_SUPPRESS */
-#ifdef DHD_WMF
- IOV_WMF_BSS_ENAB,
- IOV_WMF_UCAST_IGMP,
- IOV_WMF_MCAST_DATA_SENDUP,
-#ifdef WL_IGMP_UCQUERY
- IOV_WMF_UCAST_IGMP_QUERY,
-#endif /* WL_IGMP_UCQUERY */
-#ifdef DHD_UCAST_UPNP
- IOV_WMF_UCAST_UPNP,
-#endif /* DHD_UCAST_UPNP */
- IOV_WMF_PSTA_DISABLE,
-#endif /* DHD_WMF */
-#if defined(TRAFFIC_MGMT_DWM)
- IOV_TRAFFIC_MGMT_DWM,
-#endif
IOV_AP_ISOLATE,
#ifdef DHD_L2_FILTER
IOV_DHCP_UNICAST,
IOV_BLOCK_PING,
IOV_PROXY_ARP,
IOV_GRAT_ARP,
+ IOV_BLOCK_TDLS,
#endif /* DHD_L2_FILTER */
IOV_DHD_IE,
#ifdef DHD_PSTA
@@ -243,96 +300,522 @@
IOV_LMTEST,
#ifdef DHD_MCAST_REGEN
IOV_MCAST_REGEN_BSS_ENABLE,
-#endif
+#endif // endif
+#ifdef SHOW_LOGTRACE
+ IOV_DUMP_TRACE_LOG,
+#endif /* SHOW_LOGTRACE */
+ IOV_DONGLE_TRAP_TYPE,
+ IOV_DONGLE_TRAP_INFO,
+ IOV_BPADDR,
+ IOV_DUMP_DONGLE, /**< dumps core registers and d11 memories */
+#if defined(DHD_LOG_DUMP)
+ IOV_LOG_DUMP,
+#endif /* DHD_LOG_DUMP */
+ IOV_TPUT_TEST,
+ IOV_FIS_TRIGGER,
+ IOV_DEBUG_BUF_DEST_STAT,
+#ifdef DHD_DEBUG
+ IOV_INDUCE_ERROR,
+#endif /* DHD_DEBUG */
+#ifdef WL_IFACE_MGMT_CONF
+#ifdef WL_CFG80211
+#ifdef WL_NANP2P
+ IOV_CONC_DISC,
+#endif /* WL_NANP2P */
+#ifdef WL_IFACE_MGMT
+ IOV_IFACE_POLICY,
+#endif /* WL_IFACE_MGMT */
+#endif /* WL_CFG80211 */
+#endif /* WL_IFACE_MGMT_CONF */
IOV_LAST
};
const bcm_iovar_t dhd_iovars[] = {
- {"version", IOV_VERSION, 0, IOVT_BUFFER, sizeof(dhd_version) },
+ /* name varid flags flags2 type minlen */
+ {"version", IOV_VERSION, 0, 0, IOVT_BUFFER, sizeof(dhd_version)},
#ifdef DHD_DEBUG
- {"msglevel", IOV_MSGLEVEL, 0, IOVT_UINT32, 0 },
+ {"msglevel", IOV_MSGLEVEL, 0, 0, IOVT_UINT32, 0},
+ {"mem_debug", IOV_MEM_DEBUG, 0, 0, IOVT_BUFFER, 0 },
+#ifdef BCMPCIE
+ {"flow_ring_debug", IOV_FLOW_RING_DEBUG, 0, 0, IOVT_BUFFER, 0 },
+#endif /* BCMPCIE */
#endif /* DHD_DEBUG */
- {"bcmerrorstr", IOV_BCMERRORSTR, 0, IOVT_BUFFER, BCME_STRLEN },
- {"bcmerror", IOV_BCMERROR, 0, IOVT_INT8, 0 },
- {"wdtick", IOV_WDTICK, 0, IOVT_UINT32, 0 },
- {"dump", IOV_DUMP, 0, IOVT_BUFFER, DHD_IOCTL_MAXLEN },
-#ifdef DHD_DEBUG
- {"cons", IOV_CONS, 0, IOVT_BUFFER, 0 },
- {"dconpoll", IOV_DCONSOLE_POLL, 0, IOVT_UINT32, 0 },
-#endif
- {"clearcounts", IOV_CLEARCOUNTS, 0, IOVT_VOID, 0 },
- {"gpioob", IOV_GPIOOB, 0, IOVT_UINT32, 0 },
- {"ioctl_timeout", IOV_IOCTLTIMEOUT, 0, IOVT_UINT32, 0 },
+ {"bcmerrorstr", IOV_BCMERRORSTR, 0, 0, IOVT_BUFFER, BCME_STRLEN},
+ {"bcmerror", IOV_BCMERROR, 0, 0, IOVT_INT8, 0},
+ {"wdtick", IOV_WDTICK, 0, 0, IOVT_UINT32, 0},
+ {"dump", IOV_DUMP, 0, 0, IOVT_BUFFER, DHD_IOCTL_MAXLEN},
+ {"cons", IOV_CONS, 0, 0, IOVT_BUFFER, 0},
+ {"dconpoll", IOV_DCONSOLE_POLL, 0, 0, IOVT_UINT32, 0},
+ {"clearcounts", IOV_CLEARCOUNTS, 0, 0, IOVT_VOID, 0},
+ {"gpioob", IOV_GPIOOB, 0, 0, IOVT_UINT32, 0},
+ {"ioctl_timeout", IOV_IOCTLTIMEOUT, 0, 0, IOVT_UINT32, 0},
#ifdef PROP_TXSTATUS
- {"proptx", IOV_PROPTXSTATUS_ENABLE, 0, IOVT_BOOL, 0 },
+ {"proptx", IOV_PROPTXSTATUS_ENABLE, 0, 0, IOVT_BOOL, 0 },
/*
set the proptxtstatus operation mode:
0 - Do not do any proptxtstatus flow control
1 - Use implied credit from a packet status
2 - Use explicit credit
*/
- {"ptxmode", IOV_PROPTXSTATUS_MODE, 0, IOVT_UINT32, 0 },
- {"proptx_opt", IOV_PROPTXSTATUS_OPT, 0, IOVT_UINT32, 0 },
- {"pmodule_ignore", IOV_PROPTXSTATUS_MODULE_IGNORE, 0, IOVT_BOOL, 0 },
- {"pcredit_ignore", IOV_PROPTXSTATUS_CREDIT_IGNORE, 0, IOVT_BOOL, 0 },
- {"ptxstatus_ignore", IOV_PROPTXSTATUS_TXSTATUS_IGNORE, 0, IOVT_BOOL, 0 },
- {"rxpkt_chk", IOV_PROPTXSTATUS_RXPKT_CHK, 0, IOVT_BOOL, 0 },
+ {"ptxmode", IOV_PROPTXSTATUS_MODE, 0, 0, IOVT_UINT32, 0 },
+ {"proptx_opt", IOV_PROPTXSTATUS_OPT, 0, 0, IOVT_UINT32, 0 },
+ {"pmodule_ignore", IOV_PROPTXSTATUS_MODULE_IGNORE, 0, 0, IOVT_BOOL, 0 },
+ {"pcredit_ignore", IOV_PROPTXSTATUS_CREDIT_IGNORE, 0, 0, IOVT_BOOL, 0 },
+ {"ptxstatus_ignore", IOV_PROPTXSTATUS_TXSTATUS_IGNORE, 0, 0, IOVT_BOOL, 0 },
+ {"rxpkt_chk", IOV_PROPTXSTATUS_RXPKT_CHK, 0, 0, IOVT_BOOL, 0 },
#endif /* PROP_TXSTATUS */
- {"bustype", IOV_BUS_TYPE, 0, IOVT_UINT32, 0},
-#ifdef WLMEDIA_HTSF
- {"pktdlystatsz", IOV_WLPKTDLYSTAT_SZ, 0, IOVT_UINT8, 0 },
-#endif
- {"changemtu", IOV_CHANGEMTU, 0, IOVT_UINT32, 0 },
- {"host_reorder_flows", IOV_HOSTREORDER_FLOWS, 0, IOVT_BUFFER,
+ {"bustype", IOV_BUS_TYPE, 0, 0, IOVT_UINT32, 0},
+ {"changemtu", IOV_CHANGEMTU, 0, 0, IOVT_UINT32, 0 },
+ {"host_reorder_flows", IOV_HOSTREORDER_FLOWS, 0, 0, IOVT_BUFFER,
(WLHOST_REORDERDATA_MAXFLOWS + 1) },
#ifdef DHDTCPACK_SUPPRESS
- {"tcpack_suppress", IOV_TCPACK_SUPPRESS, 0, IOVT_UINT8, 0 },
+ {"tcpack_suppress", IOV_TCPACK_SUPPRESS, 0, 0, IOVT_UINT8, 0 },
#endif /* DHDTCPACK_SUPPRESS */
-#ifdef DHD_WMF
- {"wmf_bss_enable", IOV_WMF_BSS_ENAB, 0, IOVT_BOOL, 0 },
- {"wmf_ucast_igmp", IOV_WMF_UCAST_IGMP, 0, IOVT_BOOL, 0 },
- {"wmf_mcast_data_sendup", IOV_WMF_MCAST_DATA_SENDUP, 0, IOVT_BOOL, 0 },
-#ifdef WL_IGMP_UCQUERY
- {"wmf_ucast_igmp_query", IOV_WMF_UCAST_IGMP_QUERY, (0), IOVT_BOOL, 0 },
-#endif /* WL_IGMP_UCQUERY */
-#ifdef DHD_UCAST_UPNP
- {"wmf_ucast_upnp", IOV_WMF_UCAST_UPNP, (0), IOVT_BOOL, 0 },
-#endif /* DHD_UCAST_UPNP */
- {"wmf_psta_disable", IOV_WMF_PSTA_DISABLE, (0), IOVT_BOOL, 0 },
-#endif /* DHD_WMF */
-#if defined(TRAFFIC_MGMT_DWM)
- {"trf_mgmt_filters_add", IOV_TRAFFIC_MGMT_DWM, (0), IOVT_BUFFER, 0},
-#endif
#ifdef DHD_L2_FILTER
- {"dhcp_unicast", IOV_DHCP_UNICAST, (0), IOVT_BOOL, 0 },
+ {"dhcp_unicast", IOV_DHCP_UNICAST, (0), 0, IOVT_BOOL, 0 },
#endif /* DHD_L2_FILTER */
- {"ap_isolate", IOV_AP_ISOLATE, (0), IOVT_BOOL, 0},
+ {"ap_isolate", IOV_AP_ISOLATE, (0), 0, IOVT_BOOL, 0},
#ifdef DHD_L2_FILTER
- {"block_ping", IOV_BLOCK_PING, (0), IOVT_BOOL, 0},
- {"proxy_arp", IOV_PROXY_ARP, (0), IOVT_BOOL, 0},
- {"grat_arp", IOV_GRAT_ARP, (0), IOVT_BOOL, 0},
+ {"block_ping", IOV_BLOCK_PING, (0), 0, IOVT_BOOL, 0},
+ {"proxy_arp", IOV_PROXY_ARP, (0), 0, IOVT_BOOL, 0},
+ {"grat_arp", IOV_GRAT_ARP, (0), 0, IOVT_BOOL, 0},
+ {"block_tdls", IOV_BLOCK_TDLS, (0), IOVT_BOOL, 0},
#endif /* DHD_L2_FILTER */
- {"dhd_ie", IOV_DHD_IE, (0), IOVT_BUFFER, 0},
+ {"dhd_ie", IOV_DHD_IE, (0), 0, IOVT_BUFFER, 0},
#ifdef DHD_PSTA
/* PSTA/PSR Mode configuration. 0: DIABLED 1: PSTA 2: PSR */
- {"psta", IOV_PSTA, 0, IOVT_UINT32, 0},
+ {"psta", IOV_PSTA, 0, 0, IOVT_UINT32, 0},
#endif /* DHD PSTA */
#ifdef DHD_WET
/* WET Mode configuration. 0: DIABLED 1: WET */
- {"wet", IOV_WET, 0, IOVT_UINT32, 0},
- {"wet_host_ipv4", IOV_WET_HOST_IPV4, 0, IOVT_UINT32, 0},
- {"wet_host_mac", IOV_WET_HOST_MAC, 0, IOVT_BUFFER, 0},
+ {"wet", IOV_WET, 0, 0, IOVT_UINT32, 0},
+ {"wet_host_ipv4", IOV_WET_HOST_IPV4, 0, 0, IOVT_UINT32, 0},
+ {"wet_host_mac", IOV_WET_HOST_MAC, 0, 0, IOVT_BUFFER, 0},
#endif /* DHD WET */
- {"op_mode", IOV_CFG80211_OPMODE, 0, IOVT_UINT32, 0 },
- {"assert_type", IOV_ASSERT_TYPE, (0), IOVT_UINT32, 0},
- {"lmtest", IOV_LMTEST, 0, IOVT_UINT32, 0 },
+ {"op_mode", IOV_CFG80211_OPMODE, 0, 0, IOVT_UINT32, 0 },
+ {"assert_type", IOV_ASSERT_TYPE, (0), 0, IOVT_UINT32, 0},
+ {"lmtest", IOV_LMTEST, 0, 0, IOVT_UINT32, 0 },
#ifdef DHD_MCAST_REGEN
- {"mcast_regen_bss_enable", IOV_MCAST_REGEN_BSS_ENABLE, 0, IOVT_BOOL, 0},
-#endif
- {NULL, 0, 0, 0, 0 }
+ {"mcast_regen_bss_enable", IOV_MCAST_REGEN_BSS_ENABLE, 0, 0, IOVT_BOOL, 0},
+#endif // endif
+#ifdef SHOW_LOGTRACE
+ {"dump_trace_buf", IOV_DUMP_TRACE_LOG, 0, 0, IOVT_BUFFER, sizeof(trace_buf_info_t) },
+#endif /* SHOW_LOGTRACE */
+ {"trap_type", IOV_DONGLE_TRAP_TYPE, 0, 0, IOVT_UINT32, 0 },
+ {"trap_info", IOV_DONGLE_TRAP_INFO, 0, 0, IOVT_BUFFER, sizeof(trap_t) },
+#ifdef DHD_DEBUG
+ {"bpaddr", IOV_BPADDR, 0, 0, IOVT_BUFFER, sizeof(sdreg_t) },
+#endif /* DHD_DEBUG */
+ {"dump_dongle", IOV_DUMP_DONGLE, 0, 0, IOVT_BUFFER,
+ MAX(sizeof(dump_dongle_in_t), sizeof(dump_dongle_out_t)) },
+#if defined(DHD_LOG_DUMP)
+ {"log_dump", IOV_LOG_DUMP, 0, 0, IOVT_UINT8, 0},
+#endif /* DHD_LOG_DUMP */
+#ifndef OEM_ANDROID
+ {"tput_test", IOV_TPUT_TEST, 0, 0, IOVT_BUFFER, sizeof(tput_test_t)},
+#endif // endif
+ {"debug_buf_dest_stat", IOV_DEBUG_BUF_DEST_STAT, 0, 0, IOVT_UINT32, 0 },
+#ifdef DHD_DEBUG
+ {"induce_error", IOV_INDUCE_ERROR, (0), 0, IOVT_UINT16, 0 },
+#endif /* DHD_DEBUG */
+#ifdef WL_IFACE_MGMT_CONF
+#ifdef WL_CFG80211
+#ifdef WL_NANP2P
+ {"conc_disc", IOV_CONC_DISC, (0), 0, IOVT_UINT16, 0 },
+#endif /* WL_NANP2P */
+#ifdef WL_IFACE_MGMT
+ {"if_policy", IOV_IFACE_POLICY, (0), 0, IOVT_BUFFER, sizeof(iface_mgmt_data_t)},
+#endif /* WL_IFACE_MGMT */
+#endif /* WL_CFG80211 */
+#endif /* WL_IFACE_MGMT_CONF */
+ {NULL, 0, 0, 0, 0, 0 }
};
#define DHD_IOVAR_BUF_SIZE 128
+
+bool
+dhd_query_bus_erros(dhd_pub_t *dhdp)
+{
+ bool ret = FALSE;
+
+ if (dhdp->dongle_reset) {
+ DHD_ERROR_RLMT(("%s: Dongle Reset occurred, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+ if (dhdp->dongle_trap_occured) {
+ DHD_ERROR_RLMT(("%s: FW TRAP has occurred, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+#ifdef OEM_ANDROID
+ dhdp->hang_reason = HANG_REASON_DONGLE_TRAP;
+ dhd_os_send_hang_message(dhdp);
+#endif /* OEM_ANDROID */
+ }
+
+ if (dhdp->iovar_timeout_occured) {
+ DHD_ERROR_RLMT(("%s: Resumed on timeout for previous IOVAR, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+#ifdef PCIE_FULL_DONGLE
+ if (dhdp->d3ack_timeout_occured) {
+ DHD_ERROR_RLMT(("%s: Resumed on timeout for previous D3ACK, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+ if (dhdp->livelock_occured) {
+ DHD_ERROR_RLMT(("%s: LIVELOCK occurred for previous msg, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+ if (dhdp->pktid_audit_failed) {
+ DHD_ERROR_RLMT(("%s: pktid_audit_failed, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+#endif /* PCIE_FULL_DONGLE */
+
+ if (dhdp->iface_op_failed) {
+ DHD_ERROR_RLMT(("%s: iface_op_failed, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+ if (dhdp->scan_timeout_occurred) {
+ DHD_ERROR_RLMT(("%s: scan_timeout_occurred, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+ if (dhdp->scan_busy_occurred) {
+ DHD_ERROR_RLMT(("%s: scan_busy_occurred, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+#ifdef DNGL_AXI_ERROR_LOGGING
+ if (dhdp->axi_error) {
+ DHD_ERROR_RLMT(("%s: AXI error occurred, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+#endif /* DNGL_AXI_ERROR_LOGGING */
+
+ if (dhd_bus_get_linkdown(dhdp)) {
+ DHD_ERROR_RLMT(("%s : PCIE Link down occurred, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+ if (dhd_bus_get_cto(dhdp)) {
+ DHD_ERROR_RLMT(("%s : CTO Recovery reported, cannot proceed\n",
+ __FUNCTION__));
+ ret = TRUE;
+ }
+
+ return ret;
+}
+
+void
+dhd_clear_bus_errors(dhd_pub_t *dhdp)
+{
+ if (!dhdp)
+ return;
+
+ dhdp->dongle_reset = FALSE;
+ dhdp->dongle_trap_occured = FALSE;
+ dhdp->iovar_timeout_occured = FALSE;
+#ifdef PCIE_FULL_DONGLE
+ dhdp->d3ack_timeout_occured = FALSE;
+ dhdp->livelock_occured = FALSE;
+ dhdp->pktid_audit_failed = FALSE;
+#endif // endif
+ dhdp->iface_op_failed = FALSE;
+ dhdp->scan_timeout_occurred = FALSE;
+ dhdp->scan_busy_occurred = FALSE;
+}
+
+#ifdef DHD_SSSR_DUMP
+
+/* This can be overwritten by module parameter defined in dhd_linux.c */
+uint support_sssr_dump = TRUE;
+
+int
+dhd_sssr_mempool_init(dhd_pub_t *dhd)
+{
+ dhd->sssr_mempool = (uint8 *) VMALLOCZ(dhd->osh, DHD_SSSR_MEMPOOL_SIZE);
+ if (dhd->sssr_mempool == NULL) {
+ DHD_ERROR(("%s: MALLOC of sssr_mempool failed\n",
+ __FUNCTION__));
+ return BCME_ERROR;
+ }
+ return BCME_OK;
+}
+
+void
+dhd_sssr_mempool_deinit(dhd_pub_t *dhd)
+{
+ if (dhd->sssr_mempool) {
+ VMFREE(dhd->osh, dhd->sssr_mempool, DHD_SSSR_MEMPOOL_SIZE);
+ dhd->sssr_mempool = NULL;
+ }
+}
+
+void
+dhd_dump_sssr_reg_info(sssr_reg_info_v1_t *sssr_reg_info)
+{
+#ifdef DHD_PCIE_REG_ACCESS
+ int i, j;
+ DHD_ERROR(("************** SSSR REG INFO start ****************\n"));
+ DHD_ERROR(("pmu_regs\n"));
+ DHD_ERROR(("pmuintmask0=0x%x pmuintmask1=0x%x resreqtimer=0x%x "
+ "macresreqtimer=0x%x macresreqtimer1=0x%x\n",
+ sssr_reg_info->pmu_regs.base_regs.pmuintmask0,
+ sssr_reg_info->pmu_regs.base_regs.pmuintmask1,
+ sssr_reg_info->pmu_regs.base_regs.resreqtimer,
+ sssr_reg_info->pmu_regs.base_regs.macresreqtimer,
+ sssr_reg_info->pmu_regs.base_regs.macresreqtimer1));
+ DHD_ERROR(("chipcommon_regs\n"));
+ DHD_ERROR(("intmask=0x%x powerctrl=0x%x clockcontrolstatus=0x%x powerctrl_mask=0x%x\n",
+ sssr_reg_info->chipcommon_regs.base_regs.intmask,
+ sssr_reg_info->chipcommon_regs.base_regs.powerctrl,
+ sssr_reg_info->chipcommon_regs.base_regs.clockcontrolstatus,
+ sssr_reg_info->chipcommon_regs.base_regs.powerctrl_mask));
+ DHD_ERROR(("arm_regs\n"));
+ DHD_ERROR(("clockcontrolstatus=0x%x clockcontrolstatus_val=0x%x"
+ " resetctrl=0x%x itopoobb=0x%x\n",
+ sssr_reg_info->arm_regs.base_regs.clockcontrolstatus,
+ sssr_reg_info->arm_regs.base_regs.clockcontrolstatus_val,
+ sssr_reg_info->arm_regs.wrapper_regs.resetctrl,
+ sssr_reg_info->arm_regs.wrapper_regs.itopoobb));
+ DHD_ERROR(("pcie_regs\n"));
+ DHD_ERROR(("ltrstate=0x%x clockcontrolstatus=0x%x "
+ "clockcontrolstatus_val=0x%x itopoobb=0x%x\n",
+ sssr_reg_info->pcie_regs.base_regs.ltrstate,
+ sssr_reg_info->pcie_regs.base_regs.clockcontrolstatus,
+ sssr_reg_info->pcie_regs.base_regs.clockcontrolstatus_val,
+ sssr_reg_info->pcie_regs.wrapper_regs.itopoobb));
+ DHD_ERROR(("vasip_regs\n"));
+ DHD_ERROR(("ioctrl=0x%x vasip_sr_addr=0x%x vasip_sr_size=0x%x\n",
+ sssr_reg_info->vasip_regs.wrapper_regs.ioctrl,
+ sssr_reg_info->vasip_regs.vasip_sr_addr,
+ sssr_reg_info->vasip_regs.vasip_sr_size));
+
+ for (i = 0; i < MAX_NUM_D11CORES; i++) {
+ DHD_ERROR(("mac_regs core[%d]\n", i));
+ DHD_ERROR(("xmtaddress=0x%x xmtdata=0x%x clockcontrolstatus=0x%x "
+ "clockcontrolstatus_val=0x%x\n",
+ sssr_reg_info->mac_regs[i].base_regs.xmtaddress,
+ sssr_reg_info->mac_regs[i].base_regs.xmtdata,
+ sssr_reg_info->mac_regs[i].base_regs.clockcontrolstatus,
+ sssr_reg_info->mac_regs[i].base_regs.clockcontrolstatus_val));
+ DHD_ERROR(("resetctrl=0x%x itopoobb=0x%x ioctrl=0x%x\n",
+ sssr_reg_info->mac_regs[i].wrapper_regs.resetctrl,
+ sssr_reg_info->mac_regs[i].wrapper_regs.itopoobb,
+ sssr_reg_info->mac_regs[i].wrapper_regs.ioctrl));
+ for (j = 0; j < SSSR_D11_RESET_SEQ_STEPS; j++) {
+ DHD_ERROR(("ioctrl_resetseq_val[%d] 0x%x\n", j,
+ sssr_reg_info->mac_regs[i].wrapper_regs.ioctrl_resetseq_val[j]));
+ }
+ DHD_ERROR(("sr_size=0x%x\n", sssr_reg_info->mac_regs[i].sr_size));
+ }
+ DHD_ERROR(("************** SSSR REG INFO end ****************\n"));
+#endif /* DHD_PCIE_REG_ACCESS */
+}
+
+int
+dhd_get_sssr_reg_info(dhd_pub_t *dhd)
+{
+ int ret;
+ /* get sssr_reg_info from firmware */
+ memset((void *)&dhd->sssr_reg_info, 0, sizeof(dhd->sssr_reg_info));
+ ret = dhd_iovar(dhd, 0, "sssr_reg_info", NULL, 0, (char *)&dhd->sssr_reg_info,
+ sizeof(dhd->sssr_reg_info), FALSE);
+ if (ret < 0) {
+ DHD_ERROR(("%s: sssr_reg_info failed (error=%d)\n",
+ __FUNCTION__, ret));
+ return BCME_ERROR;
+ }
+
+ dhd_dump_sssr_reg_info(&dhd->sssr_reg_info);
+ return BCME_OK;
+}
+
+uint32
+dhd_get_sssr_bufsize(dhd_pub_t *dhd)
+{
+ int i;
+ uint32 sssr_bufsize = 0;
+ /* Init all pointers to NULL */
+ for (i = 0; i < MAX_NUM_D11CORES; i++) {
+ sssr_bufsize += dhd->sssr_reg_info.mac_regs[i].sr_size;
+ }
+ sssr_bufsize += dhd->sssr_reg_info.vasip_regs.vasip_sr_size;
+
+ /* Double the size as different dumps will be saved before and after SR */
+ sssr_bufsize = 2 * sssr_bufsize;
+
+ return sssr_bufsize;
+}
+
+int
+dhd_sssr_dump_init(dhd_pub_t *dhd)
+{
+ int i;
+ uint32 sssr_bufsize;
+ uint32 mempool_used = 0;
+
+ dhd->sssr_inited = FALSE;
+
+ if (!support_sssr_dump) {
+ DHD_ERROR(("%s: sssr dump not inited as instructed by mod param\n", __FUNCTION__));
+ return BCME_OK;
+ }
+
+ /* check if sssr mempool is allocated */
+ if (dhd->sssr_mempool == NULL) {
+ DHD_ERROR(("%s: sssr_mempool is not allocated\n",
+ __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ /* Get SSSR reg info */
+ if (dhd_get_sssr_reg_info(dhd) != BCME_OK) {
+ DHD_ERROR(("%s: dhd_get_sssr_reg_info failed\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ /* Validate structure version */
+ if (dhd->sssr_reg_info.version > SSSR_REG_INFO_VER_1) {
+ DHD_ERROR(("%s: dhd->sssr_reg_info.version (%d : %d) mismatch\n",
+ __FUNCTION__, (int)dhd->sssr_reg_info.version, SSSR_REG_INFO_VER));
+ return BCME_ERROR;
+ }
+
+ /* Validate structure length */
+ if (dhd->sssr_reg_info.length < sizeof(sssr_reg_info_v0_t)) {
+ DHD_ERROR(("%s: dhd->sssr_reg_info.length (%d : %d) mismatch\n",
+ __FUNCTION__, (int)dhd->sssr_reg_info.length,
+ (int)sizeof(dhd->sssr_reg_info)));
+ return BCME_ERROR;
+ }
+
+ /* validate fifo size */
+ sssr_bufsize = dhd_get_sssr_bufsize(dhd);
+ if (sssr_bufsize > DHD_SSSR_MEMPOOL_SIZE) {
+ DHD_ERROR(("%s: sssr_bufsize(%d) is greater than sssr_mempool(%d)\n",
+ __FUNCTION__, (int)sssr_bufsize, DHD_SSSR_MEMPOOL_SIZE));
+ return BCME_ERROR;
+ }
+
+ /* init all pointers to NULL */
+ for (i = 0; i < MAX_NUM_D11CORES; i++) {
+ dhd->sssr_d11_before[i] = NULL;
+ dhd->sssr_d11_after[i] = NULL;
+ }
+ dhd->sssr_dig_buf_before = NULL;
+ dhd->sssr_dig_buf_after = NULL;
+
+ /* Allocate memory */
+ for (i = 0; i < MAX_NUM_D11CORES; i++) {
+ if (dhd->sssr_reg_info.mac_regs[i].sr_size) {
+ dhd->sssr_d11_before[i] = (uint32 *)(dhd->sssr_mempool + mempool_used);
+ mempool_used += dhd->sssr_reg_info.mac_regs[i].sr_size;
+
+ dhd->sssr_d11_after[i] = (uint32 *)(dhd->sssr_mempool + mempool_used);
+ mempool_used += dhd->sssr_reg_info.mac_regs[i].sr_size;
+ }
+ }
+
+ if (dhd->sssr_reg_info.vasip_regs.vasip_sr_size) {
+ dhd->sssr_dig_buf_before = (uint32 *)(dhd->sssr_mempool + mempool_used);
+ mempool_used += dhd->sssr_reg_info.vasip_regs.vasip_sr_size;
+
+ dhd->sssr_dig_buf_after = (uint32 *)(dhd->sssr_mempool + mempool_used);
+ mempool_used += dhd->sssr_reg_info.vasip_regs.vasip_sr_size;
+ } else if ((dhd->sssr_reg_info.length > OFFSETOF(sssr_reg_info_v1_t, dig_mem_info)) &&
+ dhd->sssr_reg_info.dig_mem_info.dig_sr_addr) {
+ dhd->sssr_dig_buf_before = (uint32 *)(dhd->sssr_mempool + mempool_used);
+ mempool_used += dhd->sssr_reg_info.dig_mem_info.dig_sr_size;
+
+ dhd->sssr_dig_buf_after = (uint32 *)(dhd->sssr_mempool + mempool_used);
+ mempool_used += dhd->sssr_reg_info.dig_mem_info.dig_sr_size;
+ }
+
+ dhd->sssr_inited = TRUE;
+
+ return BCME_OK;
+
+}
+
+void
+dhd_sssr_dump_deinit(dhd_pub_t *dhd)
+{
+ int i;
+
+ dhd->sssr_inited = FALSE;
+ /* init all pointers to NULL */
+ for (i = 0; i < MAX_NUM_D11CORES; i++) {
+ dhd->sssr_d11_before[i] = NULL;
+ dhd->sssr_d11_after[i] = NULL;
+ }
+ dhd->sssr_dig_buf_before = NULL;
+ dhd->sssr_dig_buf_after = NULL;
+
+ return;
+}
+
+void
+dhd_sssr_print_filepath(dhd_pub_t *dhd, char *path)
+{
+ bool print_info = FALSE;
+ int dump_mode;
+
+ if (!dhd || !path) {
+ DHD_ERROR(("%s: dhd or memdump_path is NULL\n",
+ __FUNCTION__));
+ return;
+ }
+
+ if (!dhd->sssr_dump_collected) {
+ /* SSSR dump is not collected */
+ return;
+ }
+
+ dump_mode = dhd->sssr_dump_mode;
+
+ if (bcmstrstr(path, "core_0_before")) {
+ if (dhd->sssr_d11_outofreset[0] &&
+ dump_mode == SSSR_DUMP_MODE_SSSR) {
+ print_info = TRUE;
+ }
+ } else if (bcmstrstr(path, "core_0_after")) {
+ if (dhd->sssr_d11_outofreset[0]) {
+ print_info = TRUE;
+ }
+ } else if (bcmstrstr(path, "core_1_before")) {
+ if (dhd->sssr_d11_outofreset[1] &&
+ dump_mode == SSSR_DUMP_MODE_SSSR) {
+ print_info = TRUE;
+ }
+ } else if (bcmstrstr(path, "core_1_after")) {
+ if (dhd->sssr_d11_outofreset[1]) {
+ print_info = TRUE;
+ }
+ } else {
+ print_info = TRUE;
+ }
+
+ if (print_info) {
+ DHD_ERROR(("%s: file_path = %s%s\n", __FUNCTION__,
+ path, FILE_NAME_HAL_TAG));
+ }
+}
+#endif /* DHD_SSSR_DUMP */
#ifdef DHD_FW_COREDUMP
void* dhd_get_fwdump_buf(dhd_pub_t *dhd_pub, uint32 length)
@@ -363,16 +846,16 @@
/* to NDIS developer, the structure dhd_common is redundant,
* please do NOT merge it back from other branches !!!
*/
-int dhd_common_socram_dump(dhd_pub_t *dhdp)
+
+int
+dhd_common_socram_dump(dhd_pub_t *dhdp)
{
return dhd_socram_dump(dhdp->bus);
}
-static int
+int
dhd_dump(dhd_pub_t *dhdp, char *buf, int buflen)
{
- char eabuf[ETHER_ADDR_STR_LEN];
-
struct bcmstrbuf b;
struct bcmstrbuf *strbuf = &b;
@@ -389,8 +872,8 @@
dhdp->up, dhdp->txoff, dhdp->busstate);
bcm_bprintf(strbuf, "pub.hdrlen %u pub.maxctl %u pub.rxsz %u\n",
dhdp->hdrlen, dhdp->maxctl, dhdp->rxsz);
- bcm_bprintf(strbuf, "pub.iswl %d pub.drv_version %ld pub.mac %s\n",
- dhdp->iswl, dhdp->drv_version, bcm_ether_ntoa(&dhdp->mac, eabuf));
+ bcm_bprintf(strbuf, "pub.iswl %d pub.drv_version %ld pub.mac "MACDBG"\n",
+ dhdp->iswl, dhdp->drv_version, MAC2STRDBG(&dhdp->mac));
bcm_bprintf(strbuf, "pub.bcmerror %d tickcnt %u\n", dhdp->bcmerror, dhdp->tickcnt);
bcm_bprintf(strbuf, "dongle stats:\n");
@@ -415,8 +898,30 @@
dhdp->rx_readahead_cnt, dhdp->tx_realloc);
bcm_bprintf(strbuf, "tx_pktgetfail %lu rx_pktgetfail %lu\n",
dhdp->tx_pktgetfail, dhdp->rx_pktgetfail);
+ bcm_bprintf(strbuf, "tx_big_packets %lu\n",
+ dhdp->tx_big_packets);
bcm_bprintf(strbuf, "\n");
-
+#ifdef DMAMAP_STATS
+ /* Add DMA MAP info */
+ bcm_bprintf(strbuf, "DMA MAP stats: \n");
+ bcm_bprintf(strbuf, "txdata: %lu size: %luK, rxdata: %lu size: %luK\n",
+ dhdp->dma_stats.txdata, KB(dhdp->dma_stats.txdata_sz),
+ dhdp->dma_stats.rxdata, KB(dhdp->dma_stats.rxdata_sz));
+#ifndef IOCTLRESP_USE_CONSTMEM
+ bcm_bprintf(strbuf, "IOCTL RX: %lu size: %luK ,",
+ dhdp->dma_stats.ioctl_rx, KB(dhdp->dma_stats.ioctl_rx_sz));
+#endif /* !IOCTLRESP_USE_CONSTMEM */
+ bcm_bprintf(strbuf, "EVENT RX: %lu size: %luK, INFO RX: %lu size: %luK, "
+ "TSBUF RX: %lu size %luK\n",
+ dhdp->dma_stats.event_rx, KB(dhdp->dma_stats.event_rx_sz),
+ dhdp->dma_stats.info_rx, KB(dhdp->dma_stats.info_rx_sz),
+ dhdp->dma_stats.tsbuf_rx, KB(dhdp->dma_stats.tsbuf_rx_sz));
+ bcm_bprintf(strbuf, "Total : %luK \n",
+ KB(dhdp->dma_stats.txdata_sz + dhdp->dma_stats.rxdata_sz +
+ dhdp->dma_stats.ioctl_rx_sz + dhdp->dma_stats.event_rx_sz +
+ dhdp->dma_stats.tsbuf_rx_sz));
+#endif /* DMAMAP_STATS */
+ bcm_bprintf(strbuf, "dhd_induce_error : %u\n", dhdp->dhd_induce_error);
/* Add any prot info */
dhd_prot_dump(dhdp, strbuf);
bcm_bprintf(strbuf, "\n");
@@ -424,14 +929,18 @@
/* Add any bus info */
dhd_bus_dump(dhdp, strbuf);
-
#if defined(DHD_LB_STATS)
dhd_lb_stats_dump(dhdp, strbuf);
#endif /* DHD_LB_STATS */
#ifdef DHD_WET
- dhd_wet_dump(dhdp, strbuf);
+ if (dhd_get_wet_mode(dhdp)) {
+ bcm_bprintf(strbuf, "Wet Dump:\n");
+ dhd_wet_dump(dhdp, strbuf);
+ }
#endif /* DHD_WET */
- return (!strbuf->size ? BCME_BUFTOOSHORT : 0);
+
+ /* return remaining buffer length */
+ return (!strbuf->size ? BCME_BUFTOOSHORT : strbuf->size);
}
void
@@ -439,6 +948,7 @@
{
char buf[512];
+ DHD_ERROR(("F/W version: %s\n", fw_version));
bcm_bprintf_bypass = TRUE;
dhd_dump(dhdp, buf, sizeof(buf));
bcm_bprintf_bypass = FALSE;
@@ -506,29 +1016,87 @@
return ret;
}
+static struct ioctl2str_s {
+ uint32 ioctl;
+ char *name;
+} ioctl2str_array[] = {
+ {WLC_UP, "UP"},
+ {WLC_DOWN, "DOWN"},
+ {WLC_SET_PROMISC, "SET_PROMISC"},
+ {WLC_SET_INFRA, "SET_INFRA"},
+ {WLC_SET_AUTH, "SET_AUTH"},
+ {WLC_SET_SSID, "SET_SSID"},
+ {WLC_RESTART, "RESTART"},
+ {WLC_SET_CHANNEL, "SET_CHANNEL"},
+ {WLC_SET_RATE_PARAMS, "SET_RATE_PARAMS"},
+ {WLC_SET_KEY, "SET_KEY"},
+ {WLC_SCAN, "SCAN"},
+ {WLC_DISASSOC, "DISASSOC"},
+ {WLC_REASSOC, "REASSOC"},
+ {WLC_SET_COUNTRY, "SET_COUNTRY"},
+ {WLC_SET_WAKE, "SET_WAKE"},
+ {WLC_SET_SCANSUPPRESS, "SET_SCANSUPPRESS"},
+ {WLC_SCB_DEAUTHORIZE, "SCB_DEAUTHORIZE"},
+ {WLC_SET_WSEC, "SET_WSEC"},
+ {WLC_SET_INTERFERENCE_MODE, "SET_INTERFERENCE_MODE"},
+ {WLC_SET_RADAR, "SET_RADAR"},
+ {0, NULL}
+};
+
+static char *
+ioctl2str(uint32 ioctl)
+{
+ struct ioctl2str_s *p = ioctl2str_array;
+
+ while (p->name != NULL) {
+ if (p->ioctl == ioctl) {
+ return p->name;
+ }
+ p++;
+ }
+
+ return "";
+}
+
+/**
+ * @param ioc IO control struct, members are partially used by this function.
+ * @param buf [inout] Contains parameters to send to dongle, contains dongle response on return.
+ * @param len Maximum number of bytes that dongle is allowed to write into 'buf'.
+ */
int
dhd_wl_ioctl(dhd_pub_t *dhd_pub, int ifidx, wl_ioctl_t *ioc, void *buf, int len)
{
int ret = BCME_ERROR;
unsigned long flags;
+#ifdef DUMP_IOCTL_IOV_LIST
+ dhd_iov_li_t *iov_li;
+#endif /* DUMP_IOCTL_IOV_LIST */
-#ifdef HOST_FLAG
- int hostsleep_set = 0;
- int hostsleep_val = 0;
- char *psleep = NULL;
-#endif
+#ifdef DHD_PCIE_NATIVE_RUNTIMEPM
+ DHD_OS_WAKE_LOCK(dhd_pub);
+ if (pm_runtime_get_sync(dhd_bus_to_dev(dhd_pub->bus)) < 0) {
+ DHD_RPM(("%s: pm_runtime_get_sync error. \n", __FUNCTION__));
+ DHD_OS_WAKE_UNLOCK(dhd_pub);
+ return BCME_ERROR;
+ }
+#endif /* DHD_PCIE_NATIVE_RUNTIMEPM */
+
#ifdef KEEPIF_ON_DEVICE_RESET
if (ioc->cmd == WLC_GET_VAR) {
dbus_config_t config;
config.general_param = 0;
- if (!strcmp(buf, "wowl_activate")) {
- config.general_param = 2; /* 1 (TRUE) after decreased by 1 */
- } else if (!strcmp(buf, "wowl_clear")) {
- config.general_param = 1; /* 0 (FALSE) after decreased by 1 */
+ if (buf) {
+ if (!strcmp(buf, "wowl_activate")) {
+ /* 1 (TRUE) after decreased by 1 */
+ config.general_param = 2;
+ } else if (!strcmp(buf, "wowl_clear")) {
+ /* 0 (FALSE) after decreased by 1 */
+ config.general_param = 1;
+ }
}
if (config.general_param) {
config.config_id = DBUS_CONFIG_ID_KEEPIF_ON_DEVRESET;
- config.general_param -= 1; /* convert to 0 (FALSE) or 1 (TRUE) */
+ config.general_param--;
dbus_set_config(dhd_pub->dbus, &config);
}
}
@@ -536,69 +1104,155 @@
if (dhd_os_proto_block(dhd_pub))
{
- DHD_GENERAL_LOCK(dhd_pub, flags);
- if (dhd_pub->busstate == DHD_BUS_DOWN ||
- dhd_pub->busstate == DHD_BUS_DOWN_IN_PROGRESS) {
- DHD_ERROR(("%s: returning as busstate=%d\n",
+#ifdef DHD_LOG_DUMP
+ int slen, val, lval, min_len;
+ char *msg, tmp[64];
+
+ /* WLC_GET_VAR */
+ if (ioc->cmd == WLC_GET_VAR && buf) {
+ min_len = MIN(sizeof(tmp) - 1, strlen(buf));
+ memset(tmp, 0, sizeof(tmp));
+ bcopy(buf, tmp, min_len);
+ tmp[min_len] = '\0';
+ }
+#endif /* DHD_LOG_DUMP */
+
+#ifdef DHD_DISCONNECT_TRACE
+ if ((WLC_DISASSOC == ioc->cmd) || (WLC_DOWN == ioc->cmd) ||
+ (WLC_DISASSOC_MYAP == ioc->cmd)) {
+ DHD_ERROR(("IOCTL Disconnect WiFi: %d\n", ioc->cmd));
+ }
+#endif /* HW_DISCONNECT_TRACE */
+
+ /* logging of iovars that are send to the dongle, ./dhd msglevel +iovar */
+ if (ioc->set == TRUE) {
+ char *pars = (char *)buf; // points at user buffer
+ if (ioc->cmd == WLC_SET_VAR && buf) {
+ DHD_DNGL_IOVAR_SET(("iovar:%d: set %s", ifidx, pars));
+ if (ioc->len > 1 + sizeof(uint32)) {
+ // skip iovar name:
+ pars += strnlen(pars, ioc->len - 1 - sizeof(uint32));
+ pars++; // skip NULL character
+ }
+ } else {
+ DHD_DNGL_IOVAR_SET(("ioctl:%d: set %d %s",
+ ifidx, ioc->cmd, ioctl2str(ioc->cmd)));
+ }
+ if (pars != NULL) {
+ DHD_DNGL_IOVAR_SET((" 0x%x\n", *(uint32*)pars));
+ } else {
+ DHD_DNGL_IOVAR_SET((" NULL\n"));
+ }
+ }
+
+ DHD_LINUX_GENERAL_LOCK(dhd_pub, flags);
+ if (DHD_BUS_CHECK_DOWN_OR_DOWN_IN_PROGRESS(dhd_pub)) {
+ DHD_INFO(("%s: returning as busstate=%d\n",
__FUNCTION__, dhd_pub->busstate));
- DHD_GENERAL_UNLOCK(dhd_pub, flags);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
dhd_os_proto_unblock(dhd_pub);
return -ENODEV;
}
- dhd_pub->dhd_bus_busy_state |= DHD_BUS_BUSY_IN_IOVAR;
- DHD_GENERAL_UNLOCK(dhd_pub, flags);
+ DHD_BUS_BUSY_SET_IN_IOVAR(dhd_pub);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
-#if defined(WL_WLC_SHIM)
- {
- struct wl_shim_node *shim = dhd_pub_shim(dhd_pub);
+#ifdef DHD_PCIE_RUNTIMEPM
+ dhdpcie_runtime_bus_wake(dhd_pub, TRUE, dhd_wl_ioctl);
+#endif /* DHD_PCIE_RUNTIMEPM */
- wl_io_pport_t io_pport;
- io_pport.dhd_pub = dhd_pub;
- io_pport.ifidx = ifidx;
-
- ret = wl_shim_ioctl(shim, ioc, len, &io_pport);
- if (ret != BCME_OK) {
- DHD_TRACE(("%s: wl_shim_ioctl(%d) ERR %d\n",
- __FUNCTION__, ioc->cmd, ret));
- }
- }
-#else
-#ifdef HOST_FLAG
- /*save hostsleep val first, if ioctl success, set hostsleep to val*/
- if (ioc->cmd == WLC_SET_VAR) {
- psleep = strstr(buf, "hostsleep");
- if (psleep) {
- hostsleep_set = 1;
- memcpy(&hostsleep_val, psleep + strlen("hostsleep") + 1, sizeof(hostsleep_val));
- printf("###hostsleep: cmd = %d, hostsleep_val = %d, buf = %s\n",
- ioc->cmd, hostsleep_val, (char *)buf);
- }
- }
- /* block all cmd, expect hostsleep remove */
- if (hostsleep && (!hostsleep_set || hostsleep_val)) {
- printf("%s: block all none hostsleep clr cmd\n", __FUNCTION__);
+ DHD_LINUX_GENERAL_LOCK(dhd_pub, flags);
+ if (DHD_BUS_CHECK_SUSPEND_OR_SUSPEND_IN_PROGRESS(dhd_pub)) {
+ DHD_ERROR(("%s: bus is in suspend(%d) or suspending(0x%x) state!!\n",
+ __FUNCTION__, dhd_pub->busstate, dhd_pub->dhd_bus_busy_state));
+ DHD_BUS_BUSY_CLEAR_IN_IOVAR(dhd_pub);
+ dhd_os_busbusy_wake(dhd_pub);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
dhd_os_proto_unblock(dhd_pub);
- return BCME_EPERM;
- } else if (hostsleep_set && hostsleep_val) {
- printf("%s: set dhd hostsleep 1\n", __FUNCTION__);
- hostsleep = 1;
+ return -ENODEV;
}
-#endif
- ret = dhd_prot_ioctl(dhd_pub, ifidx, ioc, buf, len);
-#endif /* defined(WL_WLC_SHIM) */
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
-#ifdef HOST_FLAG
- if (hostsleep_set) {
- if (hostsleep_val && ret) { // reset hostsleep if host_sleep 1 set failed
- printf("%s: reset hostsleep\n", __FUNCTION__);
- hostsleep = 0;
- } else if (!hostsleep_val && !ret) { // clear hostsleep if host_sleep 0 set successfully
- printf("%s: clear hostsleep\n", __FUNCTION__);
- hostsleep = 0;
+#ifdef DUMP_IOCTL_IOV_LIST
+ if (ioc->cmd != WLC_GET_MAGIC && ioc->cmd != WLC_GET_VERSION && buf) {
+ if (!(iov_li = MALLOC(dhd_pub->osh, sizeof(*iov_li)))) {
+ DHD_ERROR(("iovar dump list item allocation Failed\n"));
+ } else {
+ iov_li->cmd = ioc->cmd;
+ if (buf)
+ bcopy((char *)buf, iov_li->buff, strlen((char *)buf)+1);
+ dhd_iov_li_append(dhd_pub, &dhd_pub->dump_iovlist_head,
+ &iov_li->list);
}
}
-#endif
+#endif /* DUMP_IOCTL_IOV_LIST */
+ ret = dhd_prot_ioctl(dhd_pub, ifidx, ioc, buf, len);
+
+#ifdef DUMP_IOCTL_IOV_LIST
+ if (ret == -ETIMEDOUT) {
+ DHD_ERROR(("Last %d issued commands: Latest one is at bottom.\n",
+ IOV_LIST_MAX_LEN));
+ dhd_iov_li_print(&dhd_pub->dump_iovlist_head);
+ }
+#endif /* DUMP_IOCTL_IOV_LIST */
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+ if (ret == -ETIMEDOUT) {
+ copy_hang_info_ioctl_timeout(dhd_pub, ifidx, ioc);
+ }
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
+#ifdef DHD_LOG_DUMP
+ if ((ioc->cmd == WLC_GET_VAR || ioc->cmd == WLC_SET_VAR) &&
+ buf != NULL) {
+ if (buf) {
+ lval = 0;
+ slen = strlen(buf) + 1;
+ msg = (char*)buf;
+ if (len >= slen + sizeof(lval)) {
+ if (ioc->cmd == WLC_GET_VAR) {
+ msg = tmp;
+ lval = *(int*)buf;
+ } else {
+ min_len = MIN(ioc->len - slen, sizeof(int));
+ bcopy((msg + slen), &lval, min_len);
+ }
+ if (!strncmp(msg, "cur_etheraddr",
+ strlen("cur_etheraddr"))) {
+ lval = 0;
+ }
+ }
+ DHD_IOVAR_MEM((
+ "%s: cmd: %d, msg: %s val: 0x%x,"
+ " len: %d, set: %d, txn-id: %d\n",
+ ioc->cmd == WLC_GET_VAR ?
+ "WLC_GET_VAR" : "WLC_SET_VAR",
+ ioc->cmd, msg, lval, ioc->len, ioc->set,
+ dhd_prot_get_ioctl_trans_id(dhd_pub)));
+ } else {
+ DHD_IOVAR_MEM(("%s: cmd: %d, len: %d, set: %d, txn-id: %d\n",
+ ioc->cmd == WLC_GET_VAR ? "WLC_GET_VAR" : "WLC_SET_VAR",
+ ioc->cmd, ioc->len, ioc->set,
+ dhd_prot_get_ioctl_trans_id(dhd_pub)));
+ }
+ } else {
+ slen = ioc->len;
+ if (buf != NULL && slen != 0) {
+ if (slen >= 4) {
+ val = *(int*)buf;
+ } else if (slen >= 2) {
+ val = *(short*)buf;
+ } else {
+ val = *(char*)buf;
+ }
+ /* Do not dump for WLC_GET_MAGIC and WLC_GET_VERSION */
+ if (ioc->cmd != WLC_GET_MAGIC && ioc->cmd != WLC_GET_VERSION)
+ DHD_IOVAR_MEM(("WLC_IOCTL: cmd: %d, val: %d, len: %d, "
+ "set: %d\n", ioc->cmd, val, ioc->len, ioc->set));
+ } else {
+ DHD_IOVAR_MEM(("WLC_IOCTL: cmd: %d, buf is NULL\n", ioc->cmd));
+ }
+ }
+#endif /* DHD_LOG_DUMP */
+#if defined(OEM_ANDROID)
if (ret && dhd_pub->up) {
/* Send hang event only if dhd_open() was success */
dhd_os_check_hang(dhd_pub, ifidx, ret);
@@ -608,17 +1262,24 @@
DHD_ERROR(("%s: 'resumed on timeout' error is "
"occurred before the interface does not"
" bring up\n", __FUNCTION__));
- dhd_pub->busstate = DHD_BUS_DOWN;
}
+#endif /* defined(OEM_ANDROID) */
- DHD_GENERAL_LOCK(dhd_pub, flags);
- dhd_pub->dhd_bus_busy_state &= ~DHD_BUS_BUSY_IN_IOVAR;
+ DHD_LINUX_GENERAL_LOCK(dhd_pub, flags);
+ DHD_BUS_BUSY_CLEAR_IN_IOVAR(dhd_pub);
dhd_os_busbusy_wake(dhd_pub);
- DHD_GENERAL_UNLOCK(dhd_pub, flags);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
dhd_os_proto_unblock(dhd_pub);
}
+
+#ifdef DHD_PCIE_NATIVE_RUNTIMEPM
+ pm_runtime_mark_last_busy(dhd_bus_to_dev(dhd_pub->bus));
+ pm_runtime_put_autosuspend(dhd_bus_to_dev(dhd_pub->bus));
+
+ DHD_OS_WAKE_UNLOCK(dhd_pub);
+#endif /* DHD_PCIE_NATIVE_RUNTIMEPM */
return ret;
}
@@ -635,14 +1296,14 @@
* val - ponter to the IOVAR arguments
*/
static int
-dhd_iovar_parse_bssidx(dhd_pub_t *dhd_pub, char *params, int *idx, char **val)
+dhd_iovar_parse_bssidx(dhd_pub_t *dhd_pub, const char *params, uint32 *idx, const char **val)
{
char *prefix = "bsscfg:";
uint32 bssidx;
if (!(strncmp(params, prefix, strlen(prefix)))) {
/* per bss setting should be prefixed with 'bsscfg:' */
- char *p = (char *)params + strlen(prefix);
+ const char *p = params + strlen(prefix);
/* Skip Name */
while (*p != '\0')
@@ -681,12 +1342,238 @@
}
#endif /* DHD_DEBUG && BCMDHDUSB */
+#ifdef DHD_DEBUG
+int
+dhd_mem_debug(dhd_pub_t *dhd, uchar *msg, uint msglen)
+{
+ unsigned long int_arg = 0;
+ char *p;
+ char *end_ptr = NULL;
+ dhd_dbg_mwli_t *mw_li;
+ dll_t *item, *next;
+ /* check if mwalloc, mwquery or mwfree was supplied arguement with space */
+ p = bcmstrstr((char *)msg, " ");
+ if (p != NULL) {
+ /* space should be converted to null as separation flag for firmware */
+ *p = '\0';
+ /* store the argument in int_arg */
+ int_arg = bcm_strtoul(p+1, &end_ptr, 10);
+ }
+
+ if (!p && !strcmp(msg, "query")) {
+ /* lets query the list inetrnally */
+ if (dll_empty(dll_head_p(&dhd->mw_list_head))) {
+ DHD_ERROR(("memwaste list is empty, call mwalloc < size > to allocate\n"));
+ } else {
+ for (item = dll_head_p(&dhd->mw_list_head);
+ !dll_end(&dhd->mw_list_head, item); item = next) {
+ next = dll_next_p(item);
+ mw_li = (dhd_dbg_mwli_t *)CONTAINEROF(item, dhd_dbg_mwli_t, list);
+ DHD_ERROR(("item: <id=%d, size=%d>\n", mw_li->id, mw_li->size));
+ }
+ }
+ } else if (p && end_ptr && (*end_ptr == '\0') && !strcmp(msg, "alloc")) {
+ int32 alloc_handle;
+ /* convert size into KB and append as integer */
+ *((int32 *)(p+1)) = int_arg*1024;
+ *(p+1+sizeof(int32)) = '\0';
+
+ /* recalculated length -> 5 bytes for "alloc" + 4 bytes for size +
+ * 1 bytes for null caracter
+ */
+ msglen = strlen(msg) + sizeof(int32) + 1;
+ if (dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, msg, msglen+1, FALSE, 0) < 0) {
+ DHD_ERROR(("IOCTL failed for memdebug alloc\n"));
+ }
+
+ /* returned allocated handle from dongle, basically address of the allocated unit */
+ alloc_handle = *((int32 *)msg);
+
+ /* add a node in the list with tuple <id, handle, size> */
+ if (alloc_handle == 0) {
+ DHD_ERROR(("Reuqested size could not be allocated\n"));
+ } else if (!(mw_li = MALLOC(dhd->osh, sizeof(*mw_li)))) {
+ DHD_ERROR(("mw list item allocation Failed\n"));
+ } else {
+ mw_li->id = dhd->mw_id++;
+ mw_li->handle = alloc_handle;
+ mw_li->size = int_arg;
+ /* append the node in the list */
+ dll_append(&dhd->mw_list_head, &mw_li->list);
+ }
+ } else if (p && end_ptr && (*end_ptr == '\0') && !strcmp(msg, "free")) {
+ /* inform dongle to free wasted chunk */
+ int handle = 0;
+ int size = 0;
+ for (item = dll_head_p(&dhd->mw_list_head);
+ !dll_end(&dhd->mw_list_head, item); item = next) {
+ next = dll_next_p(item);
+ mw_li = (dhd_dbg_mwli_t *)CONTAINEROF(item, dhd_dbg_mwli_t, list);
+
+ if (mw_li->id == (int)int_arg) {
+ handle = mw_li->handle;
+ size = mw_li->size;
+ dll_delete(item);
+ MFREE(dhd->osh, mw_li, sizeof(*mw_li));
+ if (dll_empty(dll_head_p(&dhd->mw_list_head))) {
+ /* reset the id */
+ dhd->mw_id = 0;
+ }
+ }
+ }
+ if (handle) {
+ int len;
+ /* append the free handle and the chunk size in first 8 bytes
+ * after the command and null character
+ */
+ *((int32 *)(p+1)) = handle;
+ *((int32 *)((p+1)+sizeof(int32))) = size;
+ /* append null as terminator */
+ *(p+1+2*sizeof(int32)) = '\0';
+ /* recalculated length -> 4 bytes for "free" + 8 bytes for hadnle and size
+ * + 1 bytes for null caracter
+ */
+ len = strlen(msg) + 2*sizeof(int32) + 1;
+ /* send iovar to free the chunk */
+ if (dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, msg, len, FALSE, 0) < 0) {
+ DHD_ERROR(("IOCTL failed for memdebug free\n"));
+ }
+ } else {
+ DHD_ERROR(("specified id does not exist\n"));
+ }
+ } else {
+ /* for all the wrong argument formats */
+ return BCME_BADARG;
+ }
+ return 0;
+}
+extern void
+dhd_mw_list_delete(dhd_pub_t *dhd, dll_t *list_head)
+{
+ dll_t *item;
+ dhd_dbg_mwli_t *mw_li;
+ while (!(dll_empty(list_head))) {
+ item = dll_head_p(list_head);
+ mw_li = (dhd_dbg_mwli_t *)CONTAINEROF(item, dhd_dbg_mwli_t, list);
+ dll_delete(item);
+ MFREE(dhd->osh, mw_li, sizeof(*mw_li));
+ }
+}
+#ifdef BCMPCIE
+int
+dhd_flow_ring_debug(dhd_pub_t *dhd, char *msg, uint msglen)
+{
+ flow_ring_table_t *flow_ring_table;
+ char *cmd;
+ char *end_ptr = NULL;
+ uint8 prio;
+ uint16 flowid;
+ int i;
+ int ret = 0;
+ cmd = bcmstrstr(msg, " ");
+ BCM_REFERENCE(prio);
+ if (cmd != NULL) {
+ /* in order to use string operations append null */
+ *cmd = '\0';
+ } else {
+ DHD_ERROR(("missing: create/delete args\n"));
+ return BCME_ERROR;
+ }
+ if (cmd && !strcmp(msg, "create")) {
+ /* extract <"source address", "destination address", "priority"> */
+ uint8 sa[ETHER_ADDR_LEN], da[ETHER_ADDR_LEN];
+ BCM_REFERENCE(sa);
+ BCM_REFERENCE(da);
+ msg = msg + strlen("create") + 1;
+ /* fill ethernet source address */
+ for (i = 0; i < ETHER_ADDR_LEN; i++) {
+ sa[i] = (uint8)bcm_strtoul(msg, &end_ptr, 16);
+ if (*end_ptr == ':') {
+ msg = (end_ptr + 1);
+ } else if (i != 5) {
+ DHD_ERROR(("not a valid source mac addr\n"));
+ return BCME_ERROR;
+ }
+ }
+ if (*end_ptr != ' ') {
+ DHD_ERROR(("missing: destiantion mac id\n"));
+ return BCME_ERROR;
+ } else {
+ /* skip space */
+ msg = end_ptr + 1;
+ }
+ /* fill ethernet destination address */
+ for (i = 0; i < ETHER_ADDR_LEN; i++) {
+ da[i] = (uint8)bcm_strtoul(msg, &end_ptr, 16);
+ if (*end_ptr == ':') {
+ msg = (end_ptr + 1);
+ } else if (i != 5) {
+ DHD_ERROR(("not a valid destination mac addr\n"));
+ return BCME_ERROR;
+ }
+ }
+ if (*end_ptr != ' ') {
+ DHD_ERROR(("missing: priority\n"));
+ return BCME_ERROR;
+ } else {
+ msg = end_ptr + 1;
+ }
+ /* parse priority */
+ prio = (uint8)bcm_strtoul(msg, &end_ptr, 10);
+ if (prio > MAXPRIO) {
+ DHD_ERROR(("%s: invalid priority. Must be between 0-7 inclusive\n",
+ __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ if (*end_ptr != '\0') {
+ DHD_ERROR(("msg not truncated with NULL character\n"));
+ return BCME_ERROR;
+ }
+ ret = dhd_flowid_debug_create(dhd, 0, prio, (char *)sa, (char *)da, &flowid);
+ if (ret != BCME_OK) {
+ DHD_ERROR(("%s: flowring creation failed ret: %d\n", __FUNCTION__, ret));
+ return BCME_ERROR;
+ }
+ return BCME_OK;
+
+ } else if (cmd && !strcmp(msg, "delete")) {
+ msg = msg + strlen("delete") + 1;
+ /* parse flowid */
+ flowid = (uint16)bcm_strtoul(msg, &end_ptr, 10);
+ if (*end_ptr != '\0') {
+ DHD_ERROR(("msg not truncated with NULL character\n"));
+ return BCME_ERROR;
+ }
+
+ /* Find flowid from ifidx 0 since this IOVAR creating flowring with ifidx 0 */
+ if (dhd_flowid_find_by_ifidx(dhd, 0, flowid) != BCME_OK)
+ {
+ DHD_ERROR(("%s : Deleting not created flowid: %u\n", __FUNCTION__, flowid));
+ return BCME_ERROR;
+ }
+
+ flow_ring_table = (flow_ring_table_t *)dhd->flow_ring_table;
+ ret = dhd_bus_flow_ring_delete_request(dhd->bus, (void *)&flow_ring_table[flowid]);
+ if (ret != BCME_OK) {
+ DHD_ERROR(("%s: flowring deletion failed ret: %d\n", __FUNCTION__, ret));
+ return BCME_ERROR;
+ }
+ return BCME_OK;
+ }
+ DHD_ERROR(("%s: neither create nor delete\n", __FUNCTION__));
+ return BCME_ERROR;
+}
+#endif /* BCMPCIE */
+#endif /* DHD_DEBUG */
+
static int
dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, uint32 actionid, const char *name,
void *params, int plen, void *arg, int len, int val_size)
{
int bcmerror = 0;
int32 int_val = 0;
+ uint32 dhd_ver_len, bus_api_rev_len;
DHD_TRACE(("%s: Enter\n", __FUNCTION__));
DHD_TRACE(("%s: actionid = %d; name %s\n", __FUNCTION__, actionid, name));
@@ -700,7 +1587,13 @@
switch (actionid) {
case IOV_GVAL(IOV_VERSION):
/* Need to have checked buffer length */
- bcm_strncpy_s((char*)arg, len, dhd_version, len);
+ dhd_ver_len = strlen(dhd_version);
+ bus_api_rev_len = strlen(bus_api_revision);
+ if (dhd_ver_len)
+ bcm_strncpy_s((char*)arg, dhd_ver_len, dhd_version, dhd_ver_len);
+ if (bus_api_rev_len)
+ bcm_strncat_s((char*)arg + dhd_ver_len, bus_api_rev_len, bus_api_revision,
+ bus_api_rev_len);
break;
case IOV_GVAL(IOV_MSGLEVEL):
@@ -729,12 +1622,10 @@
bcopy(&int_val, arg, val_size);
break;
-#ifndef BCMDBUS
case IOV_GVAL(IOV_WDTICK):
int_val = (int32)dhd_watchdog_ms;
bcopy(&int_val, arg, val_size);
break;
-#endif
case IOV_SVAL(IOV_WDTICK):
if (!dhd_pub->up) {
@@ -742,34 +1633,33 @@
break;
}
- if (CUSTOM_DHD_WATCHDOG_MS == 0 && int_val == 0) {
- dhd_watchdog_ms = (uint)int_val;
- }
+ dhd_watchdog_ms = (uint)int_val;
dhd_os_wd_timer(dhd_pub, (uint)int_val);
break;
case IOV_GVAL(IOV_DUMP):
- bcmerror = dhd_dump(dhd_pub, arg, len);
+ if (dhd_dump(dhd_pub, arg, len) <= 0)
+ bcmerror = BCME_ERROR;
+ else
+ bcmerror = BCME_OK;
break;
-#ifndef BCMDBUS
-#ifdef DHD_DEBUG
case IOV_GVAL(IOV_DCONSOLE_POLL):
- int_val = (int32)dhd_console_ms;
+ int_val = (int32)dhd_pub->dhd_console_ms;
bcopy(&int_val, arg, val_size);
break;
case IOV_SVAL(IOV_DCONSOLE_POLL):
- dhd_console_ms = (uint)int_val;
+ dhd_pub->dhd_console_ms = (uint)int_val;
break;
+#if defined(DHD_DEBUG)
case IOV_SVAL(IOV_CONS):
if (len > 0)
bcmerror = dhd_bus_console_in(dhd_pub, arg, len - 1);
break;
#endif /* DHD_DEBUG */
-#endif /* BCMDBUS */
case IOV_SVAL(IOV_CLEARCOUNTS):
dhd_pub->tx_packets = dhd_pub->rx_packets = 0;
@@ -783,15 +1673,17 @@
dhd_pub->rx_readahead_cnt = 0;
dhd_pub->tx_realloc = 0;
dhd_pub->wd_dpc_sched = 0;
+ dhd_pub->tx_big_packets = 0;
memset(&dhd_pub->dstats, 0, sizeof(dhd_pub->dstats));
dhd_bus_clearcounts(dhd_pub);
#ifdef PROP_TXSTATUS
/* clear proptxstatus related counters */
dhd_wlfc_clear_counts(dhd_pub);
#endif /* PROP_TXSTATUS */
+#if defined(DHD_LB_STATS)
DHD_LB_STATS_RESET(dhd_pub);
+#endif /* DHD_LB_STATS */
break;
-
case IOV_GVAL(IOV_IOCTLTIMEOUT): {
int_val = (int32)dhd_os_get_ioctl_resp_timeout();
@@ -806,7 +1698,6 @@
dhd_os_set_ioctl_resp_timeout((unsigned int)int_val);
break;
}
-
#ifdef PROP_TXSTATUS
case IOV_GVAL(IOV_PROPTXSTATUS_ENABLE): {
@@ -896,28 +1787,16 @@
/* The dhd application queries the driver to check if its usb or sdio. */
#ifdef BCMDHDUSB
int_val = BUS_TYPE_USB;
-#endif
+#endif // endif
#ifdef BCMSDIO
int_val = BUS_TYPE_SDIO;
-#endif
+#endif // endif
#ifdef PCIE_FULL_DONGLE
int_val = BUS_TYPE_PCIE;
-#endif
+#endif // endif
bcopy(&int_val, arg, val_size);
break;
-
-#ifdef WLMEDIA_HTSF
- case IOV_GVAL(IOV_WLPKTDLYSTAT_SZ):
- int_val = dhd_pub->htsfdlystat_sz;
- bcopy(&int_val, arg, val_size);
- break;
-
- case IOV_SVAL(IOV_WLPKTDLYSTAT_SZ):
- dhd_pub->htsfdlystat_sz = int_val & 0xff;
- printf("Setting tsfdlystat_sz:%d\n", dhd_pub->htsfdlystat_sz);
- break;
-#endif
case IOV_SVAL(IOV_CHANGEMTU):
int_val &= 0xffff;
bcmerror = dhd_change_mtu(dhd_pub, int_val, 0);
@@ -952,158 +1831,12 @@
break;
}
#endif /* DHDTCPACK_SUPPRESS */
-#ifdef DHD_WMF
- case IOV_GVAL(IOV_WMF_BSS_ENAB): {
- uint32 bssidx;
- dhd_wmf_t *wmf;
- char *val;
-
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
- DHD_ERROR(("%s: wmf_bss_enable: bad parameter\n", __FUNCTION__));
- bcmerror = BCME_BADARG;
- break;
- }
-
- wmf = dhd_wmf_conf(dhd_pub, bssidx);
- int_val = wmf->wmf_enable ? 1 :0;
- bcopy(&int_val, arg, val_size);
- break;
- }
- case IOV_SVAL(IOV_WMF_BSS_ENAB): {
- /* Enable/Disable WMF */
- uint32 bssidx;
- dhd_wmf_t *wmf;
- char *val;
-
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
- DHD_ERROR(("%s: wmf_bss_enable: bad parameter\n", __FUNCTION__));
- bcmerror = BCME_BADARG;
- break;
- }
-
- ASSERT(val);
- bcopy(val, &int_val, sizeof(uint32));
- wmf = dhd_wmf_conf(dhd_pub, bssidx);
- if (wmf->wmf_enable == int_val)
- break;
- if (int_val) {
- /* Enable WMF */
- if (dhd_wmf_instance_add(dhd_pub, bssidx) != BCME_OK) {
- DHD_ERROR(("%s: Error in creating WMF instance\n",
- __FUNCTION__));
- break;
- }
- if (dhd_wmf_start(dhd_pub, bssidx) != BCME_OK) {
- DHD_ERROR(("%s: Failed to start WMF\n", __FUNCTION__));
- break;
- }
- wmf->wmf_enable = TRUE;
- } else {
- /* Disable WMF */
- wmf->wmf_enable = FALSE;
- dhd_wmf_stop(dhd_pub, bssidx);
- dhd_wmf_instance_del(dhd_pub, bssidx);
- }
- break;
- }
- case IOV_GVAL(IOV_WMF_UCAST_IGMP):
- int_val = dhd_pub->wmf_ucast_igmp ? 1 : 0;
- bcopy(&int_val, arg, val_size);
- break;
- case IOV_SVAL(IOV_WMF_UCAST_IGMP):
- if (dhd_pub->wmf_ucast_igmp == int_val)
- break;
-
- if (int_val >= OFF && int_val <= ON)
- dhd_pub->wmf_ucast_igmp = int_val;
- else
- bcmerror = BCME_RANGE;
- break;
- case IOV_GVAL(IOV_WMF_MCAST_DATA_SENDUP):
- int_val = dhd_wmf_mcast_data_sendup(dhd_pub, 0, FALSE, FALSE);
- bcopy(&int_val, arg, val_size);
- break;
- case IOV_SVAL(IOV_WMF_MCAST_DATA_SENDUP):
- dhd_wmf_mcast_data_sendup(dhd_pub, 0, TRUE, int_val);
- break;
-
-#ifdef WL_IGMP_UCQUERY
- case IOV_GVAL(IOV_WMF_UCAST_IGMP_QUERY):
- int_val = dhd_pub->wmf_ucast_igmp_query ? 1 : 0;
- bcopy(&int_val, arg, val_size);
- break;
- case IOV_SVAL(IOV_WMF_UCAST_IGMP_QUERY):
- if (dhd_pub->wmf_ucast_igmp_query == int_val)
- break;
-
- if (int_val >= OFF && int_val <= ON)
- dhd_pub->wmf_ucast_igmp_query = int_val;
- else
- bcmerror = BCME_RANGE;
- break;
-#endif /* WL_IGMP_UCQUERY */
-#ifdef DHD_UCAST_UPNP
- case IOV_GVAL(IOV_WMF_UCAST_UPNP):
- int_val = dhd_pub->wmf_ucast_upnp ? 1 : 0;
- bcopy(&int_val, arg, val_size);
- break;
- case IOV_SVAL(IOV_WMF_UCAST_UPNP):
- if (dhd_pub->wmf_ucast_upnp == int_val)
- break;
-
- if (int_val >= OFF && int_val <= ON)
- dhd_pub->wmf_ucast_upnp = int_val;
- else
- bcmerror = BCME_RANGE;
- break;
-#endif /* DHD_UCAST_UPNP */
-
- case IOV_GVAL(IOV_WMF_PSTA_DISABLE): {
- uint32 bssidx;
- char *val;
-
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
- DHD_ERROR(("%s: ap isoalate: bad parameter\n", __FUNCTION__));
- bcmerror = BCME_BADARG;
- break;
- }
-
- int_val = dhd_get_wmf_psta_disable(dhd_pub, bssidx);
- bcopy(&int_val, arg, val_size);
- break;
- }
-
- case IOV_SVAL(IOV_WMF_PSTA_DISABLE): {
- uint32 bssidx;
- char *val;
-
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
- DHD_ERROR(("%s: ap isolate: bad parameter\n", __FUNCTION__));
- bcmerror = BCME_BADARG;
- break;
- }
-
- ASSERT(val);
- bcopy(val, &int_val, sizeof(uint32));
- dhd_set_wmf_psta_disable(dhd_pub, bssidx, int_val);
- break;
- }
-#endif /* DHD_WMF */
-
-#if defined(TRAFFIC_MGMT_DWM)
- case IOV_SVAL(IOV_TRAFFIC_MGMT_DWM): {
- trf_mgmt_filter_list_t *trf_mgmt_filter_list =
- (trf_mgmt_filter_list_t *)(arg);
- bcmerror = traffic_mgmt_add_dwm_filter(dhd_pub, trf_mgmt_filter_list, len);
- }
- break;
-#endif
#ifdef DHD_L2_FILTER
case IOV_GVAL(IOV_DHCP_UNICAST): {
uint32 bssidx;
- char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ const char *val;
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_DHCP_UNICAST: bad parameterand name = %s\n",
__FUNCTION__, name));
bcmerror = BCME_BADARG;
@@ -1115,8 +1848,8 @@
}
case IOV_SVAL(IOV_DHCP_UNICAST): {
uint32 bssidx;
- char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ const char *val;
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_DHCP_UNICAST: bad parameterand name = %s\n",
__FUNCTION__, name));
bcmerror = BCME_BADARG;
@@ -1128,9 +1861,9 @@
}
case IOV_GVAL(IOV_BLOCK_PING): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_BLOCK_PING: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1141,9 +1874,9 @@
}
case IOV_SVAL(IOV_BLOCK_PING): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_BLOCK_PING: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1154,9 +1887,9 @@
}
case IOV_GVAL(IOV_PROXY_ARP): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_PROXY_ARP: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1167,9 +1900,9 @@
}
case IOV_SVAL(IOV_PROXY_ARP): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_PROXY_ARP: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1188,9 +1921,9 @@
}
case IOV_GVAL(IOV_GRAT_ARP): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_GRAT_ARP: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1201,9 +1934,9 @@
}
case IOV_SVAL(IOV_GRAT_ARP): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: IOV_GRAT_ARP: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1212,12 +1945,38 @@
bcmerror = dhd_set_grat_arp_status(dhd_pub, bssidx, int_val ? 1 : 0);
break;
}
+ case IOV_GVAL(IOV_BLOCK_TDLS): {
+ uint32 bssidx;
+ const char *val;
+
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
+ DHD_ERROR(("%s: IOV_BLOCK_TDLS: bad parameter\n", __FUNCTION__));
+ bcmerror = BCME_BADARG;
+ break;
+ }
+ int_val = dhd_get_block_tdls_status(dhd_pub, bssidx);
+ memcpy(arg, &int_val, val_size);
+ break;
+ }
+ case IOV_SVAL(IOV_BLOCK_TDLS): {
+ uint32 bssidx;
+ const char *val;
+
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
+ DHD_ERROR(("%s: IOV_BLOCK_TDLS: bad parameter\n", __FUNCTION__));
+ bcmerror = BCME_BADARG;
+ break;
+ }
+ memcpy(&int_val, val, sizeof(int_val));
+ bcmerror = dhd_set_block_tdls_status(dhd_pub, bssidx, int_val ? 1 : 0);
+ break;
+ }
#endif /* DHD_L2_FILTER */
case IOV_SVAL(IOV_DHD_IE): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: dhd ie: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1227,9 +1986,9 @@
}
case IOV_GVAL(IOV_AP_ISOLATE): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: ap isoalate: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1241,9 +2000,9 @@
}
case IOV_SVAL(IOV_AP_ISOLATE): {
uint32 bssidx;
- char *val;
+ const char *val;
- if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
+ if (dhd_iovar_parse_bssidx(dhd_pub, name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: ap isolate: bad parameter\n", __FUNCTION__));
bcmerror = BCME_BADARG;
break;
@@ -1269,11 +2028,34 @@
break;
}
#endif /* DHD_PSTA */
+#ifdef DHD_WET
+ case IOV_GVAL(IOV_WET):
+ int_val = dhd_get_wet_mode(dhd_pub);
+ bcopy(&int_val, arg, val_size);
+ break;
+ case IOV_SVAL(IOV_WET):
+ if (int_val == 0 || int_val == 1) {
+ dhd_set_wet_mode(dhd_pub, int_val);
+ /* Delete the WET DB when disabled */
+ if (!int_val) {
+ dhd_wet_sta_delete_list(dhd_pub);
+ }
+ } else {
+ bcmerror = BCME_RANGE;
+ }
+ break;
+ case IOV_SVAL(IOV_WET_HOST_IPV4):
+ dhd_set_wet_host_ipv4(dhd_pub, params, plen);
+ break;
+ case IOV_SVAL(IOV_WET_HOST_MAC):
+ dhd_set_wet_host_mac(dhd_pub, params, plen);
+ break;
+#endif /* DHD_WET */
#ifdef DHD_MCAST_REGEN
case IOV_GVAL(IOV_MCAST_REGEN_BSS_ENABLE): {
uint32 bssidx;
- char *val;
+ const char *val;
if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: mcast_regen_bss_enable: bad parameter\n", __FUNCTION__));
@@ -1288,7 +2070,7 @@
case IOV_SVAL(IOV_MCAST_REGEN_BSS_ENABLE): {
uint32 bssidx;
- char *val;
+ const char *val;
if (dhd_iovar_parse_bssidx(dhd_pub, (char *)name, &bssidx, &val) != BCME_OK) {
DHD_ERROR(("%s: mcast_regen_bss_enable: bad parameter\n", __FUNCTION__));
@@ -1302,31 +2084,6 @@
break;
}
#endif /* DHD_MCAST_REGEN */
-
-#ifdef DHD_WET
- case IOV_GVAL(IOV_WET):
- int_val = dhd_get_wet_mode(dhd_pub);
- bcopy(&int_val, arg, val_size);
- break;
-
- case IOV_SVAL(IOV_WET):
- if (int_val == 0 || int_val == 1) {
- dhd_set_wet_mode(dhd_pub, int_val);
- /* Delete the WET DB when disabled */
- if (!int_val) {
- dhd_wet_sta_delete_list(dhd_pub);
- }
- } else {
- bcmerror = BCME_RANGE;
- }
- break;
- case IOV_SVAL(IOV_WET_HOST_IPV4):
- dhd_set_wet_host_ipv4(dhd_pub, params, plen);
- break;
- case IOV_SVAL(IOV_WET_HOST_MAC):
- dhd_set_wet_host_mac(dhd_pub, params, plen);
- break;
-#endif /* DHD_WET */
case IOV_GVAL(IOV_CFG80211_OPMODE): {
int_val = (int32)dhd_pub->op_mode;
@@ -1350,7 +2107,7 @@
g_assert_type = (uint32)int_val;
break;
-
+#if !defined(MACOSX_DHD)
case IOV_GVAL(IOV_LMTEST): {
*(uint32 *)arg = (uint32)lmtest;
break;
@@ -1367,6 +2124,177 @@
}
break;
}
+#endif // endif
+
+#ifdef SHOW_LOGTRACE
+ case IOV_GVAL(IOV_DUMP_TRACE_LOG): {
+ trace_buf_info_t *trace_buf_info = (trace_buf_info_t *)arg;
+ dhd_dbg_ring_t *dbg_verbose_ring = NULL;
+
+ dbg_verbose_ring = dhd_dbg_get_ring_from_ring_id(dhd_pub, FW_VERBOSE_RING_ID);
+ if (dbg_verbose_ring == NULL) {
+ DHD_ERROR(("dbg_verbose_ring is NULL\n"));
+ bcmerror = BCME_UNSUPPORTED;
+ break;
+ }
+
+ if (trace_buf_info != NULL) {
+ bzero(trace_buf_info, sizeof(trace_buf_info_t));
+ dhd_dbg_read_ring_into_trace_buf(dbg_verbose_ring, trace_buf_info);
+ } else {
+ DHD_ERROR(("%s: arg is NULL\n", __FUNCTION__));
+ bcmerror = BCME_NOMEM;
+ }
+ break;
+ }
+#endif /* SHOW_LOGTRACE */
+ case IOV_GVAL(IOV_DONGLE_TRAP_TYPE):
+ if (dhd_pub->dongle_trap_occured)
+ int_val = ltoh32(dhd_pub->last_trap_info.type);
+ else
+ int_val = 0;
+ bcopy(&int_val, arg, val_size);
+ break;
+
+ case IOV_GVAL(IOV_DONGLE_TRAP_INFO):
+ {
+ struct bcmstrbuf strbuf;
+ bcm_binit(&strbuf, arg, len);
+ if (dhd_pub->dongle_trap_occured == FALSE) {
+ bcm_bprintf(&strbuf, "no trap recorded\n");
+ break;
+ }
+ dhd_bus_dump_trap_info(dhd_pub->bus, &strbuf);
+ break;
+ }
+#ifdef DHD_DEBUG
+#if defined(BCMSDIO) || defined(BCMPCIE)
+
+ case IOV_GVAL(IOV_BPADDR):
+ {
+ sdreg_t sdreg;
+ uint32 addr, size;
+
+ memcpy(&sdreg, params, sizeof(sdreg));
+
+ addr = sdreg.offset;
+ size = sdreg.func;
+
+ bcmerror = dhd_bus_readwrite_bp_addr(dhd_pub, addr, size,
+ (uint *)&int_val, TRUE);
+
+ memcpy(arg, &int_val, sizeof(int32));
+
+ break;
+ }
+
+ case IOV_SVAL(IOV_BPADDR):
+ {
+ sdreg_t sdreg;
+ uint32 addr, size;
+
+ memcpy(&sdreg, params, sizeof(sdreg));
+
+ addr = sdreg.offset;
+ size = sdreg.func;
+
+ bcmerror = dhd_bus_readwrite_bp_addr(dhd_pub, addr, size,
+ (uint *)&sdreg.value,
+ FALSE);
+
+ break;
+ }
+#endif /* BCMSDIO || BCMPCIE */
+#ifdef BCMPCIE
+ case IOV_SVAL(IOV_FLOW_RING_DEBUG):
+ {
+ bcmerror = dhd_flow_ring_debug(dhd_pub, arg, len);
+ break;
+ }
+#endif /* BCMPCIE */
+ case IOV_SVAL(IOV_MEM_DEBUG):
+ if (len > 0) {
+ bcmerror = dhd_mem_debug(dhd_pub, arg, len - 1);
+ }
+ break;
+#endif /* DHD_DEBUG */
+#if defined(DHD_LOG_DUMP)
+ case IOV_GVAL(IOV_LOG_DUMP):
+ {
+ dhd_prot_debug_info_print(dhd_pub);
+ dhd_log_dump_trigger(dhd_pub, CMD_DEFAULT);
+ break;
+ }
+#endif /* DHD_LOG_DUMP */
+#ifndef OEM_ANDROID
+ case IOV_GVAL(IOV_TPUT_TEST):
+ {
+ tput_test_t *tput_data = NULL;
+ if (params && plen >= sizeof(tput_test_t)) {
+ tput_data = (tput_test_t *)params;
+ bcmerror = dhd_tput_test(dhd_pub, tput_data);
+ } else {
+ DHD_ERROR(("%s: tput test - no input params ! \n", __FUNCTION__));
+ bcmerror = BCME_BADARG;
+ }
+ break;
+ }
+#endif /* OEM_ANDROID */
+ case IOV_GVAL(IOV_DEBUG_BUF_DEST_STAT):
+ {
+ if (dhd_pub->debug_buf_dest_support) {
+ debug_buf_dest_stat_t *debug_buf_dest_stat =
+ (debug_buf_dest_stat_t *)arg;
+ memcpy(debug_buf_dest_stat, dhd_pub->debug_buf_dest_stat,
+ sizeof(dhd_pub->debug_buf_dest_stat));
+ } else {
+ bcmerror = BCME_DISABLED;
+ }
+ break;
+ }
+
+#ifdef DHD_DEBUG
+ case IOV_SVAL(IOV_INDUCE_ERROR): {
+ if (int_val >= DHD_INDUCE_ERROR_MAX) {
+ DHD_ERROR(("%s: Invalid command : %u\n", __FUNCTION__, (uint16)int_val));
+ } else {
+ dhd_pub->dhd_induce_error = (uint16)int_val;
+ }
+ break;
+ }
+#endif /* DHD_DEBUG */
+
+#ifdef WL_IFACE_MGMT_CONF
+#ifdef WL_CFG80211
+#ifdef WL_NANP2P
+ case IOV_GVAL(IOV_CONC_DISC): {
+ int_val = wl_cfg80211_get_iface_conc_disc(
+ dhd_linux_get_primary_netdev(dhd_pub));
+ bcopy(&int_val, arg, sizeof(int_val));
+ break;
+ }
+ case IOV_SVAL(IOV_CONC_DISC): {
+ bcmerror = wl_cfg80211_set_iface_conc_disc(
+ dhd_linux_get_primary_netdev(dhd_pub), (uint8)int_val);
+ break;
+ }
+#endif /* WL_NANP2P */
+#ifdef WL_IFACE_MGMT
+ case IOV_GVAL(IOV_IFACE_POLICY): {
+ int_val = wl_cfg80211_get_iface_policy(
+ dhd_linux_get_primary_netdev(dhd_pub));
+ bcopy(&int_val, arg, sizeof(int_val));
+ break;
+ }
+ case IOV_SVAL(IOV_IFACE_POLICY): {
+ bcmerror = wl_cfg80211_set_iface_policy(
+ dhd_linux_get_primary_netdev(dhd_pub),
+ arg, len);
+ break;
+ }
+#endif /* WL_IFACE_MGMT */
+#endif /* WL_CFG80211 */
+#endif /* WL_IFACE_MGMT_CONF */
default:
bcmerror = BCME_UNSUPPORTED;
break;
@@ -1403,13 +2331,13 @@
/* Fast case, precedence queue is not full and we are also not
* exceeding total queue length
*/
- if (!pktq_pfull(q, prec) && !pktq_full(q)) {
+ if (!pktqprec_full(q, prec) && !pktq_full(q)) {
pktq_penq(q, prec, pkt);
return TRUE;
}
/* Determine precedence from which to evict packet, if any */
- if (pktq_pfull(q, prec))
+ if (pktqprec_full(q, prec))
eprec = prec;
else if (pktq_full(q)) {
p = pktq_peek_tail(q, &eprec);
@@ -1421,7 +2349,7 @@
/* Evict if needed */
if (eprec >= 0) {
/* Detect queueing to unconfigured precedence */
- ASSERT(!pktq_pempty(q, eprec));
+ ASSERT(!pktqprec_empty(q, eprec));
discard_oldest = AC_BITMAP_TST(dhdp->wme_dp, eprec);
if (eprec == prec && !discard_oldest)
return FALSE; /* refuse newer (incoming) packet */
@@ -1506,8 +2434,12 @@
p = first;
while (p) {
next = PKTLINK(p);
- q->len--;
- pq->len--;
+ q->n_pkts--;
+ pq->n_pkts_tot--;
+
+#ifdef WL_TXQ_STALL
+ q->dequeue_count++;
+#endif // endif
PKTSETLINK(p, NULL);
@@ -1585,9 +2517,10 @@
}
int
-dhd_ioctl(dhd_pub_t * dhd_pub, dhd_ioctl_t *ioc, void * buf, uint buflen)
+dhd_ioctl(dhd_pub_t * dhd_pub, dhd_ioctl_t *ioc, void *buf, uint buflen)
{
int bcmerror = 0;
+ unsigned long flags;
DHD_TRACE(("%s: Enter\n", __FUNCTION__));
@@ -1595,101 +2528,156 @@
return BCME_BADARG;
}
+ dhd_os_dhdiovar_lock(dhd_pub);
switch (ioc->cmd) {
- case DHD_GET_MAGIC:
- if (buflen < sizeof(int))
- bcmerror = BCME_BUFTOOSHORT;
- else
- *(int*)buf = DHD_IOCTL_MAGIC;
- break;
-
- case DHD_GET_VERSION:
- if (buflen < sizeof(int))
- bcmerror = BCME_BUFTOOSHORT;
- else
- *(int*)buf = DHD_IOCTL_VERSION;
- break;
-
- case DHD_GET_VAR:
- case DHD_SET_VAR: {
- char *arg;
- uint arglen;
-
- /* scan past the name to any arguments */
- for (arg = buf, arglen = buflen; *arg && arglen; arg++, arglen--)
- ;
-
- if (*arg) {
- bcmerror = BCME_BUFTOOSHORT;
- break;
- }
-
- /* account for the NUL terminator */
- arg++, arglen--;
-
- /* call with the appropriate arguments */
- if (ioc->cmd == DHD_GET_VAR)
- bcmerror = dhd_iovar_op(dhd_pub, buf, arg, arglen,
- buf, buflen, IOV_GET);
- else
- bcmerror = dhd_iovar_op(dhd_pub, buf, NULL, 0, arg, arglen, IOV_SET);
- if (bcmerror != BCME_UNSUPPORTED)
+ case DHD_GET_MAGIC:
+ if (buflen < sizeof(int))
+ bcmerror = BCME_BUFTOOSHORT;
+ else
+ *(int*)buf = DHD_IOCTL_MAGIC;
break;
- /* not in generic table, try protocol module */
- if (ioc->cmd == DHD_GET_VAR)
- bcmerror = dhd_prot_iovar_op(dhd_pub, buf, arg,
- arglen, buf, buflen, IOV_GET);
- else
- bcmerror = dhd_prot_iovar_op(dhd_pub, buf,
- NULL, 0, arg, arglen, IOV_SET);
- if (bcmerror != BCME_UNSUPPORTED)
+ case DHD_GET_VERSION:
+ if (buflen < sizeof(int))
+ bcmerror = BCME_BUFTOOSHORT;
+ else
+ *(int*)buf = DHD_IOCTL_VERSION;
break;
- /* if still not found, try bus module */
- if (ioc->cmd == DHD_GET_VAR) {
-#ifdef BCMDBUS
- bcmerror = dbus_iovar_op(dhd_pub->dbus, buf,
- arg, arglen, buf, buflen, IOV_GET);
-#else
- bcmerror = dhd_bus_iovar_op(dhd_pub, buf,
- arg, arglen, buf, buflen, IOV_GET);
-#endif
- } else {
-#ifdef BCMDBUS
- bcmerror = dbus_iovar_op(dhd_pub->dbus, buf,
- NULL, 0, arg, arglen, IOV_SET);
-#else
- bcmerror = dhd_bus_iovar_op(dhd_pub, buf,
- NULL, 0, arg, arglen, IOV_SET);
-#endif
- }
+ case DHD_GET_VAR:
+ case DHD_SET_VAR:
+ {
+ char *arg;
+ uint arglen;
- break;
+ DHD_LINUX_GENERAL_LOCK(dhd_pub, flags);
+ if (DHD_BUS_CHECK_DOWN_OR_DOWN_IN_PROGRESS(dhd_pub) &&
+ bcmstricmp((char *)buf, "devreset")) {
+ /* In platforms like FC19, the FW download is done via IOCTL
+ * and should not return error for IOCTLs fired before FW
+ * Download is done
+ */
+ if (dhd_fw_download_status(dhd_pub) == FW_DOWNLOAD_DONE) {
+ DHD_ERROR(("%s: returning as busstate=%d\n",
+ __FUNCTION__, dhd_pub->busstate));
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
+ dhd_os_dhdiovar_unlock(dhd_pub);
+ return -ENODEV;
+ }
+ }
+ DHD_BUS_BUSY_SET_IN_DHD_IOVAR(dhd_pub);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
+
+#ifdef DHD_PCIE_RUNTIMEPM
+ dhdpcie_runtime_bus_wake(dhd_pub, TRUE, dhd_ioctl);
+#endif /* DHD_PCIE_RUNTIMEPM */
+
+ DHD_LINUX_GENERAL_LOCK(dhd_pub, flags);
+ if (DHD_BUS_CHECK_SUSPEND_OR_SUSPEND_IN_PROGRESS(dhd_pub)) {
+ /* If Suspend/Resume is tested via pcie_suspend IOVAR
+ * then continue to execute the IOVAR, return from here for
+ * other IOVARs, also include pciecfgreg and devreset to go
+ * through.
+ */
+ if (bcmstricmp((char *)buf, "pcie_suspend") &&
+ bcmstricmp((char *)buf, "pciecfgreg") &&
+ bcmstricmp((char *)buf, "devreset") &&
+ bcmstricmp((char *)buf, "sdio_suspend")) {
+ DHD_ERROR(("%s: bus is in suspend(%d)"
+ "or suspending(0x%x) state\n",
+ __FUNCTION__, dhd_pub->busstate,
+ dhd_pub->dhd_bus_busy_state));
+ DHD_BUS_BUSY_CLEAR_IN_DHD_IOVAR(dhd_pub);
+ dhd_os_busbusy_wake(dhd_pub);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
+ dhd_os_dhdiovar_unlock(dhd_pub);
+ return -ENODEV;
+ }
+ }
+ /* During devreset ioctl, we call dhdpcie_advertise_bus_cleanup,
+ * which will wait for all the busy contexts to get over for
+ * particular time and call ASSERT if timeout happens. As during
+ * devreset ioctal, we made DHD_BUS_BUSY_SET_IN_DHD_IOVAR,
+ * to avoid ASSERT, clear the IOCTL busy state. "devreset" ioctl is
+ * not used in Production platforms but only used in FC19 setups.
+ */
+ if (!bcmstricmp((char *)buf, "devreset") ||
+#ifdef BCMPCIE
+ (dhd_bus_is_multibp_capable(dhd_pub->bus) &&
+ !bcmstricmp((char *)buf, "dwnldstate")) ||
+#endif /* BCMPCIE */
+ FALSE)
+ {
+ DHD_BUS_BUSY_CLEAR_IN_DHD_IOVAR(dhd_pub);
+ }
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
+
+ /* scan past the name to any arguments */
+ for (arg = buf, arglen = buflen; *arg && arglen; arg++, arglen--)
+ ;
+
+ if (*arg) {
+ bcmerror = BCME_BUFTOOSHORT;
+ goto unlock_exit;
+ }
+
+ /* account for the NUL terminator */
+ arg++, arglen--;
+ /* call with the appropriate arguments */
+ if (ioc->cmd == DHD_GET_VAR) {
+ bcmerror = dhd_iovar_op(dhd_pub, buf, arg, arglen,
+ buf, buflen, IOV_GET);
+ } else {
+ bcmerror = dhd_iovar_op(dhd_pub, buf, NULL, 0,
+ arg, arglen, IOV_SET);
+ }
+ if (bcmerror != BCME_UNSUPPORTED) {
+ goto unlock_exit;
+ }
+
+ /* not in generic table, try protocol module */
+ if (ioc->cmd == DHD_GET_VAR) {
+ bcmerror = dhd_prot_iovar_op(dhd_pub, buf, arg,
+ arglen, buf, buflen, IOV_GET);
+ } else {
+ bcmerror = dhd_prot_iovar_op(dhd_pub, buf,
+ NULL, 0, arg, arglen, IOV_SET);
+ }
+ if (bcmerror != BCME_UNSUPPORTED) {
+ goto unlock_exit;
+ }
+
+ /* if still not found, try bus module */
+ if (ioc->cmd == DHD_GET_VAR) {
+ bcmerror = dhd_bus_iovar_op(dhd_pub, buf,
+ arg, arglen, buf, buflen, IOV_GET);
+ } else {
+ bcmerror = dhd_bus_iovar_op(dhd_pub, buf,
+ NULL, 0, arg, arglen, IOV_SET);
+ }
+ if (bcmerror != BCME_UNSUPPORTED) {
+ goto unlock_exit;
+ }
+
+ }
+ goto unlock_exit;
+
+ default:
+ bcmerror = BCME_UNSUPPORTED;
}
+ dhd_os_dhdiovar_unlock(dhd_pub);
+ return bcmerror;
- default:
- bcmerror = BCME_UNSUPPORTED;
- }
-
+unlock_exit:
+ DHD_LINUX_GENERAL_LOCK(dhd_pub, flags);
+ DHD_BUS_BUSY_CLEAR_IN_DHD_IOVAR(dhd_pub);
+ dhd_os_busbusy_wake(dhd_pub);
+ DHD_LINUX_GENERAL_UNLOCK(dhd_pub, flags);
+ dhd_os_dhdiovar_unlock(dhd_pub);
return bcmerror;
}
#ifdef SHOW_EVENTS
-#ifdef SHOW_LOGTRACE
-
-#define MAX_NO_OF_ARG 16
-
-#define FMTSTR_SIZE 132
-#define SIZE_LOC_STR 50
-#define MIN_DLEN 4
-#define TAG_BYTES 12
-#define TAG_WORDS 3
-#define ROMSTR_SIZE 200
-
-
-
-#endif /* SHOW_LOGTRACE */
static void
wl_show_host_event(dhd_pub_t *dhd_pub, wl_event_msg_t *event, void *event_data,
@@ -1713,13 +2701,7 @@
datalen = ntoh32(event->datalen);
/* debug dump of event messages */
- snprintf(eabuf, sizeof(eabuf), "%02x:%02x:%02x:%02x:%02x:%02x",
- (uchar)event->addr.octet[0]&0xff,
- (uchar)event->addr.octet[1]&0xff,
- (uchar)event->addr.octet[2]&0xff,
- (uchar)event->addr.octet[3]&0xff,
- (uchar)event->addr.octet[4]&0xff,
- (uchar)event->addr.octet[5]&0xff);
+ snprintf(eabuf, sizeof(eabuf), MACDBG, MAC2STRDBG(event->addr.octet));
event_name = bcmevent_get_name(event_type);
BCM_REFERENCE(event_name);
@@ -1742,6 +2724,7 @@
case WLC_E_REASSOC_IND:
DHD_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf));
+
break;
case WLC_E_ASSOC:
@@ -1751,12 +2734,13 @@
} else if (status == WLC_E_STATUS_TIMEOUT) {
DHD_EVENT(("MACEVENT: %s, MAC %s, TIMEOUT\n", event_name, eabuf));
} else if (status == WLC_E_STATUS_FAIL) {
- DHD_EVENT(("MACEVENT: %s, MAC %s, FAILURE, reason %d\n",
- event_name, eabuf, (int)reason));
+ DHD_EVENT(("MACEVENT: %s, MAC %s, FAILURE, status %d reason %d\n",
+ event_name, eabuf, (int)status, (int)reason));
} else {
DHD_EVENT(("MACEVENT: %s, MAC %s, unexpected status %d\n",
event_name, eabuf, (int)status));
}
+
break;
case WLC_E_DEAUTH_IND:
@@ -1770,10 +2754,13 @@
auth_str = "Open System";
else if (auth_type == DOT11_SHARED_KEY)
auth_str = "Shared Key";
+ else if (auth_type == DOT11_SAE)
+ auth_str = "SAE";
else {
snprintf(err_msg, sizeof(err_msg), "AUTH unknown: %d", (int)auth_type);
auth_str = err_msg;
}
+
if (event_type == WLC_E_AUTH_IND) {
DHD_EVENT(("MACEVENT: %s, MAC %s, %s\n", event_name, eabuf, auth_str));
} else if (status == WLC_E_STATUS_SUCCESS) {
@@ -1783,8 +2770,14 @@
DHD_EVENT(("MACEVENT: %s, MAC %s, %s, TIMEOUT\n",
event_name, eabuf, auth_str));
} else if (status == WLC_E_STATUS_FAIL) {
- DHD_EVENT(("MACEVENT: %s, MAC %s, %s, FAILURE, reason %d\n",
- event_name, eabuf, auth_str, (int)reason));
+ DHD_EVENT(("MACEVENT: %s, MAC %s, %s, FAILURE, status %d reason %d\n",
+ event_name, eabuf, auth_str, (int)status, (int)reason));
+ } else if (status == WLC_E_STATUS_NO_ACK) {
+ DHD_EVENT(("MACEVENT: %s, MAC %s, %s, NOACK\n",
+ event_name, eabuf, auth_str));
+ } else {
+ DHD_EVENT(("MACEVENT: %s, MAC %s, %s, status %d reason %d\n",
+ event_name, eabuf, auth_str, (int)status, (int)reason));
}
BCM_REFERENCE(auth_str);
@@ -1795,13 +2788,15 @@
case WLC_E_SET_SSID:
if (status == WLC_E_STATUS_SUCCESS) {
DHD_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf));
- } else if (status == WLC_E_STATUS_FAIL) {
- DHD_EVENT(("MACEVENT: %s, failed\n", event_name));
- } else if (status == WLC_E_STATUS_NO_NETWORKS) {
- DHD_EVENT(("MACEVENT: %s, no networks found\n", event_name));
} else {
- DHD_EVENT(("MACEVENT: %s, unexpected status %d\n",
- event_name, (int)status));
+ if (status == WLC_E_STATUS_FAIL) {
+ DHD_EVENT(("MACEVENT: %s, failed status %d\n", event_name, status));
+ } else if (status == WLC_E_STATUS_NO_NETWORKS) {
+ DHD_EVENT(("MACEVENT: %s, no networks found\n", event_name));
+ } else {
+ DHD_EVENT(("MACEVENT: %s, unexpected status %d\n",
+ event_name, (int)status));
+ }
}
break;
@@ -1816,7 +2811,8 @@
break;
case WLC_E_LINK:
- DHD_EVENT(("MACEVENT: %s %s\n", event_name, link?"UP":"DOWN"));
+ DHD_EVENT(("MACEVENT: %s %s flags:0x%x status:%d\n",
+ event_name, link?"UP":"DOWN", flags, status));
BCM_REFERENCE(link);
break;
@@ -1841,17 +2837,32 @@
case WLC_E_ASSOC_REQ_IE:
case WLC_E_ASSOC_RESP_IE:
case WLC_E_PMKID_CACHE:
+ DHD_EVENT(("MACEVENT: %s\n", event_name));
+ break;
+
case WLC_E_SCAN_COMPLETE:
DHD_EVENT(("MACEVENT: %s\n", event_name));
break;
+
+ case WLC_E_IND_DOS_STATUS:
+ DHD_EVENT(("MACEVENT: %s\n", event_name));
+ break;
+
case WLC_E_RSSI_LQM:
case WLC_E_PFN_NET_FOUND:
case WLC_E_PFN_NET_LOST:
+ case WLC_E_PFN_SCAN_COMPLETE:
case WLC_E_PFN_SCAN_NONE:
case WLC_E_PFN_SCAN_ALLGONE:
case WLC_E_PFN_GSCAN_FULL_RESULT:
- case WLC_E_PFN_SWC:
+ case WLC_E_PFN_SSID_EXT:
DHD_EVENT(("PNOEVENT: %s\n", event_name));
+ break;
+
+ case WLC_E_PFN_SCAN_BACKOFF:
+ case WLC_E_PFN_BSSID_SCAN_BACKOFF:
+ DHD_EVENT(("PNOEVENT: %s, status %d, reason %d\n",
+ event_name, (int)status, (int)reason));
break;
case WLC_E_PSK_SUP:
@@ -1888,24 +2899,217 @@
case WLC_E_BT_WIFI_HANDOVER_REQ:
DHD_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf));
break;
-#endif
+#endif // endif
case WLC_E_CCA_CHAN_QUAL:
if (datalen) {
- buf = (uchar *) event_data;
- DHD_EVENT(("MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d, "
- "channel 0x%02x \n", event_name, event_type, eabuf, (int)status,
- (int)reason, (int)auth_type, *(buf + 4)));
+ cca_chan_qual_event_t *cca_event = (cca_chan_qual_event_t *)event_data;
+ if (cca_event->id == WL_CHAN_QUAL_FULLPM_CCA) {
+ cca_only_chan_qual_event_t *cca_only_event =
+ (cca_only_chan_qual_event_t *)cca_event;
+ BCM_REFERENCE(cca_only_event);
+ DHD_EVENT((
+ "MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d,"
+ " channel 0x%02x\n",
+ event_name, event_type, eabuf, (int)status,
+ (int)reason, (int)auth_type, cca_event->chanspec));
+ DHD_EVENT((
+ "\tTOTAL (dur %dms me %dms notme %dms interf %dms"
+ " ts 0x%08x)\n",
+ cca_only_event->cca_busy_ext.duration,
+ cca_only_event->cca_busy_ext.congest_ibss,
+ cca_only_event->cca_busy_ext.congest_obss,
+ cca_only_event->cca_busy_ext.interference,
+ cca_only_event->cca_busy_ext.timestamp));
+ DHD_EVENT((
+ "\t !PM (dur %dms me %dms notme %dms interf %dms)\n",
+ cca_only_event->cca_busy_nopm.duration,
+ cca_only_event->cca_busy_nopm.congest_ibss,
+ cca_only_event->cca_busy_nopm.congest_obss,
+ cca_only_event->cca_busy_nopm.interference));
+ DHD_EVENT((
+ "\t PM (dur %dms me %dms notme %dms interf %dms)\n",
+ cca_only_event->cca_busy_pm.duration,
+ cca_only_event->cca_busy_pm.congest_ibss,
+ cca_only_event->cca_busy_pm.congest_obss,
+ cca_only_event->cca_busy_pm.interference));
+ } else if (cca_event->id == WL_CHAN_QUAL_FULL_CCA) {
+ DHD_EVENT((
+ "MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d,"
+ " channel 0x%02x (dur %dms ibss %dms obss %dms interf %dms"
+ " ts 0x%08x)\n",
+ event_name, event_type, eabuf, (int)status,
+ (int)reason, (int)auth_type, cca_event->chanspec,
+ cca_event->cca_busy_ext.duration,
+ cca_event->cca_busy_ext.congest_ibss,
+ cca_event->cca_busy_ext.congest_obss,
+ cca_event->cca_busy_ext.interference,
+ cca_event->cca_busy_ext.timestamp));
+ } else if (cca_event->id == WL_CHAN_QUAL_CCA) {
+ DHD_EVENT((
+ "MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d,"
+ " channel 0x%02x (dur %dms busy %dms ts 0x%08x)\n",
+ event_name, event_type, eabuf, (int)status,
+ (int)reason, (int)auth_type, cca_event->chanspec,
+ cca_event->cca_busy.duration,
+ cca_event->cca_busy.congest,
+ cca_event->cca_busy.timestamp));
+ } else if ((cca_event->id == WL_CHAN_QUAL_NF) ||
+ (cca_event->id == WL_CHAN_QUAL_NF_LTE)) {
+ DHD_EVENT((
+ "MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d,"
+ " channel 0x%02x (NF[%d] %ddB)\n",
+ event_name, event_type, eabuf, (int)status,
+ (int)reason, (int)auth_type, cca_event->chanspec,
+ cca_event->id, cca_event->noise));
+ } else {
+ DHD_EVENT((
+ "MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d,"
+ " channel 0x%02x (unknown ID %d)\n",
+ event_name, event_type, eabuf, (int)status,
+ (int)reason, (int)auth_type, cca_event->chanspec,
+ cca_event->id));
+ }
}
break;
case WLC_E_ESCAN_RESULT:
{
- //DHD_EVENT(("MACEVENT: %s %d, MAC %s, status %d \n",
- // event_name, event_type, eabuf, (int)status));
- }
+ wl_escan_result_v2_t *escan_result =
+ (wl_escan_result_v2_t *)event_data;
+ BCM_REFERENCE(escan_result);
+#ifdef OEM_ANDROID
+ if ((status == WLC_E_STATUS_SUCCESS) || (status == WLC_E_STATUS_ABORT)) {
+ DHD_EVENT(("MACEVENT: %s %d, status %d sync-id %u\n",
+ event_name, event_type, (int)status,
+ dtoh16(escan_result->sync_id)));
+ } else {
+ DHD_TRACE(("MACEVENT: %s %d, MAC %s, status %d \n",
+ event_name, event_type, eabuf, (int)status));
+ }
+#else
+ DHD_EVENT(("MACEVENT: %s %d, MAC %s, status %d sync-id %u\n",
+ event_name, event_type, eabuf, (int)status, dtoh16(escan_result->sync_id)));
+#endif // endif
+
break;
+ }
+ case WLC_E_IF:
+ {
+ struct wl_event_data_if *ifevent = (struct wl_event_data_if *)event_data;
+ BCM_REFERENCE(ifevent);
+
+ DHD_EVENT(("MACEVENT: %s, opcode:0x%d ifidx:%d role:%d\n",
+ event_name, ifevent->opcode, ifevent->ifidx, ifevent->role));
+ break;
+ }
+#ifdef SHOW_LOGTRACE
+ case WLC_E_MSCH:
+ {
+ wl_mschdbg_event_handler(dhd_pub, raw_event_ptr, reason, event_data, datalen);
+ break;
+ }
+#endif /* SHOW_LOGTRACE */
+
+ case WLC_E_PSK_AUTH:
+ DHD_EVENT(("MACEVENT: %s, RA %s status %d Reason:%d\n",
+ event_name, eabuf, status, reason));
+ break;
+ case WLC_E_AGGR_EVENT:
+ {
+ event_aggr_data_t *aggrbuf = event_data;
+ int j = 0, len = 0;
+ uint8 *data = aggrbuf->data;
+ DHD_EVENT(("MACEVENT: %s, num of events %d total len %d sub events: ",
+ event_name, aggrbuf->num_events, aggrbuf->len));
+ for (j = 0; j < aggrbuf->num_events; j++)
+ {
+ wl_event_msg_t * sub_event = (wl_event_msg_t *)data;
+ if (len > aggrbuf->len) {
+ DHD_ERROR(("%s: Aggr events corrupted!",
+ __FUNCTION__));
+ break;
+ }
+ DHD_EVENT(("\n Event type: %d ", ntoh32(sub_event->event_type)));
+ len += ALIGN_SIZE((ntoh32(sub_event->datalen) +
+ sizeof(wl_event_msg_t)), sizeof(uint64));
+ buf = (uchar *)(data + sizeof(wl_event_msg_t));
+ BCM_REFERENCE(buf);
+ DHD_EVENT((" data (%d) : ", ntoh32(sub_event->datalen)));
+ for (i = 0; i < ntoh32(sub_event->datalen); i++) {
+ DHD_EVENT((" 0x%02x ", buf[i]));
+ }
+ data = aggrbuf->data + len;
+ }
+ DHD_EVENT(("\n"));
+ }
+ break;
+ case WLC_E_NAN_CRITICAL:
+ {
+ DHD_LOG_MEM(("MACEVENT: %s, type:%d\n", event_name, reason));
+ break;
+ }
+ case WLC_E_NAN_NON_CRITICAL:
+ {
+ DHD_TRACE(("MACEVENT: %s, type:%d\n", event_name, reason));
+ break;
+ }
+ case WLC_E_PROXD:
+ {
+ wl_proxd_event_t *proxd = (wl_proxd_event_t*)event_data;
+ DHD_LOG_MEM(("MACEVENT: %s, event:%d, status:%d\n",
+ event_name, proxd->type, reason));
+ break;
+ }
+ case WLC_E_RPSNOA:
+ {
+ rpsnoa_stats_t *stat = event_data;
+ if (datalen == sizeof(*stat)) {
+ DHD_EVENT(("MACEVENT: %s, band %s, status %d, pps %d\n", event_name,
+ (stat->band == WLC_BAND_2G) ? "2G":"5G",
+ stat->state, stat->last_pps));
+ }
+ break;
+ }
+ case WLC_E_PHY_CAL:
+ {
+ DHD_EVENT(("MACEVENT: %s, reason:%d\n", event_name, reason));
+ break;
+ }
+ case WLC_E_WA_LQM:
+ {
+ wl_event_wa_lqm_t *event_wa_lqm = (wl_event_wa_lqm_t *)event_data;
+ bcm_xtlv_t *subevent;
+ wl_event_wa_lqm_basic_t *elqm_basic;
+
+ if ((event_wa_lqm->ver != WL_EVENT_WA_LQM_VER) ||
+ (event_wa_lqm->len < sizeof(wl_event_wa_lqm_t) + BCM_XTLV_HDR_SIZE)) {
+ DHD_ERROR(("MACEVENT: %s invalid (ver=%d len=%d)\n",
+ event_name, event_wa_lqm->ver, event_wa_lqm->len));
+ break;
+ }
+
+ subevent = (bcm_xtlv_t *)event_wa_lqm->subevent;
+ if ((subevent->id != WL_EVENT_WA_LQM_BASIC) ||
+ (subevent->len < sizeof(wl_event_wa_lqm_basic_t))) {
+ DHD_ERROR(("MACEVENT: %s invalid sub-type (id=%d len=%d)\n",
+ event_name, subevent->id, subevent->len));
+ break;
+ }
+
+ elqm_basic = (wl_event_wa_lqm_basic_t *)subevent->data;
+ BCM_REFERENCE(elqm_basic);
+ DHD_EVENT(("MACEVENT: %s (RSSI=%d SNR=%d TxRate=%d RxRate=%d)\n",
+ event_name, elqm_basic->rssi, elqm_basic->snr,
+ elqm_basic->tx_rate, elqm_basic->rx_rate));
+ break;
+ }
+ case WLC_E_OVERTEMP:
+ {
+ DHD_EVENT(("MACEVENT: %s\n", event_name));
+ break;
+ }
default:
- DHD_EVENT(("MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d\n",
+ DHD_INFO(("MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d\n",
event_name, event_type, eabuf, (int)status, (int)reason,
(int)auth_type));
break;
@@ -1916,13 +3120,225 @@
buf = (uchar *) event_data;
BCM_REFERENCE(buf);
DHD_EVENT((" data (%d) : ", datalen));
- for (i = 0; i < datalen; i++)
- DHD_EVENT((" 0x%02x ", *buf++));
+ for (i = 0; i < datalen; i++) {
+ DHD_EVENT((" 0x%02x ", buf[i]));
+ }
DHD_EVENT(("\n"));
}
-}
+} /* wl_show_host_event */
#endif /* SHOW_EVENTS */
+#ifdef DNGL_EVENT_SUPPORT
+/* Check whether packet is a BRCM dngl event pkt. If it is, process event data. */
+int
+dngl_host_event(dhd_pub_t *dhdp, void *pktdata, bcm_dngl_event_msg_t *dngl_event, size_t pktlen)
+{
+ bcm_dngl_event_t *pvt_data = (bcm_dngl_event_t *)pktdata;
+
+ dngl_host_event_process(dhdp, pvt_data, dngl_event, pktlen);
+ return BCME_OK;
+}
+
+#ifdef PARSE_DONGLE_HOST_EVENT
+typedef struct hck_id_to_str_s {
+ uint32 id;
+ char *name;
+} hck_id_to_str_t;
+
+hck_id_to_str_t hck_sw_id_to_str[] = {
+ {WL_HC_DD_PCIE, "WL_HC_DD_PCIE"},
+ {WL_HC_DD_RX_DMA_STALL, "WL_HC_DD_RX_DMA_STALL"},
+ {WL_HC_DD_RX_STALL, "WL_HC_DD_RX_STALL"},
+ {WL_HC_DD_TX_STALL, "WL_HC_DD_TX_STALL"},
+ {WL_HC_DD_SCAN_STALL, "WL_HC_DD_SCAN_STALL"},
+ {WL_HC_DD_PHY, "WL_HC_DD_PHY"},
+ {WL_HC_DD_REINIT, "WL_HC_DD_REINIT"},
+ {WL_HC_DD_TXQ_STALL, "WL_HC_DD_TXQ_STALL"},
+ {0, NULL}
+};
+
+hck_id_to_str_t hck_pcie_module_to_str[] = {
+ {HEALTH_CHECK_PCIEDEV_INDUCED_IND, "PCIEDEV_INDUCED_IND"},
+ {HEALTH_CHECK_PCIEDEV_H2D_DMA_IND, "PCIEDEV_H2D_DMA_IND"},
+ {HEALTH_CHECK_PCIEDEV_D2H_DMA_IND, "PCIEDEV_D2H_DMA_IND"},
+ {HEALTH_CHECK_PCIEDEV_IOCTL_STALL_IND, "PCIEDEV_IOCTL_STALL_IND"},
+ {HEALTH_CHECK_PCIEDEV_D3ACK_STALL_IND, "PCIEDEV_D3ACK_STALL_IND"},
+ {HEALTH_CHECK_PCIEDEV_NODS_IND, "PCIEDEV_NODS_IND"},
+ {HEALTH_CHECK_PCIEDEV_LINKSPEED_FALLBACK_IND, "PCIEDEV_LINKSPEED_FALLBACK_IND"},
+ {HEALTH_CHECK_PCIEDEV_DSACK_STALL_IND, "PCIEDEV_DSACK_STALL_IND"},
+ {0, NULL}
+};
+
+static void
+dhd_print_dongle_hck_id(uint32 id, hck_id_to_str_t *hck)
+{
+ while (hck->name != NULL) {
+ if (hck->id == id) {
+ DHD_ERROR(("DONGLE_HCK_EVENT: %s\n", hck->name));
+ return;
+ }
+ hck++;
+ }
+}
+#endif /* PARSE_DONGLE_HOST_EVENT */
+
+void
+dngl_host_event_process(dhd_pub_t *dhdp, bcm_dngl_event_t *event,
+ bcm_dngl_event_msg_t *dngl_event, size_t pktlen)
+{
+ uint8 *p = (uint8 *)(event + 1);
+ uint16 type = ntoh16_ua((void *)&dngl_event->event_type);
+ uint16 datalen = ntoh16_ua((void *)&dngl_event->datalen);
+ uint16 version = ntoh16_ua((void *)&dngl_event->version);
+
+ DHD_EVENT(("VERSION:%d, EVENT TYPE:%d, DATALEN:%d\n", version, type, datalen));
+ if (datalen > (pktlen - sizeof(bcm_dngl_event_t) + ETHER_TYPE_LEN)) {
+ return;
+ }
+ if (version != BCM_DNGL_EVENT_MSG_VERSION) {
+ DHD_ERROR(("%s:version mismatch:%d:%d\n", __FUNCTION__,
+ version, BCM_DNGL_EVENT_MSG_VERSION));
+ return;
+ }
+ switch (type) {
+ case DNGL_E_SOCRAM_IND:
+ {
+ bcm_dngl_socramind_t *socramind_ptr = (bcm_dngl_socramind_t *)p;
+ uint16 tag = ltoh32(socramind_ptr->tag);
+ uint16 taglen = ltoh32(socramind_ptr->length);
+ p = (uint8 *)socramind_ptr->value;
+ DHD_EVENT(("Tag:%d Len:%d Datalen:%d\n", tag, taglen, datalen));
+ switch (tag) {
+ case SOCRAM_IND_ASSERT_TAG:
+ {
+ /*
+ * The payload consists of -
+ * null terminated function name padded till 32 bit boundary +
+ * Line number - (32 bits)
+ * Caller address (32 bits)
+ */
+ char *fnname = (char *)p;
+ if (datalen < (ROUNDUP(strlen(fnname) + 1, sizeof(uint32)) +
+ sizeof(uint32) * 2)) {
+ DHD_ERROR(("Wrong length:%d\n", datalen));
+ return;
+ }
+ DHD_EVENT(("ASSRT Function:%s ", p));
+ p += ROUNDUP(strlen(p) + 1, sizeof(uint32));
+ DHD_EVENT(("Line:%d ", *(uint32 *)p));
+ p += sizeof(uint32);
+ DHD_EVENT(("Caller Addr:0x%x\n", *(uint32 *)p));
+#ifdef PARSE_DONGLE_HOST_EVENT
+ DHD_ERROR(("DONGLE_HCK_EVENT: SOCRAM_IND_ASSERT_TAG\n"));
+#endif /* PARSE_DONGLE_HOST_EVENT */
+ break;
+ }
+ case SOCRAM_IND_TAG_HEALTH_CHECK:
+ {
+ bcm_dngl_healthcheck_t *dngl_hc = (bcm_dngl_healthcheck_t *)p;
+ DHD_EVENT(("SOCRAM_IND_HEALTHCHECK_TAG:%d Len:%d datalen:%d\n",
+ ltoh32(dngl_hc->top_module_tag),
+ ltoh32(dngl_hc->top_module_len),
+ datalen));
+ if (DHD_EVENT_ON()) {
+ prhex("HEALTHCHECK", p, MIN(ltoh32(dngl_hc->top_module_len)
+ + BCM_XTLV_HDR_SIZE, datalen));
+ }
+#ifdef DHD_LOG_DUMP
+ memset(dhdp->health_chk_event_data, 0, HEALTH_CHK_BUF_SIZE);
+ memcpy(dhdp->health_chk_event_data, p,
+ MIN(ltoh32(dngl_hc->top_module_len),
+ HEALTH_CHK_BUF_SIZE));
+#endif /* DHD_LOG_DUMP */
+ p = (uint8 *)dngl_hc->value;
+
+ switch (ltoh32(dngl_hc->top_module_tag)) {
+ case HEALTH_CHECK_TOP_LEVEL_MODULE_PCIEDEV_RTE:
+ {
+ bcm_dngl_pcie_hc_t *pcie_hc;
+ pcie_hc = (bcm_dngl_pcie_hc_t *)p;
+ BCM_REFERENCE(pcie_hc);
+ if (ltoh32(dngl_hc->top_module_len) <
+ sizeof(bcm_dngl_pcie_hc_t)) {
+ DHD_ERROR(("Wrong length:%d\n",
+ ltoh32(dngl_hc->top_module_len)));
+ return;
+ }
+ DHD_EVENT(("%d:PCIE HC error:%d flag:0x%x,"
+ " control:0x%x\n",
+ ltoh32(pcie_hc->version),
+ ltoh32(pcie_hc->pcie_err_ind_type),
+ ltoh32(pcie_hc->pcie_flag),
+ ltoh32(pcie_hc->pcie_control_reg)));
+#ifdef PARSE_DONGLE_HOST_EVENT
+ dhd_print_dongle_hck_id(
+ ltoh32(pcie_hc->pcie_err_ind_type),
+ hck_pcie_module_to_str);
+#endif /* PARSE_DONGLE_HOST_EVENT */
+ break;
+ }
+#ifdef HCHK_COMMON_SW_EVENT
+ case HCHK_SW_ENTITY_WL_PRIMARY:
+ case HCHK_SW_ENTITY_WL_SECONDARY:
+ {
+ bcm_xtlv_t *wl_hc = (bcm_xtlv_t*)p;
+
+ if (ltoh32(dngl_hc->top_module_len) <
+ sizeof(bcm_xtlv_t)) {
+ DHD_ERROR(("WL SW HC Wrong length:%d\n",
+ ltoh32(dngl_hc->top_module_len)));
+ return;
+ }
+ BCM_REFERENCE(wl_hc);
+ DHD_EVENT(("WL SW HC type %d len %d\n",
+ ltoh16(wl_hc->id), ltoh16(wl_hc->len)));
+#ifdef PARSE_DONGLE_HOST_EVENT
+ dhd_print_dongle_hck_id(ltoh16(wl_hc->id),
+ hck_sw_id_to_str);
+#endif /* PARSE_DONGLE_HOST_EVENT */
+ break;
+
+ }
+#endif /* HCHK_COMMON_SW_EVENT */
+ default:
+ {
+ DHD_ERROR(("%s:Unknown module TAG:%d\n",
+ __FUNCTION__,
+ ltoh32(dngl_hc->top_module_tag)));
+ break;
+ }
+ }
+ break;
+ }
+ default:
+ DHD_ERROR(("%s:Unknown TAG\n", __FUNCTION__));
+ if (p && DHD_EVENT_ON()) {
+ prhex("SOCRAMIND", p, taglen);
+ }
+ break;
+ }
+ break;
+ }
+ default:
+ DHD_ERROR(("%s:Unknown DNGL Event Type:%d\n", __FUNCTION__, type));
+ if (p && DHD_EVENT_ON()) {
+ prhex("SOCRAMIND", p, datalen);
+ }
+ break;
+ }
+#ifdef DHD_FW_COREDUMP
+ if (dhdp->memdump_enabled) {
+ dhdp->memdump_type = DUMP_TYPE_DONGLE_HOST_EVENT;
+ if (dhd_socram_dump(dhdp->bus)) {
+ DHD_ERROR(("%s: socram dump failed\n", __FUNCTION__));
+ }
+ }
+#else
+ dhd_dbg_send_urgent_evt(dhdp, p, datalen);
+#endif /* DHD_FW_COREDUMP */
+}
+
+#endif /* DNGL_EVENT_SUPPORT */
/* Stub for now. Will become real function as soon as shim
* is being integrated to Android, Linux etc.
@@ -1934,18 +3350,20 @@
}
int
-wl_event_process(dhd_pub_t *dhd_pub, int *ifidx, void *pktdata, uint pktlen, void **data_ptr,
- void *raw_event)
+wl_event_process(dhd_pub_t *dhd_pub, int *ifidx, void *pktdata,
+ uint pktlen, void **data_ptr, void *raw_event)
{
wl_evt_pport_t evt_pport;
wl_event_msg_t event;
bcm_event_msg_u_t evu;
+ int ret;
/* make sure it is a BRCM event pkt and record event data */
- int ret = wl_host_event_get_data(pktdata, pktlen, &evu);
+ ret = wl_host_event_get_data(pktdata, pktlen, &evu);
if (ret != BCME_OK) {
return ret;
}
+
memcpy(&event, &evu.event, sizeof(wl_event_msg_t));
/* convert event from network order to host order */
@@ -1959,18 +3377,10 @@
evt_pport.raw_event = raw_event;
evt_pport.data_len = pktlen;
-#if defined(WL_WLC_SHIM) && defined(WL_WLC_SHIM_EVENTS)
- {
- struct wl_shim_node *shim = dhd_pub_shim(dhd_pub);
- ASSERT(shim);
- ret = wl_shim_event_process(shim, &event, &evt_pport);
- }
-#else
ret = wl_event_process_default(&event, &evt_pport);
-#endif
return ret;
-}
+} /* wl_event_process */
/* Check whether packet is a BRCM event pkt. If it is, record event data. */
int
@@ -1983,6 +3393,7 @@
DHD_ERROR(("%s: Invalid event frame, err = %d\n",
__FUNCTION__, ret));
}
+
return ret;
}
@@ -1998,10 +3409,15 @@
uint evlen;
int ret;
uint16 usr_subtype;
+#ifdef DHD_POST_EAPOL_M1_AFTER_ROAM_EVT
+ dhd_if_t *ifp = NULL;
+#endif /* DHD_POST_EAPOL_M1_AFTER_ROAM_EVT */
+
ret = wl_host_event_get_data(pktdata, pktlen, &evu);
if (ret != BCME_OK) {
return ret;
}
+
usr_subtype = ntoh16_ua((void *)&pvt_data->bcm_hdr.usr_subtype);
switch (usr_subtype) {
case BCMILCP_BCM_SUBTYPE_EVENT:
@@ -2009,16 +3425,16 @@
*data_ptr = &pvt_data[1];
break;
case BCMILCP_BCM_SUBTYPE_DNGLEVENT:
-#ifdef HEALTH_CHECK
- /* If it is a DNGL event process it first */
- if (dngl_host_event(dhd_pub, pktdata, &evu.dngl_event, pktlen) == BCME_OK) {
+#ifdef DNGL_EVENT_SUPPORT
+ /* If it is a DNGL event process it first */
+ if (dngl_host_event(dhd_pub, pktdata, &evu.dngl_event, pktlen) == BCME_OK) {
/*
- * Return error purposely to prevent DNGL event being processed
- * as BRCM event
- */
+ * Return error purposely to prevent DNGL event being processed
+ * as BRCM event
+ */
return BCME_ERROR;
- }
-#endif /* HEALTH_CHECK */
+ }
+#endif /* DNGL_EVENT_SUPPORT */
return BCME_NOTFOUND;
default:
return BCME_NOTFOUND;
@@ -2026,14 +3442,13 @@
/* start wl_event_msg process */
event_data = *data_ptr;
-
type = ntoh32_ua((void *)&event->event_type);
flags = ntoh16_ua((void *)&event->flags);
status = ntoh32_ua((void *)&event->status);
reason = ntoh32_ua((void *)&event->reason);
datalen = ntoh32_ua((void *)&event->datalen);
-
evlen = datalen + sizeof(bcm_event_t);
+
switch (type) {
#ifdef PROP_TXSTATUS
case WLC_E_FIFO_CREDIT_MAP:
@@ -2066,8 +3481,18 @@
dhd_bus_ulp_disable_console(dhd_pub);
#endif /* DHD_ULP_NOT_USED */
}
+ if (ulp_evt->ulp_dongle_action == WL_ULP_UCODE_DOWNLOAD) {
+ dhd_bus_ucode_download(dhd_pub->bus);
+ }
}
#endif /* DHD_ULP */
+ break;
+ case WLC_E_TDLS_PEER_EVENT:
+#if defined(WLTDLS) && defined(PCIE_FULL_DONGLE)
+ {
+ dhd_tdls_event_handler(dhd_pub, event);
+ }
+#endif // endif
break;
case WLC_E_IF:
@@ -2082,16 +3507,15 @@
#ifdef PCIE_FULL_DONGLE
dhd_update_interface_flow_info(dhd_pub, ifevent->ifidx,
ifevent->opcode, ifevent->role);
-#endif
+#endif // endif
#ifdef PROP_TXSTATUS
{
- uint8* ea = pvt_data->eth.ether_dhost;
- WLFC_DBGMESG(("WLC_E_IF: idx:%d, action:%s, iftype:%s, "
- "[%02x:%02x:%02x:%02x:%02x:%02x]\n",
- ifevent->ifidx,
- ((ifevent->opcode == WLC_E_IF_ADD) ? "ADD":"DEL"),
- ((ifevent->role == 0) ? "STA":"AP "),
- ea[0], ea[1], ea[2], ea[3], ea[4], ea[5]));
+ uint8* ea = &event->addr.octet[0];
+ WLFC_DBGMESG(("WLC_E_IF: idx:%d, action:%s, iftype:%s, ["MACDBG"]\n"
+ ifevent->ifidx,
+ ((ifevent->opcode == WLC_E_IF_ADD) ? "ADD":"DEL"),
+ ((ifevent->role == 0) ? "STA":"AP "),
+ MAC2STRDBG(ea)));
(void)ea;
if (ifevent->opcode == WLC_E_IF_CHANGE)
@@ -2120,18 +3544,23 @@
return (BCME_ERROR);
}
} else if (ifevent->opcode == WLC_E_IF_DEL) {
+#ifdef PCIE_FULL_DONGLE
+ /* Delete flowrings unconditionally for i/f delete */
+ dhd_flow_rings_delete(dhd_pub, (uint8)dhd_ifname2idx(dhd_pub->info,
+ event->ifname));
+#endif /* PCIE_FULL_DONGLE */
dhd_event_ifdel(dhd_pub->info, ifevent, event->ifname,
event->addr.octet);
} else if (ifevent->opcode == WLC_E_IF_CHANGE) {
#ifdef WL_CFG80211
- wl_cfg80211_notify_ifchange(ifevent->ifidx,
- event->ifname, event->addr.octet, ifevent->bssidx);
+ dhd_event_ifchange(dhd_pub->info, ifevent, event->ifname,
+ event->addr.octet);
#endif /* WL_CFG80211 */
}
} else {
#if !defined(PROP_TXSTATUS) && !defined(PCIE_FULL_DONGLE) && defined(WL_CFG80211)
- DHD_ERROR(("%s: Invalid ifidx %d for %s\n",
- __FUNCTION__, ifevent->ifidx, event->ifname));
+ DHD_INFO(("%s: Invalid ifidx %d for %s\n",
+ __FUNCTION__, ifevent->ifidx, event->ifname));
#endif /* !PROP_TXSTATUS && !PCIE_FULL_DONGLE && WL_CFG80211 */
}
/* send up the if event: btamp user needs it */
@@ -2140,27 +3569,31 @@
dhd_event(dhd_pub->info, (char *)pvt_data, evlen, *ifidx);
break;
}
-
-#ifdef WLMEDIA_HTSF
- case WLC_E_HTSFSYNC:
- htsf_update(dhd_pub->info, event_data);
+#ifdef WL_CFG80211
+ case WLC_E_OVERTEMP:
+ {
+ wl_cfg80211_overtemp_event(dhd_idx2net(dhd_pub, event->ifidx));
break;
-#endif /* WLMEDIA_HTSF */
+ }
+#endif /* WL_CFG80211 */
+
case WLC_E_NDIS_LINK:
break;
case WLC_E_PFN_NET_FOUND:
case WLC_E_PFN_SCAN_ALLGONE: /* share with WLC_E_PFN_BSSID_NET_LOST */
case WLC_E_PFN_NET_LOST:
break;
-#if defined(PNO_SUPPORT)
+#if defined(OEM_ANDROID) && defined(PNO_SUPPORT)
case WLC_E_PFN_BSSID_NET_FOUND:
case WLC_E_PFN_BEST_BATCHING:
dhd_pno_event_handler(dhd_pub, event, (void *)event_data);
break;
-#endif
+#endif /* #if defined(OEM_ANDROID) && defined(PNO_SUPPORT) */
#if defined(RTT_SUPPORT)
case WLC_E_PROXD:
+#ifndef WL_CFG80211
dhd_rtt_event_handler(dhd_pub, event, (void *)event_data);
+#endif /* WL_CFG80211 */
break;
#endif /* RTT_SUPPORT */
/* These are what external supplicant/authenticator wants */
@@ -2171,69 +3604,136 @@
dhd_ifname2idx(dhd_pub->info, event->ifname),
&event->addr.octet);
break;
-#if !defined(BCMDBUS) && defined(DHD_FW_COREDUMP)
+#if defined(DHD_FW_COREDUMP)
case WLC_E_PSM_WATCHDOG:
DHD_ERROR(("%s: WLC_E_PSM_WATCHDOG event received : \n", __FUNCTION__));
if (dhd_socram_dump(dhd_pub->bus) != BCME_OK) {
DHD_ERROR(("%s: socram dump ERROR : \n", __FUNCTION__));
}
break;
-#endif
-#ifdef DHD_WMF
- case WLC_E_PSTA_PRIMARY_INTF_IND:
- dhd_update_psta_interface_for_sta(dhd_pub, event->ifname,
- (void *)(event->addr.octet), (void*) event_data);
+#endif // endif
+ case WLC_E_NATOE_NFCT:
+#ifdef WL_NATOE
+ DHD_EVENT(("%s: WLC_E_NATOE_NFCT event received \n", __FUNCTION__));
+ dhd_natoe_ct_event(dhd_pub, event_data);
+#endif /* WL_NATOE */
+ break;
+#ifdef WL_NAN
+ case WLC_E_SLOTTED_BSS_PEER_OP:
+ DHD_EVENT(("%s: WLC_E_SLOTTED_BSS_PEER_OP event received for peer: "
+ "" MACDBG ", status = %d\n",
+ __FUNCTION__, MAC2STRDBG(event->addr.octet), status));
+ if (status == WLC_E_STATUS_SLOTTED_PEER_ADD) {
+ dhd_findadd_sta(dhd_pub, dhd_ifname2idx(dhd_pub->info,
+ event->ifname), &event->addr.octet);
+ } else if (status == WLC_E_STATUS_SLOTTED_PEER_DEL) {
+ uint8 ifindex = (uint8)dhd_ifname2idx(dhd_pub->info, event->ifname);
+ BCM_REFERENCE(ifindex);
+ dhd_del_sta(dhd_pub, dhd_ifname2idx(dhd_pub->info,
+ event->ifname), &event->addr.octet);
+#ifdef PCIE_FULL_DONGLE
+ dhd_flow_rings_delete_for_peer(dhd_pub, ifindex,
+ (char *)&event->addr.octet[0]);
+#endif // endif
+ } else {
+ DHD_ERROR(("%s: WLC_E_SLOTTED_BSS_PEER_OP: Status is not expected = %d\n",
+ __FUNCTION__, status));
+ }
break;
-#endif
+#endif /* WL_NAN */
+#ifdef DHD_POST_EAPOL_M1_AFTER_ROAM_EVT
+ case WLC_E_REASSOC:
+ ifp = dhd_get_ifp(dhd_pub, event->ifidx);
+
+ if (!ifp)
+ break;
+
+ /* Consider STA role only since roam is disabled on P2P GC.
+ * Drop EAPOL M1 frame only if roam is done to same BSS.
+ */
+ if ((status == WLC_E_STATUS_SUCCESS) &&
+ IS_STA_IFACE(ndev_to_wdev(ifp->net)) &&
+ wl_cfg80211_is_event_from_connected_bssid(ifp->net, event, event->ifidx)) {
+ ifp->recv_reassoc_evt = TRUE;
+ }
+ break;
+#endif /* DHD_POST_EAPOL_M1_AFTER_ROAM_EVT */
+#ifdef BCMSDIO
+ case WLC_E_AP_STARTED:
+ if (FW_SUPPORTED(dhd_pub, idsup)) {
+ dhd_pub->info->iflist[*ifidx]->role = WLC_E_IF_ROLE_AP;
+ }
+ break;
+#endif /* BCMSDIO */
case WLC_E_LINK:
#ifdef PCIE_FULL_DONGLE
if (dhd_update_interface_link_status(dhd_pub, (uint8)dhd_ifname2idx(dhd_pub->info,
- event->ifname), (uint8)flags) != BCME_OK)
+ event->ifname), (uint8)flags) != BCME_OK) {
+ DHD_ERROR(("%s: dhd_update_interface_link_status Failed.\n",
+ __FUNCTION__));
break;
+ }
if (!flags) {
+ DHD_ERROR(("%s: Deleting all STA from assoc list and flowrings.\n",
+ __FUNCTION__));
+ /* Delete all sta and flowrings */
+ dhd_del_all_sta(dhd_pub, dhd_ifname2idx(dhd_pub->info, event->ifname));
dhd_flow_rings_delete(dhd_pub, (uint8)dhd_ifname2idx(dhd_pub->info,
event->ifname));
}
+#endif /* PCIE_FULL_DONGLE */
/* fall through */
-#endif
case WLC_E_DEAUTH:
case WLC_E_DEAUTH_IND:
case WLC_E_DISASSOC:
case WLC_E_DISASSOC_IND:
- DHD_EVENT(("%s: Link event %d, flags %x, status %x\n",
- __FUNCTION__, type, flags, status));
#ifdef PCIE_FULL_DONGLE
if (type != WLC_E_LINK) {
uint8 ifindex = (uint8)dhd_ifname2idx(dhd_pub->info, event->ifname);
uint8 role = dhd_flow_rings_ifindex2role(dhd_pub, ifindex);
uint8 del_sta = TRUE;
#ifdef WL_CFG80211
- if (role == WLC_E_IF_ROLE_STA && !wl_cfg80211_is_roam_offload() &&
- !wl_cfg80211_is_event_from_connected_bssid(event, *ifidx)) {
+ if (role == WLC_E_IF_ROLE_STA &&
+ !wl_cfg80211_is_roam_offload(dhd_idx2net(dhd_pub, ifindex)) &&
+ !wl_cfg80211_is_event_from_connected_bssid(
+ dhd_idx2net(dhd_pub, ifindex), event, *ifidx)) {
del_sta = FALSE;
}
#endif /* WL_CFG80211 */
+ DHD_EVENT(("%s: Link event %d, flags %x, status %x, role %d, del_sta %d\n",
+ __FUNCTION__, type, flags, status, role, del_sta));
if (del_sta) {
+ DHD_EVENT(("%s: Deleting STA " MACDBG "\n",
+ __FUNCTION__, MAC2STRDBG(event->addr.octet)));
+
dhd_del_sta(dhd_pub, dhd_ifname2idx(dhd_pub->info,
event->ifname), &event->addr.octet);
- if (role == WLC_E_IF_ROLE_STA) {
+ /* Delete all flowrings for STA and P2P Client */
+ if (role == WLC_E_IF_ROLE_STA || role == WLC_E_IF_ROLE_P2P_CLIENT) {
dhd_flow_rings_delete(dhd_pub, ifindex);
} else {
dhd_flow_rings_delete_for_peer(dhd_pub, ifindex,
- &event->addr.octet[0]);
+ (char *)&event->addr.octet[0]);
}
}
}
#endif /* PCIE_FULL_DONGLE */
+#ifdef DHD_POST_EAPOL_M1_AFTER_ROAM_EVT
/* fall through */
-
+ ifp = dhd_get_ifp(dhd_pub, event->ifidx);
+ if (ifp) {
+ ifp->recv_reassoc_evt = FALSE;
+ ifp->post_roam_evt = FALSE;
+ }
+#endif /* DHD_POST_EAPOL_M1_AFTER_ROAM_EVT */
+ /* fall through */
default:
*ifidx = dhd_ifname2idx(dhd_pub->info, event->ifname);
/* push up to external supp/auth */
dhd_event(dhd_pub->info, (char *)pvt_data, evlen, *ifidx);
DHD_TRACE(("%s: MAC event %d, flags %x, status %x\n",
- __FUNCTION__, type, flags, status));
+ __FUNCTION__, type, flags, status));
BCM_REFERENCE(flags);
BCM_REFERENCE(status);
BCM_REFERENCE(reason);
@@ -2246,7 +3746,14 @@
* to host with its registered interface name
*/
memcpy(pvt_data->event.ifname, dhd_ifname(dhd_pub, *ifidx), IFNAMSIZ);
-#endif
+#endif // endif
+
+#ifdef DHD_STATUS_LOGGING
+ if (dhd_pub->statlog) {
+ dhd_statlog_process_event(dhd_pub, type, *ifidx,
+ status, reason, flags);
+ }
+#endif /* DHD_STATUS_LOGGING */
#ifdef SHOW_EVENTS
if (DHD_FWLOG_ON() || DHD_EVENT_ON()) {
@@ -2256,14 +3763,14 @@
#endif /* SHOW_EVENTS */
return (BCME_OK);
-}
+} /* wl_process_host_event */
int
wl_host_event(dhd_pub_t *dhd_pub, int *ifidx, void *pktdata, uint pktlen,
wl_event_msg_t *event, void **data_ptr, void *raw_event)
{
return wl_process_host_event(dhd_pub, ifidx, pktdata, pktlen, event, data_ptr,
- raw_event);
+ raw_event);
}
void
@@ -2292,11 +3799,11 @@
}
#ifndef strtoul
#define strtoul(nptr, endptr, base) bcm_strtoul((nptr), (endptr), (base))
-#endif
+#endif // endif
-#ifdef PKT_FILTER_SUPPORT
+#if defined(PKT_FILTER_SUPPORT) || defined(DHD_PKT_LOGGING)
/* Convert user's input in hex pattern to byte-size mask */
-static int
+int
wl_pattern_atoh(char *src, char *dst)
{
int i;
@@ -2320,6 +3827,37 @@
return i;
}
+int
+pattern_atoh_len(char *src, char *dst, int len)
+{
+ int i;
+ if (strncmp(src, "0x", HD_PREFIX_SIZE) != 0 &&
+ strncmp(src, "0X", HD_PREFIX_SIZE) != 0) {
+ DHD_ERROR(("Mask invalid format. Needs to start with 0x\n"));
+ return -1;
+ }
+ src = src + HD_PREFIX_SIZE; /* Skip past 0x */
+ if (strlen(src) % HD_BYTE_SIZE != 0) {
+ DHD_ERROR(("Mask invalid format. Needs to be of even length\n"));
+ return -1;
+ }
+ for (i = 0; *src != '\0'; i++) {
+ char num[HD_BYTE_SIZE + 1];
+
+ if (i > len - 1) {
+ DHD_ERROR(("pattern not in range, idx: %d len: %d\n", i, len));
+ return -1;
+ }
+ bcm_strncpy_s(num, sizeof(num), src, HD_BYTE_SIZE);
+ num[HD_BYTE_SIZE] = '\0';
+ dst[i] = (uint8)strtoul(num, NULL, 16);
+ src += HD_BYTE_SIZE;
+ }
+ return i;
+}
+#endif /* PKT_FILTER_SUPPORT || DHD_PKT_LOGGING */
+
+#ifdef PKT_FILTER_SUPPORT
void
dhd_pktfilter_offload_enable(dhd_pub_t * dhd, char *arg, int enable, int master_mode)
{
@@ -2374,9 +3912,20 @@
/* Enable/disable the specified filter. */
rc = dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, buf, buf_len, TRUE, 0);
rc = rc >= 0 ? 0 : rc;
- if (rc)
+ if (rc) {
DHD_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n",
__FUNCTION__, arg, rc));
+ dhd_set_packet_filter(dhd);
+ rc = dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, buf, buf_len, TRUE, 0);
+ rc = rc >= 0 ? 0 : rc;
+ if (rc) {
+ DHD_TRACE_HW4(("%s: 2nd retry failed to add pktfilter %s, retcode = %d\n",
+ __FUNCTION__, arg, rc));
+ } else {
+ DHD_TRACE_HW4(("%s: 2nd retry successfully added pktfilter %s\n",
+ __FUNCTION__, arg));
+ }
+ }
else
DHD_TRACE(("%s: successfully added pktfilter %s\n",
__FUNCTION__, arg));
@@ -2394,21 +3943,53 @@
MFREE(dhd->osh, arg_org, strlen(arg) + 1);
}
+/* Packet filter section: extended filters have named offsets, add table here */
+typedef struct {
+ char *name;
+ uint16 base;
+} wl_pfbase_t;
+
+static wl_pfbase_t basenames[] = { WL_PKT_FILTER_BASE_NAMES };
+
+static int
+wl_pkt_filter_base_parse(char *name)
+{
+ uint i;
+ char *bname, *uname;
+
+ for (i = 0; i < ARRAYSIZE(basenames); i++) {
+ bname = basenames[i].name;
+ for (uname = name; *uname; bname++, uname++) {
+ if (*bname != bcm_toupper(*uname)) {
+ break;
+ }
+ }
+ if (!*uname && !*bname) {
+ break;
+ }
+ }
+
+ if (i < ARRAYSIZE(basenames)) {
+ return basenames[i].base;
+ } else {
+ return -1;
+ }
+}
+
void
dhd_pktfilter_offload_set(dhd_pub_t * dhd, char *arg)
{
- const char *str;
- wl_pkt_filter_t pkt_filter;
- wl_pkt_filter_t *pkt_filterp;
- int buf_len;
- int str_len;
- int rc;
+ const char *str;
+ wl_pkt_filter_t pkt_filter;
+ wl_pkt_filter_t *pkt_filterp;
+ int buf_len;
+ int str_len;
+ int rc = -1;
uint32 mask_size;
uint32 pattern_size;
- char *argv[8], * buf = 0;
- int i = 0;
+ char *argv[MAXPKT_ARG] = {0}, * buf = 0;
+ int i = 0;
char *arg_save = 0, *arg_org = 0;
-#define BUF_SIZE 2048
if (!arg)
return;
@@ -2420,21 +4001,27 @@
arg_org = arg_save;
- if (!(buf = MALLOC(dhd->osh, BUF_SIZE))) {
+ if (!(buf = MALLOC(dhd->osh, MAX_PKTFLT_BUF_SIZE))) {
DHD_ERROR(("%s: malloc failed\n", __FUNCTION__));
goto fail;
}
+ memset(buf, 0, MAX_PKTFLT_BUF_SIZE);
memcpy(arg_save, arg, strlen(arg) + 1);
- if (strlen(arg) > BUF_SIZE) {
+ if (strlen(arg) > MAX_PKTFLT_BUF_SIZE) {
DHD_ERROR(("Not enough buffer %d < %d\n", (int)strlen(arg), (int)sizeof(buf)));
goto fail;
}
argv[i] = bcmstrtok(&arg_save, " ", 0);
- while (argv[i++])
+ while (argv[i++]) {
+ if (i >= MAXPKT_ARG) {
+ DHD_ERROR(("Invalid args provided\n"));
+ goto fail;
+ }
argv[i] = bcmstrtok(&arg_save, " ", 0);
+ }
i = 0;
if (argv[i] == NULL) {
@@ -2444,7 +4031,7 @@
str = "pkt_filter_add";
str_len = strlen(str);
- bcm_strncpy_s(buf, BUF_SIZE, str, str_len);
+ bcm_strncpy_s(buf, MAX_PKTFLT_BUF_SIZE, str, str_len);
buf[ str_len ] = '\0';
buf_len = str_len + 1;
@@ -2469,49 +4056,185 @@
/* Parse filter type. */
pkt_filter.type = htod32(strtoul(argv[i], NULL, 0));
- if (argv[++i] == NULL) {
- DHD_ERROR(("Offset not provided\n"));
+ if ((pkt_filter.type == 0) || (pkt_filter.type == 1)) {
+ if (argv[++i] == NULL) {
+ DHD_ERROR(("Offset not provided\n"));
+ goto fail;
+ }
+
+ /* Parse pattern filter offset. */
+ pkt_filter.u.pattern.offset = htod32(strtoul(argv[i], NULL, 0));
+
+ if (argv[++i] == NULL) {
+ DHD_ERROR(("Bitmask not provided\n"));
+ goto fail;
+ }
+
+ /* Parse pattern filter mask. */
+ rc = wl_pattern_atoh(argv[i],
+ (char *) pkt_filterp->u.pattern.mask_and_pattern);
+
+ if (rc == -1) {
+ DHD_ERROR(("Rejecting: %s\n", argv[i]));
+ goto fail;
+ }
+ mask_size = htod32(rc);
+ if (argv[++i] == NULL) {
+ DHD_ERROR(("Pattern not provided\n"));
+ goto fail;
+ }
+
+ /* Parse pattern filter pattern. */
+ rc = wl_pattern_atoh(argv[i],
+ (char *) &pkt_filterp->u.pattern.mask_and_pattern[mask_size]);
+
+ if (rc == -1) {
+ DHD_ERROR(("Rejecting: %s\n", argv[i]));
+ goto fail;
+ }
+ pattern_size = htod32(rc);
+ if (mask_size != pattern_size) {
+ DHD_ERROR(("Mask and pattern not the same size\n"));
+ goto fail;
+ }
+
+ pkt_filter.u.pattern.size_bytes = mask_size;
+ buf_len += WL_PKT_FILTER_FIXED_LEN;
+ buf_len += (WL_PKT_FILTER_PATTERN_FIXED_LEN + 2 * mask_size);
+
+ /* Keep-alive attributes are set in local variable (keep_alive_pkt), and
+ * then memcpy'ed into buffer (keep_alive_pktp) since there is no
+ * guarantee that the buffer is properly aligned.
+ */
+ memcpy((char *)pkt_filterp,
+ &pkt_filter,
+ WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_FIXED_LEN);
+ } else if ((pkt_filter.type == 2) || (pkt_filter.type == 6)) {
+ int list_cnt = 0;
+ char *endptr = NULL;
+ wl_pkt_filter_pattern_listel_t *pf_el =
+ (wl_pkt_filter_pattern_listel_t *)&pkt_filterp->u.patlist.patterns[0];
+
+ while (argv[++i] != NULL) {
+ /* Check valid buffer size. */
+ if ((buf_len + MAX_PKTFLT_FIXED_BUF_SIZE) > MAX_PKTFLT_BUF_SIZE) {
+ DHD_ERROR(("buffer over length MAX_PKTFLT_FIXED_BUF_SIZE\n"));
+ goto fail;
+ }
+
+ /* Parse pattern filter base and offset. */
+ if (bcm_isdigit(*argv[i])) {
+ /* Numeric base */
+ rc = strtoul(argv[i], &endptr, 0);
+ } else {
+ endptr = strchr(argv[i], ':');
+ if (endptr) {
+ *endptr = '\0';
+ rc = wl_pkt_filter_base_parse(argv[i]);
+ if (rc == -1) {
+ printf("Invalid base %s\n", argv[i]);
+ goto fail;
+ }
+ *endptr = ':';
+ }
+ }
+
+ if (endptr == NULL) {
+ printf("Invalid [base:]offset format: %s\n", argv[i]);
+ goto fail;
+ }
+
+ if (*endptr == ':') {
+ pf_el->base_offs = htod16(rc);
+ rc = strtoul(endptr + 1, &endptr, 0);
+ } else {
+ /* Must have had a numeric offset only */
+ pf_el->base_offs = htod16(0);
+ }
+
+ if (*endptr) {
+ printf("Invalid [base:]offset format: %s\n", argv[i]);
+ goto fail;
+ }
+ if (rc > 0x0000FFFF) {
+ printf("Offset too large\n");
+ goto fail;
+ }
+ pf_el->rel_offs = htod16(rc);
+
+ /* Clear match_flag (may be set in parsing which follows) */
+ pf_el->match_flags = htod16(0);
+
+ /* Parse pattern filter mask and pattern directly into ioctl buffer */
+ if (argv[++i] == NULL) {
+ printf("Bitmask not provided\n");
+ goto fail;
+ }
+ rc = wl_pattern_atoh(argv[i], (char*)pf_el->mask_and_data);
+ if ((rc == -1) || (rc > MAX_PKTFLT_FIXED_PATTERN_SIZE)) {
+ printf("Rejecting: %s\n", argv[i]);
+ goto fail;
+ }
+ mask_size = htod16(rc);
+
+ if (argv[++i] == NULL) {
+ printf("Pattern not provided\n");
+ goto fail;
+ }
+
+ if (*argv[i] == '!') {
+ pf_el->match_flags =
+ htod16(WL_PKT_FILTER_MFLAG_NEG);
+ (argv[i])++;
+ }
+ if (*argv[i] == '\0') {
+ printf("Pattern not provided\n");
+ goto fail;
+ }
+ rc = wl_pattern_atoh(argv[i], (char*)&pf_el->mask_and_data[rc]);
+ if ((rc == -1) || (rc > MAX_PKTFLT_FIXED_PATTERN_SIZE)) {
+ printf("Rejecting: %s\n", argv[i]);
+ goto fail;
+ }
+ pattern_size = htod16(rc);
+
+ if (mask_size != pattern_size) {
+ printf("Mask and pattern not the same size\n");
+ goto fail;
+ }
+
+ pf_el->size_bytes = mask_size;
+
+ /* Account for the size of this pattern element */
+ buf_len += WL_PKT_FILTER_PATTERN_LISTEL_FIXED_LEN + 2 * rc;
+
+ /* Move to next element location in ioctl buffer */
+ pf_el = (wl_pkt_filter_pattern_listel_t*)
+ ((uint8*)pf_el + WL_PKT_FILTER_PATTERN_LISTEL_FIXED_LEN + 2 * rc);
+
+ /* Count list element */
+ list_cnt++;
+ }
+
+ /* Account for initial fixed size, and copy initial fixed fields */
+ buf_len += WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_LIST_FIXED_LEN;
+
+ if (buf_len > MAX_PKTFLT_BUF_SIZE) {
+ DHD_ERROR(("buffer over length MAX_PKTFLT_BUF_SIZE\n"));
+ goto fail;
+ }
+ /* Update list count and total size */
+ pkt_filter.u.patlist.list_cnt = list_cnt;
+ pkt_filter.u.patlist.PAD1[0] = 0;
+ pkt_filter.u.patlist.totsize = buf + buf_len - (char*)pkt_filterp;
+ pkt_filter.u.patlist.totsize -= WL_PKT_FILTER_FIXED_LEN;
+
+ memcpy((char *)pkt_filterp, &pkt_filter,
+ WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_LIST_FIXED_LEN);
+ } else {
+ DHD_ERROR(("Invalid filter type %d\n", pkt_filter.type));
goto fail;
}
-
- /* Parse pattern filter offset. */
- pkt_filter.u.pattern.offset = htod32(strtoul(argv[i], NULL, 0));
-
- if (argv[++i] == NULL) {
- DHD_ERROR(("Bitmask not provided\n"));
- goto fail;
- }
-
- /* Parse pattern filter mask. */
- mask_size =
- htod32(wl_pattern_atoh(argv[i], (char *) pkt_filterp->u.pattern.mask_and_pattern));
-
- if (argv[++i] == NULL) {
- DHD_ERROR(("Pattern not provided\n"));
- goto fail;
- }
-
- /* Parse pattern filter pattern. */
- pattern_size =
- htod32(wl_pattern_atoh(argv[i],
- (char *) &pkt_filterp->u.pattern.mask_and_pattern[mask_size]));
-
- if (mask_size != pattern_size) {
- DHD_ERROR(("Mask and pattern not the same size\n"));
- goto fail;
- }
-
- pkt_filter.u.pattern.size_bytes = mask_size;
- buf_len += WL_PKT_FILTER_FIXED_LEN;
- buf_len += (WL_PKT_FILTER_PATTERN_FIXED_LEN + 2 * mask_size);
-
- /* Keep-alive attributes are set in local variable (keep_alive_pkt), and
- ** then memcpy'ed into buffer (keep_alive_pktp) since there is no
- ** guarantee that the buffer is properly aligned.
- */
- memcpy((char *)pkt_filterp,
- &pkt_filter,
- WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_FIXED_LEN);
rc = dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, buf, buf_len, TRUE, 0);
rc = rc >= 0 ? 0 : rc;
@@ -2528,10 +4251,11 @@
MFREE(dhd->osh, arg_org, strlen(arg) + 1);
if (buf)
- MFREE(dhd->osh, buf, BUF_SIZE);
+ MFREE(dhd->osh, buf, MAX_PKTFLT_BUF_SIZE);
}
-void dhd_pktfilter_offload_delete(dhd_pub_t *dhd, int id)
+void
+dhd_pktfilter_offload_delete(dhd_pub_t *dhd, int id)
{
int ret;
@@ -2569,7 +4293,15 @@
dhd_arp_offload_enable(dhd_pub_t * dhd, int arp_enable)
{
int retcode;
-
+#ifdef WL_CFG80211
+ /* Do not enable arp offload in case of non-STA interfaces active */
+ if (arp_enable &&
+ (wl_cfg80211_check_vif_in_use(dhd_linux_get_primary_netdev(dhd)))) {
+ DHD_TRACE(("%s: Virtual interfaces active, ignore arp offload request \n",
+ __FUNCTION__));
+ return;
+ }
+#endif /* WL_CFG80211 */
retcode = dhd_wl_ioctl_set_intiovar(dhd, "arpoe",
arp_enable, WLC_SET_VAR, TRUE, 0);
@@ -2691,6 +4423,19 @@
if (dhd == NULL)
return -1;
+#if defined(WL_CFG80211) && defined(WL_NAN)
+ if (wl_cfgnan_is_dp_active(dhd_linux_get_primary_netdev(dhd))) {
+ /* If nan dp is active, skip NDO */
+ DHD_INFO(("Active NAN DP, skip NDO\n"));
+ return 0;
+ }
+#endif /* WL_CFG80211 && WL_NAN */
+#ifdef WL_CFG80211
+ if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) {
+ /* NDO disable on STA+SOFTAP mode */
+ ndo_enable = FALSE;
+ }
+#endif /* WL_CFG80211 */
retcode = dhd_wl_ioctl_set_intiovar(dhd, "ndoe",
ndo_enable, WLC_SET_VAR, TRUE, 0);
if (retcode)
@@ -2735,6 +4480,50 @@
return retcode;
}
+
+#ifdef REVERSE_AIFSN
+int
+check_reverse_aifsn_condition(dhd_pub_t *dhd, struct net_device *ndev)
+{
+ int iov_len = 0;
+ char iovbuf[DHD_IOVAR_BUF_SIZE];
+ edcf_acparam_t *ac_params = NULL;
+ int retcode;
+ u8 aci, aifsn;
+ int ifidx;
+
+ if (dhd == NULL)
+ return -1;
+
+ ifidx = dhd_net2idx(dhd->info, ndev);
+ if (ifidx == DHD_BAD_IF)
+ return -1;
+
+ dhd->aifsn_reverse = FALSE;
+
+ strcpy(iovbuf, "wme_ac_sta");
+ iov_len = sizeof(iovbuf);
+
+ retcode = dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, iovbuf, iov_len, FALSE, ifidx);
+ if (retcode) {
+ DHD_ERROR(("%s: could not get wme_ac_sta params(%d)\n\n",
+ __FUNCTION__, retcode));
+ return -1;
+ }
+
+ ac_params = (edcf_acparam_t *)iovbuf;
+ for (aci = 0; aci < AC_COUNT; aci++) {
+ aifsn = ac_params[aci].ACI & EDCF_AIFSN_MASK;
+ if (aci == AC_VI && aifsn == 10) {
+ DHD_ERROR(("[%s] Reverse AIFSN for AC_VI:10 \n", __FUNCTION__));
+ dhd->aifsn_reverse = TRUE;
+ break;
+ }
+ }
+ return 0;
+}
+#endif /* REVERSE_AIFSN */
+
/*
* Neighbor Discover Offload: enable NDO feature
* Called by ipv6 event handler when interface goes down
@@ -2767,13 +4556,419 @@
return retcode;
}
+/* Enhanced ND offload */
+uint16
+dhd_ndo_get_version(dhd_pub_t *dhdp)
+{
+ char iovbuf[DHD_IOVAR_BUF_SIZE];
+ wl_nd_hostip_t ndo_get_ver;
+ int iov_len;
+ int retcode;
+ uint16 ver = 0;
+ if (dhdp == NULL) {
+ return BCME_ERROR;
+ }
+ memset(&iovbuf, 0, sizeof(iovbuf));
+ ndo_get_ver.version = htod16(WL_ND_HOSTIP_IOV_VER);
+ ndo_get_ver.op_type = htod16(WL_ND_HOSTIP_OP_VER);
+ ndo_get_ver.length = htod32(WL_ND_HOSTIP_FIXED_LEN + sizeof(uint16));
+ ndo_get_ver.u.version = 0;
+ iov_len = bcm_mkiovar("nd_hostip", (char *)&ndo_get_ver,
+ WL_ND_HOSTIP_FIXED_LEN + sizeof(uint16), iovbuf, sizeof(iovbuf));
+
+ if (!iov_len) {
+ DHD_ERROR(("%s: Insufficient iovar buffer size %zu \n",
+ __FUNCTION__, sizeof(iovbuf)));
+ return BCME_ERROR;
+ }
+
+ retcode = dhd_wl_ioctl_cmd(dhdp, WLC_GET_VAR, iovbuf, iov_len, FALSE, 0);
+
+ if (retcode) {
+ DHD_ERROR(("%s: failed, retcode = %d\n", __FUNCTION__, retcode));
+ /* ver iovar not supported. NDO version is 0 */
+ ver = 0;
+ } else {
+ wl_nd_hostip_t *ndo_ver_ret = (wl_nd_hostip_t *)iovbuf;
+
+ if ((dtoh16(ndo_ver_ret->version) == WL_ND_HOSTIP_IOV_VER) &&
+ (dtoh16(ndo_ver_ret->op_type) == WL_ND_HOSTIP_OP_VER) &&
+ (dtoh32(ndo_ver_ret->length) == WL_ND_HOSTIP_FIXED_LEN
+ + sizeof(uint16))) {
+ /* nd_hostip iovar version */
+ ver = dtoh16(ndo_ver_ret->u.version);
+ }
+
+ DHD_TRACE(("%s: successfully get version: %d\n", __FUNCTION__, ver));
+ }
+
+ return ver;
+}
+
+int
+dhd_ndo_add_ip_with_type(dhd_pub_t *dhdp, char *ipv6addr, uint8 type, int idx)
+{
+ char iovbuf[DHD_IOVAR_BUF_SIZE];
+ wl_nd_hostip_t ndo_add_addr;
+ int iov_len;
+ int retcode;
+
+ if (dhdp == NULL || ipv6addr == 0) {
+ return BCME_ERROR;
+ }
+
+ /* wl_nd_hostip_t fixed param */
+ ndo_add_addr.version = htod16(WL_ND_HOSTIP_IOV_VER);
+ ndo_add_addr.op_type = htod16(WL_ND_HOSTIP_OP_ADD);
+ ndo_add_addr.length = htod32(WL_ND_HOSTIP_WITH_ADDR_LEN);
+ /* wl_nd_host_ip_addr_t param for add */
+ memcpy(&ndo_add_addr.u.host_ip.ip_addr, ipv6addr, IPV6_ADDR_LEN);
+ ndo_add_addr.u.host_ip.type = type;
+
+ iov_len = bcm_mkiovar("nd_hostip", (char *)&ndo_add_addr,
+ WL_ND_HOSTIP_WITH_ADDR_LEN, iovbuf, sizeof(iovbuf));
+ if (!iov_len) {
+ DHD_ERROR(("%s: Insufficient iovar buffer size %zu \n",
+ __FUNCTION__, sizeof(iovbuf)));
+ return BCME_ERROR;
+ }
+
+ retcode = dhd_wl_ioctl_cmd(dhdp, WLC_SET_VAR, iovbuf, iov_len, TRUE, idx);
+ if (retcode) {
+ DHD_ERROR(("%s: failed, retcode = %d\n", __FUNCTION__, retcode));
+#ifdef NDO_CONFIG_SUPPORT
+ if (retcode == BCME_NORESOURCE) {
+ /* number of host ip addr exceeds FW capacity, Deactivate ND offload */
+ DHD_INFO(("%s: Host IP count exceed device capacity,"
+ "ND offload deactivated\n", __FUNCTION__));
+ dhdp->ndo_host_ip_overflow = TRUE;
+ dhd_ndo_enable(dhdp, FALSE);
+ }
+#endif /* NDO_CONFIG_SUPPORT */
+ } else {
+ DHD_TRACE(("%s: successfully added: %d\n", __FUNCTION__, retcode));
+ }
+
+ return retcode;
+}
+
+int
+dhd_ndo_remove_ip_by_addr(dhd_pub_t *dhdp, char *ipv6addr, int idx)
+{
+ char iovbuf[DHD_IOVAR_BUF_SIZE];
+ wl_nd_hostip_t ndo_del_addr;
+ int iov_len;
+ int retcode;
+
+ if (dhdp == NULL || ipv6addr == 0) {
+ return BCME_ERROR;
+ }
+
+ /* wl_nd_hostip_t fixed param */
+ ndo_del_addr.version = htod16(WL_ND_HOSTIP_IOV_VER);
+ ndo_del_addr.op_type = htod16(WL_ND_HOSTIP_OP_DEL);
+ ndo_del_addr.length = htod32(WL_ND_HOSTIP_WITH_ADDR_LEN);
+ /* wl_nd_host_ip_addr_t param for del */
+ memcpy(&ndo_del_addr.u.host_ip.ip_addr, ipv6addr, IPV6_ADDR_LEN);
+ ndo_del_addr.u.host_ip.type = 0; /* don't care */
+
+ iov_len = bcm_mkiovar("nd_hostip", (char *)&ndo_del_addr,
+ WL_ND_HOSTIP_WITH_ADDR_LEN, iovbuf, sizeof(iovbuf));
+
+ if (!iov_len) {
+ DHD_ERROR(("%s: Insufficient iovar buffer size %zu \n",
+ __FUNCTION__, sizeof(iovbuf)));
+ return BCME_ERROR;
+ }
+
+ retcode = dhd_wl_ioctl_cmd(dhdp, WLC_SET_VAR, iovbuf, iov_len, TRUE, idx);
+ if (retcode) {
+ DHD_ERROR(("%s: failed, retcode = %d\n", __FUNCTION__, retcode));
+ } else {
+ DHD_TRACE(("%s: successfully removed: %d\n", __FUNCTION__, retcode));
+ }
+
+ return retcode;
+}
+
+int
+dhd_ndo_remove_ip_by_type(dhd_pub_t *dhdp, uint8 type, int idx)
+{
+ char iovbuf[DHD_IOVAR_BUF_SIZE];
+ wl_nd_hostip_t ndo_del_addr;
+ int iov_len;
+ int retcode;
+
+ if (dhdp == NULL) {
+ return BCME_ERROR;
+ }
+
+ /* wl_nd_hostip_t fixed param */
+ ndo_del_addr.version = htod16(WL_ND_HOSTIP_IOV_VER);
+ if (type == WL_ND_IPV6_ADDR_TYPE_UNICAST) {
+ ndo_del_addr.op_type = htod16(WL_ND_HOSTIP_OP_DEL_UC);
+ } else if (type == WL_ND_IPV6_ADDR_TYPE_ANYCAST) {
+ ndo_del_addr.op_type = htod16(WL_ND_HOSTIP_OP_DEL_AC);
+ } else {
+ return BCME_BADARG;
+ }
+ ndo_del_addr.length = htod32(WL_ND_HOSTIP_FIXED_LEN);
+
+ iov_len = bcm_mkiovar("nd_hostip", (char *)&ndo_del_addr, WL_ND_HOSTIP_FIXED_LEN,
+ iovbuf, sizeof(iovbuf));
+
+ if (!iov_len) {
+ DHD_ERROR(("%s: Insufficient iovar buffer size %zu \n",
+ __FUNCTION__, sizeof(iovbuf)));
+ return BCME_ERROR;
+ }
+
+ retcode = dhd_wl_ioctl_cmd(dhdp, WLC_SET_VAR, iovbuf, iov_len, TRUE, idx);
+ if (retcode) {
+ DHD_ERROR(("%s: failed, retcode = %d\n", __FUNCTION__, retcode));
+ } else {
+ DHD_TRACE(("%s: successfully removed: %d\n", __FUNCTION__, retcode));
+ }
+
+ return retcode;
+}
+
+int
+dhd_ndo_unsolicited_na_filter_enable(dhd_pub_t *dhdp, int enable)
+{
+ char iovbuf[DHD_IOVAR_BUF_SIZE];
+ int iov_len;
+ int retcode;
+
+ if (dhdp == NULL) {
+ return BCME_ERROR;
+ }
+
+ iov_len = bcm_mkiovar("nd_unsolicited_na_filter", (char *)&enable, sizeof(int),
+ iovbuf, sizeof(iovbuf));
+
+ if (!iov_len) {
+ DHD_ERROR(("%s: Insufficient iovar buffer size %zu \n",
+ __FUNCTION__, sizeof(iovbuf)));
+ return BCME_ERROR;
+ }
+
+ retcode = dhd_wl_ioctl_cmd(dhdp, WLC_SET_VAR, iovbuf, iov_len, TRUE, 0);
+ if (retcode)
+ DHD_ERROR(("%s: failed to enable Unsolicited NA filter to %d, retcode = %d\n",
+ __FUNCTION__, enable, retcode));
+ else {
+ DHD_TRACE(("%s: successfully enabled Unsolicited NA filter to %d\n",
+ __FUNCTION__, enable));
+ }
+
+ return retcode;
+}
+#ifdef SIMPLE_ISCAN
+
+uint iscan_thread_id = 0;
+iscan_buf_t * iscan_chain = 0;
+
+iscan_buf_t *
+dhd_iscan_allocate_buf(dhd_pub_t *dhd, iscan_buf_t **iscanbuf)
+{
+ iscan_buf_t *iscanbuf_alloc = 0;
+ iscan_buf_t *iscanbuf_head;
+
+ DHD_ISCAN(("%s: Entered\n", __FUNCTION__));
+ dhd_iscan_lock();
+
+ iscanbuf_alloc = (iscan_buf_t*)MALLOC(dhd->osh, sizeof(iscan_buf_t));
+ if (iscanbuf_alloc == NULL)
+ goto fail;
+
+ iscanbuf_alloc->next = NULL;
+ iscanbuf_head = *iscanbuf;
+
+ DHD_ISCAN(("%s: addr of allocated node = 0x%X"
+ "addr of iscanbuf_head = 0x%X dhd = 0x%X\n",
+ __FUNCTION__, iscanbuf_alloc, iscanbuf_head, dhd));
+
+ if (iscanbuf_head == NULL) {
+ *iscanbuf = iscanbuf_alloc;
+ DHD_ISCAN(("%s: Head is allocated\n", __FUNCTION__));
+ goto fail;
+ }
+
+ while (iscanbuf_head->next)
+ iscanbuf_head = iscanbuf_head->next;
+
+ iscanbuf_head->next = iscanbuf_alloc;
+
+fail:
+ dhd_iscan_unlock();
+ return iscanbuf_alloc;
+}
+
+void
+dhd_iscan_free_buf(void *dhdp, iscan_buf_t *iscan_delete)
+{
+ iscan_buf_t *iscanbuf_free = 0;
+ iscan_buf_t *iscanbuf_prv = 0;
+ iscan_buf_t *iscanbuf_cur;
+ dhd_pub_t *dhd = dhd_bus_pub(dhdp);
+ DHD_ISCAN(("%s: Entered\n", __FUNCTION__));
+
+ dhd_iscan_lock();
+
+ iscanbuf_cur = iscan_chain;
+
+ /* If iscan_delete is null then delete the entire
+ * chain or else delete specific one provided
+ */
+ if (!iscan_delete) {
+ while (iscanbuf_cur) {
+ iscanbuf_free = iscanbuf_cur;
+ iscanbuf_cur = iscanbuf_cur->next;
+ iscanbuf_free->next = 0;
+ MFREE(dhd->osh, iscanbuf_free, sizeof(iscan_buf_t));
+ }
+ iscan_chain = 0;
+ } else {
+ while (iscanbuf_cur) {
+ if (iscanbuf_cur == iscan_delete)
+ break;
+ iscanbuf_prv = iscanbuf_cur;
+ iscanbuf_cur = iscanbuf_cur->next;
+ }
+ if (iscanbuf_prv)
+ iscanbuf_prv->next = iscan_delete->next;
+
+ iscan_delete->next = 0;
+ MFREE(dhd->osh, iscan_delete, sizeof(iscan_buf_t));
+
+ if (!iscanbuf_prv)
+ iscan_chain = 0;
+ }
+ dhd_iscan_unlock();
+}
+
+iscan_buf_t *
+dhd_iscan_result_buf(void)
+{
+ return iscan_chain;
+}
+
+int
+dhd_iscan_issue_request(void * dhdp, wl_iscan_params_t *pParams, uint32 size)
+{
+ int rc = -1;
+ dhd_pub_t *dhd = dhd_bus_pub(dhdp);
+ char *buf;
+ char iovar[] = "iscan";
+ uint32 allocSize = 0;
+ wl_ioctl_t ioctl;
+ int len;
+
+ if (pParams) {
+ allocSize = (size + strlen(iovar) + 1);
+ if ((allocSize < size) || (allocSize < strlen(iovar)))
+ {
+ DHD_ERROR(("%s: overflow - allocation size too large %d < %d + %d!\n",
+ __FUNCTION__, allocSize, size, strlen(iovar)));
+ goto cleanUp;
+ }
+ buf = MALLOC(dhd->osh, allocSize);
+
+ if (buf == NULL)
+ {
+ DHD_ERROR(("%s: malloc of size %d failed!\n", __FUNCTION__, allocSize));
+ goto cleanUp;
+ }
+ ioctl.cmd = WLC_SET_VAR;
+ len = bcm_mkiovar(iovar, (char *)pParams, size, buf, allocSize);
+ if (len == 0) {
+ rc = BCME_BUFTOOSHORT;
+ goto cleanUp;
+ }
+ rc = dhd_wl_ioctl(dhd, 0, &ioctl, buf, len);
+ }
+
+cleanUp:
+ if (buf) {
+ MFREE(dhd->osh, buf, allocSize);
+ }
+
+ return rc;
+}
+
+static int
+dhd_iscan_get_partial_result(void *dhdp, uint *scan_count)
+{
+ wl_iscan_results_t *list_buf;
+ wl_iscan_results_t list;
+ wl_scan_results_t *results;
+ iscan_buf_t *iscan_cur;
+ int status = -1;
+ dhd_pub_t *dhd = dhd_bus_pub(dhdp);
+ int rc;
+ wl_ioctl_t ioctl;
+ int len;
+
+ DHD_ISCAN(("%s: Enter\n", __FUNCTION__));
+
+ iscan_cur = dhd_iscan_allocate_buf(dhd, &iscan_chain);
+ if (!iscan_cur) {
+ DHD_ERROR(("%s: Failed to allocate node\n", __FUNCTION__));
+ dhd_iscan_free_buf(dhdp, 0);
+ dhd_iscan_request(dhdp, WL_SCAN_ACTION_ABORT);
+ dhd_ind_scan_confirm(dhdp, FALSE);
+ goto fail;
+ }
+
+ dhd_iscan_lock();
+
+ memset(iscan_cur->iscan_buf, 0, WLC_IW_ISCAN_MAXLEN);
+ list_buf = (wl_iscan_results_t*)iscan_cur->iscan_buf;
+ results = &list_buf->results;
+ results->buflen = WL_ISCAN_RESULTS_FIXED_SIZE;
+ results->version = 0;
+ results->count = 0;
+
+ memset(&list, 0, sizeof(list));
+ list.results.buflen = htod32(WLC_IW_ISCAN_MAXLEN);
+ len = bcm_mkiovar("iscanresults", (char *)&list, WL_ISCAN_RESULTS_FIXED_SIZE,
+ iscan_cur->iscan_buf, WLC_IW_ISCAN_MAXLEN);
+ if (len == 0) {
+ dhd_iscan_free_buf(dhdp, 0);
+ dhd_iscan_request(dhdp, WL_SCAN_ACTION_ABORT);
+ dhd_ind_scan_confirm(dhdp, FALSE);
+ status = BCME_BUFTOOSHORT;
+ goto fail;
+ }
+ ioctl.cmd = WLC_GET_VAR;
+ ioctl.set = FALSE;
+ rc = dhd_wl_ioctl(dhd, 0, &ioctl, iscan_cur->iscan_buf, WLC_IW_ISCAN_MAXLEN);
+
+ results->buflen = dtoh32(results->buflen);
+ results->version = dtoh32(results->version);
+ *scan_count = results->count = dtoh32(results->count);
+ status = dtoh32(list_buf->status);
+ DHD_ISCAN(("%s: Got %d resuls status = (%x)\n", __FUNCTION__, results->count, status));
+
+ dhd_iscan_unlock();
+
+ if (!(*scan_count)) {
+ /* TODO: race condition when FLUSH already called */
+ dhd_iscan_free_buf(dhdp, 0);
+ }
+fail:
+ return status;
+}
+
+#endif /* SIMPLE_ISCAN */
/*
* returns = TRUE if associated, FALSE if not associated
*/
-bool dhd_is_associated(dhd_pub_t *dhd, void *bss_buf, int *retval)
+bool dhd_is_associated(dhd_pub_t *dhd, uint8 ifidx, int *retval)
{
char bssid[6], zbuf[6];
int ret = -1;
@@ -2781,7 +4976,8 @@
bzero(bssid, 6);
bzero(zbuf, 6);
- ret = dhd_wl_ioctl_cmd(dhd, WLC_GET_BSSID, (char *)&bssid, ETHER_ADDR_LEN, FALSE, 0);
+ ret = dhd_wl_ioctl_cmd(dhd, WLC_GET_BSSID, (char *)&bssid,
+ ETHER_ADDR_LEN, FALSE, ifidx);
DHD_TRACE((" %s WLC_GET_BSSID ioctl res = %d\n", __FUNCTION__, ret));
if (ret == BCME_NOTASSOCIATED) {
@@ -2794,21 +4990,95 @@
if (ret < 0)
return FALSE;
- if ((memcmp(bssid, zbuf, ETHER_ADDR_LEN) != 0)) {
- /* STA is assocoated BSSID is non zero */
-
- if (bss_buf) {
- /* return bss if caller provided buf */
- memcpy(bss_buf, bssid, ETHER_ADDR_LEN);
- }
- return TRUE;
- } else {
+ if ((memcmp(bssid, zbuf, ETHER_ADDR_LEN) == 0)) {
DHD_TRACE(("%s: WLC_GET_BSSID ioctl returned zero bssid\n", __FUNCTION__));
return FALSE;
}
+ return TRUE;
}
/* Function to estimate possible DTIM_SKIP value */
+#if defined(OEM_ANDROID) && defined(BCMPCIE)
+int
+dhd_get_suspend_bcn_li_dtim(dhd_pub_t *dhd, int *dtim_period, int *bcn_interval)
+{
+ int bcn_li_dtim = 1; /* deafult no dtim skip setting */
+ int ret = -1;
+ int allowed_skip_dtim_cnt = 0;
+
+ if (dhd->disable_dtim_in_suspend) {
+ DHD_ERROR(("%s Disable bcn_li_dtim in suspend\n", __FUNCTION__));
+ bcn_li_dtim = 0;
+ return bcn_li_dtim;
+ }
+
+ /* Check if associated */
+ if (dhd_is_associated(dhd, 0, NULL) == FALSE) {
+ DHD_TRACE(("%s NOT assoc ret %d\n", __FUNCTION__, ret));
+ return bcn_li_dtim;
+ }
+
+ if (dtim_period == NULL || bcn_interval == NULL)
+ return bcn_li_dtim;
+
+ /* read associated AP beacon interval */
+ if ((ret = dhd_wl_ioctl_cmd(dhd, WLC_GET_BCNPRD,
+ bcn_interval, sizeof(*bcn_interval), FALSE, 0)) < 0) {
+ DHD_ERROR(("%s get beacon failed code %d\n", __FUNCTION__, ret));
+ return bcn_li_dtim;
+ }
+
+ /* read associated AP dtim setup */
+ if ((ret = dhd_wl_ioctl_cmd(dhd, WLC_GET_DTIMPRD,
+ dtim_period, sizeof(*dtim_period), FALSE, 0)) < 0) {
+ DHD_ERROR(("%s failed code %d\n", __FUNCTION__, ret));
+ return bcn_li_dtim;
+ }
+
+ /* if not assocated just return */
+ if (*dtim_period == 0) {
+ return bcn_li_dtim;
+ }
+
+ if (dhd->max_dtim_enable) {
+ bcn_li_dtim =
+ (int) (MAX_DTIM_ALLOWED_INTERVAL / ((*dtim_period) * (*bcn_interval)));
+ if (bcn_li_dtim == 0) {
+ bcn_li_dtim = 1;
+ }
+ } else {
+ /* attemp to use platform defined dtim skip interval */
+ bcn_li_dtim = dhd->suspend_bcn_li_dtim;
+
+ /* check if sta listen interval fits into AP dtim */
+ if (*dtim_period > CUSTOM_LISTEN_INTERVAL) {
+ /* AP DTIM to big for our Listen Interval : no dtim skiping */
+ bcn_li_dtim = NO_DTIM_SKIP;
+ DHD_ERROR(("%s DTIM=%d > Listen=%d : too big ...\n",
+ __FUNCTION__, *dtim_period, CUSTOM_LISTEN_INTERVAL));
+ return bcn_li_dtim;
+ }
+
+ if (((*dtim_period) * (*bcn_interval) * bcn_li_dtim) > MAX_DTIM_ALLOWED_INTERVAL) {
+ allowed_skip_dtim_cnt =
+ MAX_DTIM_ALLOWED_INTERVAL / ((*dtim_period) * (*bcn_interval));
+ bcn_li_dtim =
+ (allowed_skip_dtim_cnt != 0) ? allowed_skip_dtim_cnt : NO_DTIM_SKIP;
+ }
+
+ if ((bcn_li_dtim * (*dtim_period)) > CUSTOM_LISTEN_INTERVAL) {
+ /* Round up dtim_skip to fit into STAs Listen Interval */
+ bcn_li_dtim = (int)(CUSTOM_LISTEN_INTERVAL / *dtim_period);
+ DHD_TRACE(("%s agjust dtim_skip as %d\n", __FUNCTION__, bcn_li_dtim));
+ }
+ }
+
+ DHD_ERROR(("%s beacon=%d bcn_li_dtim=%d DTIM=%d Listen=%d\n",
+ __FUNCTION__, *bcn_interval, bcn_li_dtim, *dtim_period, CUSTOM_LISTEN_INTERVAL));
+
+ return bcn_li_dtim;
+}
+#else /* OEM_ANDROID && BCMPCIE */
int
dhd_get_suspend_bcn_li_dtim(dhd_pub_t *dhd)
{
@@ -2816,11 +5086,16 @@
int ret = -1;
int dtim_period = 0;
int ap_beacon = 0;
-#ifndef ENABLE_MAX_DTIM_IN_SUSPEND
int allowed_skip_dtim_cnt = 0;
-#endif /* !ENABLE_MAX_DTIM_IN_SUSPEND */
+
+ if (dhd->disable_dtim_in_suspend) {
+ DHD_ERROR(("%s Disable bcn_li_dtim in suspend\n", __FUNCTION__));
+ bcn_li_dtim = 0;
+ goto exit;
+ }
+
/* Check if associated */
- if (dhd_is_associated(dhd, NULL, NULL) == FALSE) {
+ if (dhd_is_associated(dhd, 0, NULL) == FALSE) {
DHD_TRACE(("%s NOT assoc ret %d\n", __FUNCTION__, ret));
goto exit;
}
@@ -2839,40 +5114,43 @@
goto exit;
}
- /* if not assocated just eixt */
+ /* if not assocated just exit */
if (dtim_period == 0) {
goto exit;
}
-#ifdef ENABLE_MAX_DTIM_IN_SUSPEND
- bcn_li_dtim = (int) (MAX_DTIM_ALLOWED_INTERVAL / (ap_beacon * dtim_period));
- if (bcn_li_dtim == 0) {
- bcn_li_dtim = 1;
- }
-#else /* ENABLE_MAX_DTIM_IN_SUSPEND */
- /* attemp to use platform defined dtim skip interval */
- bcn_li_dtim = dhd->suspend_bcn_li_dtim;
+ if (dhd->max_dtim_enable) {
+ bcn_li_dtim =
+ (int) (MAX_DTIM_ALLOWED_INTERVAL / (ap_beacon * dtim_period));
+ if (bcn_li_dtim == 0) {
+ bcn_li_dtim = 1;
+ }
+ } else {
+ /* attemp to use platform defined dtim skip interval */
+ bcn_li_dtim = dhd->suspend_bcn_li_dtim;
- /* check if sta listen interval fits into AP dtim */
- if (dtim_period > CUSTOM_LISTEN_INTERVAL) {
- /* AP DTIM to big for our Listen Interval : no dtim skiping */
- bcn_li_dtim = NO_DTIM_SKIP;
- DHD_ERROR(("%s DTIM=%d > Listen=%d : too big ...\n",
- __FUNCTION__, dtim_period, CUSTOM_LISTEN_INTERVAL));
- goto exit;
- }
+ /* check if sta listen interval fits into AP dtim */
+ if (dtim_period > CUSTOM_LISTEN_INTERVAL) {
+ /* AP DTIM to big for our Listen Interval : no dtim skiping */
+ bcn_li_dtim = NO_DTIM_SKIP;
+ DHD_ERROR(("%s DTIM=%d > Listen=%d : too big ...\n",
+ __FUNCTION__, dtim_period, CUSTOM_LISTEN_INTERVAL));
+ goto exit;
+ }
- if ((dtim_period * ap_beacon * bcn_li_dtim) > MAX_DTIM_ALLOWED_INTERVAL) {
- allowed_skip_dtim_cnt = MAX_DTIM_ALLOWED_INTERVAL / (dtim_period * ap_beacon);
- bcn_li_dtim = (allowed_skip_dtim_cnt != 0) ? allowed_skip_dtim_cnt : NO_DTIM_SKIP;
- }
+ if ((dtim_period * ap_beacon * bcn_li_dtim) > MAX_DTIM_ALLOWED_INTERVAL) {
+ allowed_skip_dtim_cnt =
+ MAX_DTIM_ALLOWED_INTERVAL / (dtim_period * ap_beacon);
+ bcn_li_dtim =
+ (allowed_skip_dtim_cnt != 0) ? allowed_skip_dtim_cnt : NO_DTIM_SKIP;
+ }
- if ((bcn_li_dtim * dtim_period) > CUSTOM_LISTEN_INTERVAL) {
- /* Round up dtim_skip to fit into STAs Listen Interval */
- bcn_li_dtim = (int)(CUSTOM_LISTEN_INTERVAL / dtim_period);
- DHD_TRACE(("%s agjust dtim_skip as %d\n", __FUNCTION__, bcn_li_dtim));
+ if ((bcn_li_dtim * dtim_period) > CUSTOM_LISTEN_INTERVAL) {
+ /* Round up dtim_skip to fit into STAs Listen Interval */
+ bcn_li_dtim = (int)(CUSTOM_LISTEN_INTERVAL / dtim_period);
+ DHD_TRACE(("%s agjust dtim_skip as %d\n", __FUNCTION__, bcn_li_dtim));
+ }
}
-#endif /* ENABLE_MAX_DTIM_IN_SUSPEND */
DHD_ERROR(("%s beacon=%d bcn_li_dtim=%d DTIM=%d Listen=%d\n",
__FUNCTION__, ap_beacon, bcn_li_dtim, dtim_period, CUSTOM_LISTEN_INTERVAL));
@@ -2880,6 +5158,67 @@
exit:
return bcn_li_dtim;
}
+#endif /* OEM_ANDROID && BCMPCIE */
+
+#ifdef CONFIG_SILENT_ROAM
+int
+dhd_sroam_set_mon(dhd_pub_t *dhd, bool set)
+{
+ int ret = BCME_OK;
+ wlc_sroam_t *psroam;
+ wlc_sroam_info_t *sroam;
+ uint sroamlen = sizeof(*sroam) + SROAM_HDRLEN;
+
+ /* Check if associated */
+ if (dhd_is_associated(dhd, 0, NULL) == FALSE) {
+ DHD_TRACE(("%s NOT assoc\n", __FUNCTION__));
+ return ret;
+ }
+
+ if (set && (dhd->op_mode &
+ (DHD_FLAG_HOSTAP_MODE | DHD_FLAG_P2P_GC_MODE | DHD_FLAG_P2P_GO_MODE))) {
+ DHD_INFO((" Failed to set sroam %d, op_mode 0x%04x\n", set, dhd->op_mode));
+ return ret;
+ }
+
+ if (!dhd->sroam_turn_on) {
+ DHD_INFO((" Failed to set sroam %d, sroam turn %d\n", set, dhd->sroam_turn_on));
+ return ret;
+ }
+ psroam = (wlc_sroam_t *)MALLOCZ(dhd->osh, sroamlen);
+ if (!psroam) {
+ DHD_ERROR(("%s Fail to malloc buffer\n", __FUNCTION__));
+ return BCME_NOMEM;
+ }
+
+ ret = dhd_iovar(dhd, 0, "sroam", NULL, 0, (char *)psroam, sroamlen, FALSE);
+ if (ret < 0) {
+ DHD_ERROR(("%s Failed to Get sroam %d\n", __FUNCTION__, ret));
+ goto done;
+ }
+
+ if (psroam->ver != WLC_SILENT_ROAM_CUR_VER) {
+ ret = BCME_VERSION;
+ goto done;
+ }
+
+ sroam = (wlc_sroam_info_t *)psroam->data;
+ sroam->sroam_on = set;
+ DHD_INFO((" Silent roam monitor mode %s\n", set ? "On" : "Off"));
+
+ ret = dhd_iovar(dhd, 0, "sroam", (char *)psroam, sroamlen, NULL, 0, TRUE);
+ if (ret < 0) {
+ DHD_ERROR(("%s Failed to Set sroam %d\n", __FUNCTION__, ret));
+ }
+
+done:
+ if (psroam) {
+ MFREE(dhd->osh, psroam, sroamlen);
+ }
+ return ret;
+
+}
+#endif /* CONFIG_SILENT_ROAM */
/* Check if the mode supports STA MODE */
bool dhd_support_sta_mode(dhd_pub_t *dhd)
@@ -2898,7 +5237,7 @@
{
char buf[32] = {0};
const char *str;
- wl_mkeep_alive_pkt_t mkeep_alive_pkt = {0};
+ wl_mkeep_alive_pkt_t mkeep_alive_pkt = {0, 0, 0, 0, 0, {0}};
wl_mkeep_alive_pkt_t *mkeep_alive_pktp;
int buf_len;
int str_len;
@@ -2934,6 +5273,82 @@
return res;
}
#endif /* defined(KEEP_ALIVE) */
+#if defined(OEM_ANDROID)
+#define CSCAN_TLV_TYPE_SSID_IE 'S'
+/*
+ * SSIDs list parsing from cscan tlv list
+ */
+int
+wl_parse_ssid_list_tlv(char** list_str, wlc_ssid_ext_t* ssid, int max, int *bytes_left)
+{
+ char* str;
+ int idx = 0;
+ uint8 len;
+
+ if ((list_str == NULL) || (*list_str == NULL) || (*bytes_left < 0)) {
+ DHD_ERROR(("%s error paramters\n", __FUNCTION__));
+ return BCME_BADARG;
+ }
+ str = *list_str;
+ while (*bytes_left > 0) {
+ if (str[0] != CSCAN_TLV_TYPE_SSID_IE) {
+ *list_str = str;
+ DHD_TRACE(("nssid=%d left_parse=%d %d\n", idx, *bytes_left, str[0]));
+ return idx;
+ }
+
+ if (idx >= max) {
+ DHD_ERROR(("%s number of SSIDs more than %d\n", __FUNCTION__, idx));
+ return BCME_BADARG;
+ }
+
+ /* Get proper CSCAN_TLV_TYPE_SSID_IE */
+ *bytes_left -= 1;
+ if (*bytes_left == 0) {
+ DHD_ERROR(("%s no length field.\n", __FUNCTION__));
+ return BCME_BADARG;
+ }
+ str += 1;
+ ssid[idx].rssi_thresh = 0;
+ ssid[idx].flags = 0;
+ len = str[0];
+ if (len == 0) {
+ /* Broadcast SSID */
+ ssid[idx].SSID_len = 0;
+ memset((char*)ssid[idx].SSID, 0x0, DOT11_MAX_SSID_LEN);
+ *bytes_left -= 1;
+ str += 1;
+
+ DHD_TRACE(("BROADCAST SCAN left=%d\n", *bytes_left));
+ } else if (len <= DOT11_MAX_SSID_LEN) {
+ /* Get proper SSID size */
+ ssid[idx].SSID_len = len;
+ *bytes_left -= 1;
+ /* Get SSID */
+ if (ssid[idx].SSID_len > *bytes_left) {
+ DHD_ERROR(("%s out of memory range len=%d but left=%d\n",
+ __FUNCTION__, ssid[idx].SSID_len, *bytes_left));
+ return BCME_BADARG;
+ }
+ str += 1;
+ memcpy((char*)ssid[idx].SSID, str, ssid[idx].SSID_len);
+
+ *bytes_left -= ssid[idx].SSID_len;
+ str += ssid[idx].SSID_len;
+ ssid[idx].hidden = TRUE;
+
+ DHD_TRACE(("%s :size=%d left=%d\n",
+ (char*)ssid[idx].SSID, ssid[idx].SSID_len, *bytes_left));
+ } else {
+ DHD_ERROR(("### SSID size more than %d\n", str[0]));
+ return BCME_BADARG;
+ }
+ idx++;
+ }
+
+ *list_str = str;
+ return idx;
+}
/* Android ComboSCAN support */
/*
@@ -2955,7 +5370,7 @@
/* Clean all dest bytes */
memset(dst, 0, dst_size);
- while (*bytes_left > 0) {
+ if (*bytes_left > 0) {
if (str[0] != token) {
DHD_TRACE(("%s NOT Type=%d get=%d left_parse=%d \n",
@@ -3026,78 +5441,6 @@
if (idx++ > 255) {
DHD_ERROR(("%s Too many channels \n", __FUNCTION__));
- return -1;
- }
- }
-
- *list_str = str;
- return idx;
-}
-
-/*
- * SSIDs list parsing from cscan tlv list
- */
-int
-wl_iw_parse_ssid_list_tlv(char** list_str, wlc_ssid_ext_t* ssid, int max, int *bytes_left)
-{
- char* str;
- int idx = 0;
-
- if ((list_str == NULL) || (*list_str == NULL) || (*bytes_left < 0)) {
- DHD_ERROR(("%s error paramters\n", __FUNCTION__));
- return -1;
- }
- str = *list_str;
- while (*bytes_left > 0) {
-
- if (str[0] != CSCAN_TLV_TYPE_SSID_IE) {
- *list_str = str;
- DHD_TRACE(("nssid=%d left_parse=%d %d\n", idx, *bytes_left, str[0]));
- return idx;
- }
-
- /* Get proper CSCAN_TLV_TYPE_SSID_IE */
- *bytes_left -= 1;
- str += 1;
- ssid[idx].rssi_thresh = 0;
- if (str[0] == 0) {
- /* Broadcast SSID */
- ssid[idx].SSID_len = 0;
- memset((char*)ssid[idx].SSID, 0x0, DOT11_MAX_SSID_LEN);
- *bytes_left -= 1;
- str += 1;
-
- DHD_TRACE(("BROADCAST SCAN left=%d\n", *bytes_left));
- }
- else if (str[0] <= DOT11_MAX_SSID_LEN) {
- /* Get proper SSID size */
- ssid[idx].SSID_len = str[0];
- *bytes_left -= 1;
- str += 1;
-
- /* Get SSID */
- if (ssid[idx].SSID_len > *bytes_left) {
- DHD_ERROR(("%s out of memory range len=%d but left=%d\n",
- __FUNCTION__, ssid[idx].SSID_len, *bytes_left));
- return -1;
- }
-
- memcpy((char*)ssid[idx].SSID, str, ssid[idx].SSID_len);
-
- *bytes_left -= ssid[idx].SSID_len;
- str += ssid[idx].SSID_len;
- ssid[idx].hidden = TRUE;
-
- DHD_TRACE(("%s :size=%d left=%d\n",
- (char*)ssid[idx].SSID, ssid[idx].SSID_len, *bytes_left));
- }
- else {
- DHD_ERROR(("### SSID size more that %d\n", str[0]));
- return -1;
- }
-
- if (idx++ > max) {
- DHD_ERROR(("%s number of SSIDs more that %d\n", __FUNCTION__, idx));
return -1;
}
}
@@ -3186,60 +5529,12 @@
*list_str = str;
return num;
}
-
-#if defined(TRAFFIC_MGMT_DWM)
-static int traffic_mgmt_add_dwm_filter(dhd_pub_t *dhd,
- trf_mgmt_filter_list_t * trf_mgmt_filter_list, int len)
-{
- int ret = 0;
- uint32 i;
- trf_mgmt_filter_t *trf_mgmt_filter;
- uint8 dwm_tbl_entry;
- uint32 dscp = 0;
- uint16 dwm_filter_enabled = 0;
-
-
- /* Check parameter length is adequate */
- if (len < (OFFSETOF(trf_mgmt_filter_list_t, filter) +
- trf_mgmt_filter_list->num_filters * sizeof(trf_mgmt_filter_t))) {
- ret = BCME_BUFTOOSHORT;
- return ret;
- }
-
- bzero(&dhd->dhd_tm_dwm_tbl, sizeof(dhd_trf_mgmt_dwm_tbl_t));
-
- for (i = 0; i < trf_mgmt_filter_list->num_filters; i++) {
- trf_mgmt_filter = &trf_mgmt_filter_list->filter[i];
-
- dwm_filter_enabled = (trf_mgmt_filter->flags & TRF_FILTER_DWM);
-
- if (dwm_filter_enabled) {
- dscp = trf_mgmt_filter->dscp;
- if (dscp >= DHD_DWM_TBL_SIZE) {
- ret = BCME_BADARG;
- return ret;
- }
- }
-
- dhd->dhd_tm_dwm_tbl.dhd_dwm_enabled = 1;
- /* set WMM AC bits */
- dwm_tbl_entry = (uint8) trf_mgmt_filter->priority;
- DHD_TRF_MGMT_DWM_SET_FILTER(dwm_tbl_entry);
-
- /* set favored bits */
- if (trf_mgmt_filter->flags & TRF_FILTER_FAVORED)
- DHD_TRF_MGMT_DWM_SET_FAVORED(dwm_tbl_entry);
-
- dhd->dhd_tm_dwm_tbl.dhd_dwm_tbl[dscp] = dwm_tbl_entry;
- }
- return ret;
-}
-#endif
+#endif /* defined(OEM_ANDROID) */
/* Given filename and download type, returns a buffer pointer and length
- * for download to f/w. Type can be FW or NVRAM.
- *
- */
+* for download to f/w. Type can be FW or NVRAM.
+*
+*/
int dhd_get_download_buffer(dhd_pub_t *dhd, char *file_path, download_type_t component,
char ** buffer, int *length)
@@ -3251,34 +5546,13 @@
uint8 *buf = NULL;
/* Point to cache if available. */
-#ifdef CACHE_FW_IMAGES
- if (component == FW) {
- if (dhd->cached_fw_length) {
- len = dhd->cached_fw_length;
- buf = dhd->cached_fw;
- }
- } else if (component == NVRAM) {
- if (dhd->cached_nvram_length) {
- len = dhd->cached_nvram_length;
- buf = dhd->cached_nvram;
- }
- }
- else if (component == CLM_BLOB) {
- if (dhd->cached_clm_length) {
- len = dhd->cached_clm_length;
- buf = dhd->cached_clm;
- }
- } else {
- return ret;
- }
-#endif
/* No Valid cache found on this call */
if (!len) {
file_len = *length;
*length = 0;
if (file_path) {
- image = dhd_os_open_image(file_path);
+ image = dhd_os_open_image1(dhd, file_path);
if (image == NULL) {
goto err;
}
@@ -3292,7 +5566,7 @@
}
/* Download image */
- len = dhd_os_get_image_block(buf, file_len, image);
+ len = dhd_os_get_image_block((char *)buf, file_len, image);
if ((len <= 0 || len > file_len)) {
MFREE(dhd->osh, buf, file_len);
goto err;
@@ -3301,32 +5575,13 @@
ret = BCME_OK;
*length = len;
- *buffer = buf;
+ *buffer = (char *)buf;
/* Cache if first call. */
-#ifdef CACHE_FW_IMAGES
- if (component == FW) {
- if (!dhd->cached_fw_length) {
- dhd->cached_fw = buf;
- dhd->cached_fw_length = len;
- }
- } else if (component == NVRAM) {
- if (!dhd->cached_nvram_length) {
- dhd->cached_nvram = buf;
- dhd->cached_nvram_length = len;
- }
- }
- else if (component == CLM_BLOB) {
- if (!dhd->cached_clm_length) {
- dhd->cached_clm = buf;
- dhd->cached_clm_length = len;
- }
- }
-#endif
err:
if (image)
- dhd_os_close_image(image);
+ dhd_os_close_image1(dhd, image);
return ret;
}
@@ -3348,9 +5603,9 @@
dload_ptr->dload_type = dload_type;
dload_ptr->len = htod32(len - dload_data_offset);
dload_ptr->crc = 0;
- len = len + 8 - (len%8);
+ len = ROUNDUP(len, 8);
- iovar_len = bcm_mkiovar(iovar, dload_buf,
+ iovar_len = bcm_mkiovar(iovar, (char *)dload_buf,
(uint)len, iovar_buf, sizeof(iovar_buf));
if (iovar_len == 0) {
DHD_ERROR(("%s: insufficient buffer space passed to bcm_mkiovar for '%s' \n",
@@ -3365,9 +5620,11 @@
}
int
-dhd_download_clm_blob(dhd_pub_t *dhd, unsigned char *buf, uint32 len)
+dhd_download_blob(dhd_pub_t *dhd, unsigned char *buf,
+ uint32 len, char *iovar)
+
{
- int chunk_len, cumulative_len = 0;
+ int chunk_len;
int size2alloc;
unsigned char *new_buf;
int err = 0, data_offset;
@@ -3375,34 +5632,72 @@
data_offset = OFFSETOF(wl_dload_data_t, data);
size2alloc = data_offset + MAX_CHUNK_LEN;
+ size2alloc = ROUNDUP(size2alloc, 8);
if ((new_buf = (unsigned char *)MALLOCZ(dhd->osh, size2alloc)) != NULL) {
do {
- if (len >= MAX_CHUNK_LEN)
- chunk_len = MAX_CHUNK_LEN;
- else
- chunk_len = len;
-
- memcpy(new_buf + data_offset, buf + cumulative_len, chunk_len);
- cumulative_len += chunk_len;
-
+ chunk_len = dhd_os_get_image_block((char *)(new_buf + data_offset),
+ MAX_CHUNK_LEN, buf);
+ if (chunk_len < 0) {
+ DHD_ERROR(("%s: dhd_os_get_image_block failed (%d)\n",
+ __FUNCTION__, chunk_len));
+ err = BCME_ERROR;
+ goto exit;
+ }
if (len - chunk_len == 0)
dl_flag |= DL_END;
- err = dhd_download_2_dongle(dhd, "clmload", dl_flag, DL_TYPE_CLM,
+ err = dhd_download_2_dongle(dhd, iovar, dl_flag, DL_TYPE_CLM,
new_buf, data_offset + chunk_len);
dl_flag &= ~DL_BEGIN;
len = len - chunk_len;
} while ((len > 0) && (err == 0));
-
- MFREE(dhd->osh, new_buf, size2alloc);
} else {
err = BCME_NOMEM;
}
-
+exit:
+ if (new_buf) {
+ MFREE(dhd->osh, new_buf, size2alloc);
+ }
return err;
+}
+
+int
+dhd_apply_default_txcap(dhd_pub_t *dhd, char *path)
+{
+ return 0;
+}
+
+int
+dhd_check_current_clm_data(dhd_pub_t *dhd)
+{
+ char iovbuf[WLC_IOCTL_SMLEN];
+ wl_country_t *cspec;
+ int err = BCME_OK;
+
+ memset(iovbuf, 0, sizeof(iovbuf));
+ err = bcm_mkiovar("country", NULL, 0, iovbuf, sizeof(iovbuf));
+ if (err == 0) {
+ err = BCME_BUFTOOSHORT;
+ DHD_ERROR(("%s: bcm_mkiovar failed.", __FUNCTION__));
+ return err;
+ }
+ err = dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, iovbuf, sizeof(iovbuf), FALSE, 0);
+ if (err) {
+ DHD_ERROR(("%s: country code get failed\n", __FUNCTION__));
+ return err;
+ }
+ cspec = (wl_country_t *)iovbuf;
+ if ((strncmp(cspec->ccode, WL_CCODE_NULL_COUNTRY, WLC_CNTRY_BUF_SZ)) == 0) {
+ DHD_ERROR(("%s: ----- This FW is not included CLM data -----\n",
+ __FUNCTION__));
+ return FALSE;
+ }
+ DHD_ERROR(("%s: ----- This FW is included CLM data -----\n",
+ __FUNCTION__));
+ return TRUE;
}
int
@@ -3413,7 +5708,7 @@
char *memblock = NULL;
int err = BCME_OK;
char iovbuf[WLC_IOCTL_SMLEN];
- wl_country_t *cspec;
+ int status = FALSE;
if (clm_path[0] != '\0') {
if (strlen(clm_path) > MOD_PARAM_PATHLEN) {
@@ -3421,27 +5716,67 @@
return BCME_ERROR;
}
clm_blob_path = clm_path;
- DHD_ERROR(("clm path from module param:%s\n", clm_path));
+ DHD_TRACE(("clm path from module param:%s\n", clm_path));
} else {
- clm_blob_path = CONFIG_BCMDHD_CLM_PATH;
+ clm_blob_path = VENDOR_PATH CONFIG_BCMDHD_CLM_PATH;
}
-
/* If CLM blob file is found on the filesystem, download the file.
* After CLM file download or If the blob file is not present,
* validate the country code before proceeding with the initialization.
* If country code is not valid, fail the initialization.
*/
- len = MAX_CLM_BUF_SIZE;
- dhd_get_download_buffer(dhd, clm_blob_path, CLM_BLOB, &memblock, &len);
+ memblock = dhd_os_open_image1(dhd, (char *)clm_blob_path);
+ if (memblock == NULL) {
+#if defined(DHD_BLOB_EXISTENCE_CHECK)
+ if (dhd->is_blob) {
+ err = BCME_ERROR;
+ } else {
+ status = dhd_check_current_clm_data(dhd);
+ if (status == TRUE) {
+ err = BCME_OK;
+ } else {
+ err = status;
+ }
+ }
+#endif /* DHD_BLOB_EXISTENCE_CHECK */
+ goto exit;
+ }
+
+ len = dhd_os_get_image_size(memblock);
+
if ((len > 0) && (len < MAX_CLM_BUF_SIZE) && memblock) {
+ status = dhd_check_current_clm_data(dhd);
+ if (status == TRUE) {
+#if defined(DHD_BLOB_EXISTENCE_CHECK)
+ if (dhd->op_mode != DHD_FLAG_MFG_MODE) {
+ if (dhd->is_blob) {
+ err = BCME_ERROR;
+ }
+ goto exit;
+ }
+#else
+ DHD_ERROR(("%s: CLM already exist in F/W, "
+ "new CLM data will be added to the end of existing CLM data!\n",
+ __FUNCTION__));
+#endif /* DHD_BLOB_EXISTENCE_CHECK */
+ } else if (status != FALSE) {
+ err = status;
+ goto exit;
+ }
+
/* Found blob file. Download the file */
- DHD_ERROR(("clm file download from %s \n", clm_blob_path));
- err = dhd_download_clm_blob(dhd, memblock, len);
+ DHD_TRACE(("clm file download from %s \n", clm_blob_path));
+ err = dhd_download_blob(dhd, (unsigned char*)memblock, len, "clmload");
if (err) {
DHD_ERROR(("%s: CLM download failed err=%d\n", __FUNCTION__, err));
/* Retrieve clmload_status and print */
- bcm_mkiovar("clmload_status", NULL, 0, iovbuf, sizeof(iovbuf));
+ memset(iovbuf, 0, sizeof(iovbuf));
+ len = bcm_mkiovar("clmload_status", NULL, 0, iovbuf, sizeof(iovbuf));
+ if (len == 0) {
+ err = BCME_BUFTOOSHORT;
+ goto exit;
+ }
err = dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, iovbuf, sizeof(iovbuf), FALSE, 0);
if (err) {
DHD_ERROR(("%s: clmload_status get failed err=%d \n",
@@ -3449,6 +5784,9 @@
} else {
DHD_ERROR(("%s: clmload_status: %d \n",
__FUNCTION__, *((int *)iovbuf)));
+ if (*((int *)iovbuf) == CHIPID_MISMATCH) {
+ DHD_ERROR(("Chip ID mismatch error \n"));
+ }
}
err = BCME_ERROR;
goto exit;
@@ -3460,23 +5798,17 @@
}
/* Verify country code */
- bcm_mkiovar("country", NULL, 0, iovbuf, sizeof(iovbuf));
- err = dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, iovbuf, sizeof(iovbuf), FALSE, 0);
- if (err) {
- DHD_ERROR(("%s: country code get failed\n", __FUNCTION__));
- goto exit;
- }
+ status = dhd_check_current_clm_data(dhd);
- cspec = (wl_country_t *)iovbuf;
- if ((strncmp(cspec->ccode, WL_CCODE_NULL_COUNTRY, WLC_CNTRY_BUF_SZ)) == 0) {
+ if (status != TRUE) {
/* Country code not initialized or CLM download not proper */
DHD_ERROR(("country code not initialized\n"));
- err = BCME_ERROR;
+ err = status;
}
exit:
if (memblock) {
- dhd_free_download_buffer(dhd, memblock, MAX_CLM_BUF_SIZE);
+ dhd_os_close_image1(dhd, memblock);
}
return err;
@@ -3484,8 +5816,2030 @@
void dhd_free_download_buffer(dhd_pub_t *dhd, void *buffer, int length)
{
-#ifdef CACHE_FW_IMAGES
- return;
-#endif
MFREE(dhd->osh, buffer, length);
}
+
+#ifdef SHOW_LOGTRACE
+int
+dhd_parse_logstrs_file(osl_t *osh, char *raw_fmts, int logstrs_size,
+ dhd_event_log_t *event_log)
+{
+ uint32 *lognums = NULL;
+ char *logstrs = NULL;
+ logstr_trailer_t *trailer = NULL;
+ int ram_index = 0;
+ char **fmts = NULL;
+ int num_fmts = 0;
+ bool match_fail = TRUE;
+ int32 i = 0;
+ uint8 *pfw_id = NULL;
+ uint32 fwid = 0;
+ void *file = NULL;
+ int file_len = 0;
+ char fwid_str[FWID_STR_LEN];
+ uint32 hdr_logstrs_size = 0;
+
+ /* Read last three words in the logstrs.bin file */
+ trailer = (logstr_trailer_t *) (raw_fmts + logstrs_size -
+ sizeof(logstr_trailer_t));
+
+ if (trailer->log_magic == LOGSTRS_MAGIC) {
+ /*
+ * logstrs.bin has a header.
+ */
+ if (trailer->version == 1) {
+ logstr_header_v1_t *hdr_v1 = (logstr_header_v1_t *) (raw_fmts +
+ logstrs_size - sizeof(logstr_header_v1_t));
+ DHD_INFO(("%s: logstr header version = %u\n",
+ __FUNCTION__, hdr_v1->version));
+ num_fmts = hdr_v1->rom_logstrs_offset / sizeof(uint32);
+ ram_index = (hdr_v1->ram_lognums_offset -
+ hdr_v1->rom_lognums_offset) / sizeof(uint32);
+ lognums = (uint32 *) &raw_fmts[hdr_v1->rom_lognums_offset];
+ logstrs = (char *) &raw_fmts[hdr_v1->rom_logstrs_offset];
+ hdr_logstrs_size = hdr_v1->logstrs_size;
+ } else if (trailer->version == 2) {
+ logstr_header_t *hdr = (logstr_header_t *) (raw_fmts + logstrs_size -
+ sizeof(logstr_header_t));
+ DHD_INFO(("%s: logstr header version = %u; flags = %x\n",
+ __FUNCTION__, hdr->trailer.version, hdr->trailer.flags));
+
+ /* For ver. 2 of the header, need to match fwid of
+ * both logstrs.bin and fw bin
+ */
+
+ /* read the FWID from fw bin */
+ file = dhd_os_open_image1(NULL, st_str_file_path);
+ if (!file) {
+ DHD_ERROR(("%s: cannot open fw file !\n", __FUNCTION__));
+ goto error;
+ }
+ file_len = dhd_os_get_image_size(file);
+ if (file_len <= 0) {
+ DHD_ERROR(("%s: bad fw file length !\n", __FUNCTION__));
+ goto error;
+ }
+ /* fwid is at the end of fw bin in string format */
+ if (dhd_os_seek_file(file, file_len - (sizeof(fwid_str) - 1)) < 0) {
+ DHD_ERROR(("%s: can't seek file \n", __FUNCTION__));
+ goto error;
+ }
+
+ memset(fwid_str, 0, sizeof(fwid_str));
+ if (dhd_os_get_image_block(fwid_str, sizeof(fwid_str) - 1, file) <= 0) {
+ DHD_ERROR(("%s: read fw file failed !\n", __FUNCTION__));
+ goto error;
+ }
+ pfw_id = (uint8 *)bcmstrnstr(fwid_str, sizeof(fwid_str) - 1,
+ FWID_STR_1, strlen(FWID_STR_1));
+ if (!pfw_id) {
+ pfw_id = (uint8 *)bcmstrnstr(fwid_str, sizeof(fwid_str) - 1,
+ FWID_STR_2, strlen(FWID_STR_2));
+ if (!pfw_id) {
+ DHD_ERROR(("%s: could not find id in FW bin!\n",
+ __FUNCTION__));
+ goto error;
+ }
+ }
+ /* search for the '-' in the fw id str, after which the
+ * actual 4 byte fw id is present
+ */
+ while (pfw_id && *pfw_id != '-') {
+ ++pfw_id;
+ }
+ ++pfw_id;
+ fwid = bcm_strtoul((char *)pfw_id, NULL, 16);
+
+ /* check if fw id in logstrs.bin matches the fw one */
+ if (hdr->trailer.fw_id != fwid) {
+ DHD_ERROR(("%s: logstr id does not match FW!"
+ "logstrs_fwid:0x%x, rtecdc_fwid:0x%x\n",
+ __FUNCTION__, hdr->trailer.fw_id, fwid));
+ goto error;
+ }
+
+ match_fail = FALSE;
+ num_fmts = hdr->rom_logstrs_offset / sizeof(uint32);
+ ram_index = (hdr->ram_lognums_offset -
+ hdr->rom_lognums_offset) / sizeof(uint32);
+ lognums = (uint32 *) &raw_fmts[hdr->rom_lognums_offset];
+ logstrs = (char *) &raw_fmts[hdr->rom_logstrs_offset];
+ hdr_logstrs_size = hdr->logstrs_size;
+
+error:
+ if (file) {
+ dhd_os_close_image1(NULL, file);
+ }
+ if (match_fail) {
+ return BCME_DECERR;
+ }
+ } else {
+ DHD_ERROR(("%s: Invalid logstr version %u\n", __FUNCTION__,
+ trailer->version));
+ return BCME_ERROR;
+ }
+ if (logstrs_size != hdr_logstrs_size) {
+ DHD_ERROR(("%s: bad logstrs_size %d\n", __FUNCTION__, hdr_logstrs_size));
+ return BCME_ERROR;
+ }
+ } else {
+ /*
+ * Legacy logstrs.bin format without header.
+ */
+ num_fmts = *((uint32 *) (raw_fmts)) / sizeof(uint32);
+
+ /* Legacy RAM-only logstrs.bin format:
+ * - RAM 'lognums' section
+ * - RAM 'logstrs' section.
+ *
+ * 'lognums' is an array of indexes for the strings in the
+ * 'logstrs' section. The first uint32 is an index to the
+ * start of 'logstrs'. Therefore, if this index is divided
+ * by 'sizeof(uint32)' it provides the number of logstr
+ * entries.
+ */
+ ram_index = 0;
+ lognums = (uint32 *) raw_fmts;
+ logstrs = (char *) &raw_fmts[num_fmts << 2];
+ }
+ if (num_fmts)
+ fmts = MALLOC(osh, num_fmts * sizeof(char *));
+ if (fmts == NULL) {
+ DHD_ERROR(("%s: Failed to allocate fmts memory\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+ event_log->fmts_size = num_fmts * sizeof(char *);
+
+ for (i = 0; i < num_fmts; i++) {
+ /* ROM lognums index into logstrs using 'rom_logstrs_offset' as a base
+ * (they are 0-indexed relative to 'rom_logstrs_offset').
+ *
+ * RAM lognums are already indexed to point to the correct RAM logstrs (they
+ * are 0-indexed relative to the start of the logstrs.bin file).
+ */
+ if (i == ram_index) {
+ logstrs = raw_fmts;
+ }
+ fmts[i] = &logstrs[lognums[i]];
+ }
+ event_log->fmts = fmts;
+ event_log->raw_fmts_size = logstrs_size;
+ event_log->raw_fmts = raw_fmts;
+ event_log->num_fmts = num_fmts;
+ return BCME_OK;
+} /* dhd_parse_logstrs_file */
+
+int dhd_parse_map_file(osl_t *osh, void *file, uint32 *ramstart, uint32 *rodata_start,
+ uint32 *rodata_end)
+{
+ char *raw_fmts = NULL, *raw_fmts_loc = NULL;
+ uint32 read_size = READ_NUM_BYTES;
+ int error = 0;
+ char * cptr = NULL;
+ char c;
+ uint8 count = 0;
+
+ *ramstart = 0;
+ *rodata_start = 0;
+ *rodata_end = 0;
+
+ /* Allocate 1 byte more than read_size to terminate it with NULL */
+ raw_fmts = MALLOCZ(osh, read_size + 1);
+ if (raw_fmts == NULL) {
+ DHD_ERROR(("%s: Failed to allocate raw_fmts memory \n", __FUNCTION__));
+ goto fail;
+ }
+
+ /* read ram start, rodata_start and rodata_end values from map file */
+ while (count != ALL_MAP_VAL)
+ {
+ error = dhd_os_read_file(file, raw_fmts, read_size);
+ if (error < 0) {
+ DHD_ERROR(("%s: map file read failed err:%d \n", __FUNCTION__,
+ error));
+ goto fail;
+ }
+
+ /* End raw_fmts with NULL as strstr expects NULL terminated strings */
+ raw_fmts[read_size] = '\0';
+
+ /* Get ramstart address */
+ raw_fmts_loc = raw_fmts;
+ if (!(count & RAMSTART_BIT) &&
+ (cptr = bcmstrnstr(raw_fmts_loc, read_size, ramstart_str,
+ strlen(ramstart_str)))) {
+ cptr = cptr - BYTES_AHEAD_NUM;
+ sscanf(cptr, "%x %c text_start", ramstart, &c);
+ count |= RAMSTART_BIT;
+ }
+
+ /* Get ram rodata start address */
+ raw_fmts_loc = raw_fmts;
+ if (!(count & RDSTART_BIT) &&
+ (cptr = bcmstrnstr(raw_fmts_loc, read_size, rodata_start_str,
+ strlen(rodata_start_str)))) {
+ cptr = cptr - BYTES_AHEAD_NUM;
+ sscanf(cptr, "%x %c rodata_start", rodata_start, &c);
+ count |= RDSTART_BIT;
+ }
+
+ /* Get ram rodata end address */
+ raw_fmts_loc = raw_fmts;
+ if (!(count & RDEND_BIT) &&
+ (cptr = bcmstrnstr(raw_fmts_loc, read_size, rodata_end_str,
+ strlen(rodata_end_str)))) {
+ cptr = cptr - BYTES_AHEAD_NUM;
+ sscanf(cptr, "%x %c rodata_end", rodata_end, &c);
+ count |= RDEND_BIT;
+ }
+
+ if (error < (int)read_size) {
+ /*
+ * since we reset file pos back to earlier pos by
+ * GO_BACK_FILE_POS_NUM_BYTES bytes we won't reach EOF.
+ * The reason for this is if string is spreaded across
+ * bytes, the read function should not miss it.
+ * So if ret value is less than read_size, reached EOF don't read further
+ */
+ break;
+ }
+ memset(raw_fmts, 0, read_size);
+ /*
+ * go back to predefined NUM of bytes so that we won't miss
+ * the string and addr even if it comes as splited in next read.
+ */
+ dhd_os_seek_file(file, -GO_BACK_FILE_POS_NUM_BYTES);
+ }
+
+fail:
+ if (raw_fmts) {
+ MFREE(osh, raw_fmts, read_size + 1);
+ raw_fmts = NULL;
+ }
+ if (count == ALL_MAP_VAL) {
+ return BCME_OK;
+ }
+ else {
+ DHD_ERROR(("%s: readmap error 0X%x \n", __FUNCTION__,
+ count));
+ return BCME_ERROR;
+ }
+
+} /* dhd_parse_map_file */
+
+#ifdef PCIE_FULL_DONGLE
+int
+dhd_event_logtrace_infobuf_pkt_process(dhd_pub_t *dhdp, void *pktbuf,
+ dhd_event_log_t *event_data)
+{
+ uint32 infobuf_version;
+ info_buf_payload_hdr_t *payload_hdr_ptr;
+ uint16 payload_hdr_type;
+ uint16 payload_hdr_length;
+
+ DHD_TRACE(("%s:Enter\n", __FUNCTION__));
+
+ if (PKTLEN(dhdp->osh, pktbuf) < sizeof(uint32)) {
+ DHD_ERROR(("%s: infobuf too small for version field\n",
+ __FUNCTION__));
+ goto exit;
+ }
+ infobuf_version = *((uint32 *)PKTDATA(dhdp->osh, pktbuf));
+ PKTPULL(dhdp->osh, pktbuf, sizeof(uint32));
+ if (infobuf_version != PCIE_INFOBUF_V1) {
+ DHD_ERROR(("%s: infobuf version %d is not PCIE_INFOBUF_V1\n",
+ __FUNCTION__, infobuf_version));
+ goto exit;
+ }
+
+ /* Version 1 infobuf has a single type/length (and then value) field */
+ if (PKTLEN(dhdp->osh, pktbuf) < sizeof(info_buf_payload_hdr_t)) {
+ DHD_ERROR(("%s: infobuf too small for v1 type/length fields\n",
+ __FUNCTION__));
+ goto exit;
+ }
+ /* Process/parse the common info payload header (type/length) */
+ payload_hdr_ptr = (info_buf_payload_hdr_t *)PKTDATA(dhdp->osh, pktbuf);
+ payload_hdr_type = ltoh16(payload_hdr_ptr->type);
+ payload_hdr_length = ltoh16(payload_hdr_ptr->length);
+ if (payload_hdr_type != PCIE_INFOBUF_V1_TYPE_LOGTRACE) {
+ DHD_ERROR(("%s: payload_hdr_type %d is not V1_TYPE_LOGTRACE\n",
+ __FUNCTION__, payload_hdr_type));
+ goto exit;
+ }
+ PKTPULL(dhdp->osh, pktbuf, sizeof(info_buf_payload_hdr_t));
+
+ /* Validate that the specified length isn't bigger than the
+ * provided data.
+ */
+ if (payload_hdr_length > PKTLEN(dhdp->osh, pktbuf)) {
+ DHD_ERROR(("%s: infobuf logtrace length is bigger"
+ " than actual buffer data\n", __FUNCTION__));
+ goto exit;
+ }
+ dhd_dbg_trace_evnt_handler(dhdp, PKTDATA(dhdp->osh, pktbuf),
+ event_data, payload_hdr_length);
+
+ return BCME_OK;
+
+exit:
+ return BCME_ERROR;
+} /* dhd_event_logtrace_infobuf_pkt_process */
+#endif /* PCIE_FULL_DONGLE */
+#endif /* SHOW_LOGTRACE */
+
+#if defined(WLTDLS) && defined(PCIE_FULL_DONGLE)
+
+/* To handle the TDLS event in the dhd_common.c
+ */
+int dhd_tdls_event_handler(dhd_pub_t *dhd_pub, wl_event_msg_t *event)
+{
+ int ret = BCME_OK;
+#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif // endif
+ ret = dhd_tdls_update_peer_info(dhd_pub, event);
+#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif // endif
+ return ret;
+}
+
+int dhd_free_tdls_peer_list(dhd_pub_t *dhd_pub)
+{
+ tdls_peer_node_t *cur = NULL, *prev = NULL;
+ if (!dhd_pub)
+ return BCME_ERROR;
+ cur = dhd_pub->peer_tbl.node;
+
+ if ((dhd_pub->peer_tbl.node == NULL) && !dhd_pub->peer_tbl.tdls_peer_count)
+ return BCME_ERROR;
+
+ while (cur != NULL) {
+ prev = cur;
+ cur = cur->next;
+ MFREE(dhd_pub->osh, prev, sizeof(tdls_peer_node_t));
+ }
+ dhd_pub->peer_tbl.tdls_peer_count = 0;
+ dhd_pub->peer_tbl.node = NULL;
+ return BCME_OK;
+}
+#endif /* #if defined(WLTDLS) && defined(PCIE_FULL_DONGLE) */
+
+/* pretty hex print a contiguous buffer
+* based on the debug level specified
+*/
+void
+dhd_prhex(const char *msg, volatile uchar *buf, uint nbytes, uint8 dbg_level)
+{
+ char line[128], *p;
+ int len = sizeof(line);
+ int nchar;
+ uint i;
+
+ if (msg && (msg[0] != '\0')) {
+ if (dbg_level == DHD_ERROR_VAL)
+ DHD_ERROR(("%s:\n", msg));
+ else if (dbg_level == DHD_INFO_VAL)
+ DHD_INFO(("%s:\n", msg));
+ else if (dbg_level == DHD_TRACE_VAL)
+ DHD_TRACE(("%s:\n", msg));
+ }
+
+ p = line;
+ for (i = 0; i < nbytes; i++) {
+ if (i % 16 == 0) {
+ nchar = snprintf(p, len, " %04x: ", i); /* line prefix */
+ p += nchar;
+ len -= nchar;
+ }
+ if (len > 0) {
+ nchar = snprintf(p, len, "%02x ", buf[i]);
+ p += nchar;
+ len -= nchar;
+ }
+
+ if (i % 16 == 15) {
+ /* flush line */
+ if (dbg_level == DHD_ERROR_VAL)
+ DHD_ERROR(("%s:\n", line));
+ else if (dbg_level == DHD_INFO_VAL)
+ DHD_INFO(("%s:\n", line));
+ else if (dbg_level == DHD_TRACE_VAL)
+ DHD_TRACE(("%s:\n", line));
+ p = line;
+ len = sizeof(line);
+ }
+ }
+
+ /* flush last partial line */
+ if (p != line) {
+ if (dbg_level == DHD_ERROR_VAL)
+ DHD_ERROR(("%s:\n", line));
+ else if (dbg_level == DHD_INFO_VAL)
+ DHD_INFO(("%s:\n", line));
+ else if (dbg_level == DHD_TRACE_VAL)
+ DHD_TRACE(("%s:\n", line));
+ }
+}
+
+#ifndef OEM_ANDROID
+int
+dhd_tput_test(dhd_pub_t *dhd, tput_test_t *tput_data)
+{
+ struct ether_header ether_hdr;
+ tput_pkt_t tput_pkt;
+ void *pkt = NULL;
+ uint8 *pktdata = NULL;
+ uint32 pktsize = 0;
+ uint64 total_size = 0;
+ uint32 *crc = 0;
+ uint32 pktid = 0;
+ uint32 total_num_tx_pkts = 0;
+ int err = 0, err_exit = 0;
+ uint32 i = 0;
+ uint64 time_taken = 0;
+ int max_txbufs = 0;
+ uint32 n_batches = 0;
+ uint32 n_remain = 0;
+ uint8 tput_pkt_hdr_size = 0;
+ bool batch_cnt = FALSE;
+ bool tx_stop_pkt = FALSE;
+
+ if (tput_data->version != TPUT_TEST_T_VER ||
+ tput_data->length != TPUT_TEST_T_LEN) {
+ DHD_ERROR(("%s: wrong structure ver/len! \n", __FUNCTION__));
+ err_exit = BCME_BADARG;
+ goto exit_error;
+ }
+
+ if (dhd->tput_data.tput_test_running) {
+ DHD_ERROR(("%s: tput test already running ! \n", __FUNCTION__));
+ err_exit = BCME_BUSY;
+ goto exit_error;
+ }
+#ifdef PCIE_FULL_DONGLE
+ /*
+ * 100 bytes to accommodate ether header and tput header. As of today
+ * both occupy 30 bytes. Rest is reserved.
+ */
+ if ((tput_data->payload_size > TPUT_TEST_MAX_PAYLOAD) ||
+ (tput_data->payload_size > (DHD_FLOWRING_RX_BUFPOST_PKTSZ - 100))) {
+ DHD_ERROR(("%s: payload size is too large! max_payload=%u rx_bufpost_size=%u\n",
+ __FUNCTION__, TPUT_TEST_MAX_PAYLOAD,
+ (DHD_FLOWRING_RX_BUFPOST_PKTSZ - 100)));
+ err_exit = BCME_BUFTOOLONG;
+ goto exit_error;
+ }
+#endif // endif
+ max_txbufs = dhd_get_max_txbufs(dhd);
+ max_txbufs = MIN(max_txbufs, DHD_TPUT_MAX_TX_PKTS_BATCH);
+
+ if (!(tput_data->num_pkts > 0)) {
+ DHD_ERROR(("%s: invalid num_pkts: %d to tx\n",
+ __FUNCTION__, tput_data->num_pkts));
+ err_exit = BCME_ERROR;
+ goto exit_error;
+ }
+
+ memset(&dhd->tput_data, 0, sizeof(dhd->tput_data));
+ memcpy(&dhd->tput_data, tput_data, sizeof(*tput_data));
+ dhd->tput_data.pkts_bad = dhd->tput_data.pkts_good = 0;
+ dhd->tput_data.pkts_cmpl = 0;
+ dhd->tput_start_ts = dhd->tput_stop_ts = 0;
+
+ if (tput_data->flags & TPUT_TEST_USE_ETHERNET_HDR) {
+ pktsize = sizeof(ether_hdr) + sizeof(tput_pkt_t) +
+ (tput_data->payload_size - 12);
+ } else {
+ pktsize = sizeof(tput_pkt_t) +
+ (tput_data->payload_size - 12);
+ }
+
+ tput_pkt_hdr_size = (uint8)((uint8 *)&tput_pkt.crc32 -
+ (uint8 *)&tput_pkt.mac_sta);
+
+ /* mark the tput test as started */
+ dhd->tput_data.tput_test_running = TRUE;
+
+ if (tput_data->direction == TPUT_DIR_TX) {
+ /* for ethernet header */
+ memcpy(ether_hdr.ether_shost, tput_data->mac_sta, ETHER_ADDR_LEN);
+ memcpy(ether_hdr.ether_dhost, tput_data->mac_ap, ETHER_ADDR_LEN);
+ ether_hdr.ether_type = hton16(ETHER_TYPE_IP);
+
+ /* fill in the tput pkt */
+ memset(&tput_pkt, 0, sizeof(tput_pkt));
+ memcpy(tput_pkt.mac_ap, tput_data->mac_ap, ETHER_ADDR_LEN);
+ memcpy(tput_pkt.mac_sta, tput_data->mac_sta, ETHER_ADDR_LEN);
+ tput_pkt.pkt_type = hton16(TPUT_PKT_TYPE_NORMAL);
+ tput_pkt.num_pkts = hton32(tput_data->num_pkts);
+
+ if (tput_data->num_pkts > (uint32)max_txbufs) {
+ n_batches = tput_data->num_pkts / max_txbufs;
+ n_remain = tput_data->num_pkts % max_txbufs;
+ } else {
+ n_batches = 0;
+ n_remain = tput_data->num_pkts;
+ }
+ DHD_ERROR(("%s: num_pkts: %u n_batches: %u n_remain: %u\n",
+ __FUNCTION__, tput_data->num_pkts, n_batches, n_remain));
+
+ do {
+ /* reset before every batch */
+ dhd->batch_tx_pkts_cmpl = 0;
+ if (n_batches) {
+ dhd->batch_tx_num_pkts = max_txbufs;
+ --n_batches;
+ } else if (n_remain) {
+ dhd->batch_tx_num_pkts = n_remain;
+ n_remain = 0;
+ } else {
+ DHD_ERROR(("Invalid. This should not hit\n"));
+ }
+
+ dhd->tput_start_ts = OSL_SYSUPTIME_US();
+ for (i = 0; (i < dhd->batch_tx_num_pkts) || (tx_stop_pkt); ++i) {
+ pkt = PKTGET(dhd->osh, pktsize, TRUE);
+ if (!pkt) {
+ dhd->tput_data.tput_test_running = FALSE;
+ DHD_ERROR(("%s: PKTGET fails ! Not enough Tx buffers\n",
+ __FUNCTION__));
+ DHD_ERROR(("%s: pkts_good:%u; pkts_bad:%u; pkts_cmpl:%u\n",
+ __FUNCTION__, dhd->tput_data.pkts_good,
+ dhd->tput_data.pkts_bad, dhd->tput_data.pkts_cmpl));
+ err_exit = BCME_NOMEM;
+ goto exit_error;
+ }
+ pktdata = PKTDATA(dhd->osh, pkt);
+ PKTSETLEN(dhd->osh, pkt, pktsize);
+ memset(pktdata, 0, pktsize);
+ if (tput_data->flags & TPUT_TEST_USE_ETHERNET_HDR) {
+ memcpy(pktdata, ðer_hdr, sizeof(ether_hdr));
+ pktdata += sizeof(ether_hdr);
+ }
+ /* send stop pkt as last pkt */
+ if (tx_stop_pkt) {
+ tput_pkt.pkt_type = hton16(TPUT_PKT_TYPE_STOP);
+ tx_stop_pkt = FALSE;
+ } else
+ tput_pkt.pkt_type = hton16(TPUT_PKT_TYPE_NORMAL);
+ tput_pkt.pkt_id = hton32(pktid++);
+ tput_pkt.crc32 = 0;
+ memcpy(pktdata, &tput_pkt, sizeof(tput_pkt));
+ /* compute crc32 over the pkt-id, num-pkts and data fields */
+ crc = (uint32 *)(pktdata + tput_pkt_hdr_size);
+ *crc = hton32(hndcrc32(pktdata + tput_pkt_hdr_size + 4,
+ 8 + (tput_data->payload_size - 12),
+ CRC32_INIT_VALUE));
+
+ err = dhd_sendpkt(dhd, 0, pkt);
+ if (err != BCME_OK) {
+ DHD_INFO(("%s: send pkt (id = %u) fails (err = %d) ! \n",
+ __FUNCTION__, pktid, err));
+ dhd->tput_data.pkts_bad++;
+ }
+ total_num_tx_pkts++;
+ if ((total_num_tx_pkts == tput_data->num_pkts) && (!tx_stop_pkt)) {
+ tx_stop_pkt = TRUE;
+ }
+ }
+ DHD_INFO(("%s: TX done, wait for completion...\n", __FUNCTION__));
+ if (!dhd_os_tput_test_wait(dhd, NULL,
+ TPUT_TEST_WAIT_TIMEOUT_DEFAULT)) {
+ dhd->tput_stop_ts = OSL_SYSUPTIME_US();
+ dhd->tput_data.tput_test_running = FALSE;
+ DHD_ERROR(("%s: TX completion timeout !"
+ " Total Tx pkts (including STOP) = %u; pkts cmpl = %u; \n",
+ __FUNCTION__, total_num_tx_pkts, dhd->batch_tx_pkts_cmpl));
+ err_exit = BCME_ERROR;
+ goto exit_error;
+ }
+ if (dhd->tput_start_ts && dhd->tput_stop_ts &&
+ (dhd->tput_stop_ts > dhd->tput_start_ts)) {
+ time_taken += dhd->tput_stop_ts - dhd->tput_start_ts;
+ } else {
+ dhd->tput_data.tput_test_running = FALSE;
+ DHD_ERROR(("%s: bad timestamp while cal tx batch time\n",
+ __FUNCTION__));
+ err_exit = BCME_ERROR;
+ goto exit_error;
+ }
+ if (n_batches || n_remain) {
+ batch_cnt = TRUE;
+ } else {
+ batch_cnt = FALSE;
+ }
+ } while (batch_cnt);
+ } else {
+ /* TPUT_DIR_RX */
+ DHD_INFO(("%s: waiting for RX completion... \n", __FUNCTION__));
+ if (!dhd_os_tput_test_wait(dhd, NULL, tput_data->timeout_ms)) {
+ DHD_ERROR(("%s: RX completion timeout ! \n", __FUNCTION__));
+ dhd->tput_stop_ts = OSL_SYSUPTIME_US();
+ }
+ }
+
+ /* calculate the throughput in bits per sec */
+ if ((dhd->tput_start_ts && dhd->tput_stop_ts &&
+ (dhd->tput_stop_ts > dhd->tput_start_ts)) || (time_taken)) {
+ if (!time_taken) {
+ time_taken = dhd->tput_stop_ts - dhd->tput_start_ts;
+ }
+ time_taken = DIV_U64_BY_U32(time_taken, MSEC_PER_SEC); /* convert to ms */
+ dhd->tput_data.time_ms = time_taken;
+ if (time_taken) {
+ total_size = (pktsize * dhd->tput_data.pkts_cmpl * 8);
+ dhd->tput_data.tput_bps = DIV_U64_BY_U64(total_size, time_taken);
+ /* convert from ms to seconds */
+ dhd->tput_data.tput_bps = dhd->tput_data.tput_bps * MSEC_PER_SEC;
+ }
+ } else {
+ DHD_ERROR(("%s: bad timestamp !\n", __FUNCTION__));
+ }
+ DHD_INFO(("%s: DONE. tput = %llu bps, time = %llu ms\n", __FUNCTION__,
+ dhd->tput_data.tput_bps, dhd->tput_data.time_ms));
+ memcpy(tput_data, &dhd->tput_data, sizeof(dhd->tput_data));
+
+ dhd->tput_data.tput_test_running = FALSE;
+
+ err_exit = BCME_OK;
+
+exit_error:
+ DHD_ERROR(("%s: pkts_good = %u; pkts_bad = %u; pkts_cmpl = %u\n",
+ __FUNCTION__, dhd->tput_data.pkts_good,
+ dhd->tput_data.pkts_bad, dhd->tput_data.pkts_cmpl));
+
+ return err_exit;
+}
+
+void
+dhd_tput_test_rx(dhd_pub_t *dhd, void *pkt)
+{
+ uint8 *pktdata = NULL;
+ tput_pkt_t *tput_pkt = NULL;
+ uint32 crc = 0;
+ uint8 tput_pkt_hdr_size = 0;
+
+ pktdata = PKTDATA(dhd->osh, pkt);
+ if (dhd->tput_data.flags & TPUT_TEST_USE_ETHERNET_HDR)
+ pktdata += sizeof(struct ether_header);
+ tput_pkt = (tput_pkt_t *)pktdata;
+
+ /* record the timestamp of the first packet received */
+ if (dhd->tput_data.pkts_cmpl == 0) {
+ dhd->tput_start_ts = OSL_SYSUPTIME_US();
+ }
+
+ if (ntoh16(tput_pkt->pkt_type) != TPUT_PKT_TYPE_STOP &&
+ dhd->tput_data.pkts_cmpl <= dhd->tput_data.num_pkts) {
+ dhd->tput_data.pkts_cmpl++;
+ }
+ /* drop rx packets received beyond the specified # */
+ if (dhd->tput_data.pkts_cmpl > dhd->tput_data.num_pkts)
+ return;
+
+ DHD_TRACE(("%s: Rx tput test pkt, id = %u ; type = %u\n", __FUNCTION__,
+ ntoh32(tput_pkt->pkt_id), ntoh16(tput_pkt->pkt_type)));
+
+ /* discard if mac addr of AP/STA does not match the specified ones */
+ if ((memcmp(tput_pkt->mac_ap, dhd->tput_data.mac_ap,
+ ETHER_ADDR_LEN) != 0) ||
+ (memcmp(tput_pkt->mac_sta, dhd->tput_data.mac_sta,
+ ETHER_ADDR_LEN) != 0)) {
+ dhd->tput_data.pkts_bad++;
+ DHD_INFO(("%s: dropping tput pkt with id %u due to bad AP/STA mac !\n",
+ __FUNCTION__, ntoh32(tput_pkt->pkt_id)));
+ return;
+ }
+
+ tput_pkt_hdr_size = (uint8)((uint8 *)&tput_pkt->crc32 -
+ (uint8 *)&tput_pkt->mac_sta);
+ pktdata += tput_pkt_hdr_size + 4;
+ crc = hndcrc32(pktdata, 8 + (dhd->tput_data.payload_size - 12),
+ CRC32_INIT_VALUE);
+ if (crc != ntoh32(tput_pkt->crc32)) {
+ DHD_INFO(("%s: dropping tput pkt with id %u due to bad CRC !\n",
+ __FUNCTION__, ntoh32(tput_pkt->pkt_id)));
+ dhd->tput_data.pkts_bad++;
+ return;
+ }
+
+ if (ntoh16(tput_pkt->pkt_type) != TPUT_PKT_TYPE_STOP)
+ dhd->tput_data.pkts_good++;
+
+ /* if we have received the stop packet or all the # of pkts, we're done */
+ if (ntoh16(tput_pkt->pkt_type) == TPUT_PKT_TYPE_STOP ||
+ dhd->tput_data.pkts_cmpl == dhd->tput_data.num_pkts) {
+ dhd->tput_stop_ts = OSL_SYSUPTIME_US();
+ dhd_os_tput_test_wake(dhd);
+ }
+}
+#endif /* OEM_ANDROID */
+
+#ifdef DUMP_IOCTL_IOV_LIST
+void
+dhd_iov_li_append(dhd_pub_t *dhd, dll_t *list_head, dll_t *node)
+{
+ dll_t *item;
+ dhd_iov_li_t *iov_li;
+ dhd->dump_iovlist_len++;
+
+ if (dhd->dump_iovlist_len == IOV_LIST_MAX_LEN+1) {
+ item = dll_head_p(list_head);
+ iov_li = (dhd_iov_li_t *)CONTAINEROF(item, dhd_iov_li_t, list);
+ dll_delete(item);
+ MFREE(dhd->osh, iov_li, sizeof(*iov_li));
+ dhd->dump_iovlist_len--;
+ }
+ dll_append(list_head, node);
+}
+
+void
+dhd_iov_li_print(dll_t *list_head)
+{
+ dhd_iov_li_t *iov_li;
+ dll_t *item, *next;
+ uint8 index = 0;
+ for (item = dll_head_p(list_head); !dll_end(list_head, item); item = next) {
+ next = dll_next_p(item);
+ iov_li = (dhd_iov_li_t *)CONTAINEROF(item, dhd_iov_li_t, list);
+ DHD_ERROR(("%d:cmd_name = %s, cmd = %d.\n", ++index, iov_li->buff, iov_li->cmd));
+ }
+}
+
+void
+dhd_iov_li_delete(dhd_pub_t *dhd, dll_t *list_head)
+{
+ dll_t *item;
+ dhd_iov_li_t *iov_li;
+ while (!(dll_empty(list_head))) {
+ item = dll_head_p(list_head);
+ iov_li = (dhd_iov_li_t *)CONTAINEROF(item, dhd_iov_li_t, list);
+ dll_delete(item);
+ MFREE(dhd->osh, iov_li, sizeof(*iov_li));
+ }
+}
+#endif /* DUMP_IOCTL_IOV_LIST */
+
+/* configuations of ecounters to be enabled by default in FW */
+static ecounters_cfg_t ecounters_cfg_tbl[] = {
+ /* Global ecounters */
+ {ECOUNTERS_STATS_TYPES_FLAG_GLOBAL, 0x0, WL_IFSTATS_XTLV_BUS_PCIE},
+ // {ECOUNTERS_STATS_TYPES_FLAG_GLOBAL, 0x0, WL_IFSTATS_XTLV_TX_AMPDU_STATS},
+ // {ECOUNTERS_STATS_TYPES_FLAG_GLOBAL, 0x0, WL_IFSTATS_XTLV_RX_AMPDU_STATS},
+
+ /* Slice specific ecounters */
+ {ECOUNTERS_STATS_TYPES_FLAG_SLICE, 0x0, WL_SLICESTATS_XTLV_PERIODIC_STATE},
+ {ECOUNTERS_STATS_TYPES_FLAG_SLICE, 0x1, WL_SLICESTATS_XTLV_PERIODIC_STATE},
+ {ECOUNTERS_STATS_TYPES_FLAG_SLICE, 0x1, WL_IFSTATS_XTLV_WL_SLICE_BTCOEX},
+
+ /* Interface specific ecounters */
+ {ECOUNTERS_STATS_TYPES_FLAG_IFACE, 0x0, WL_IFSTATS_XTLV_IF_PERIODIC_STATE},
+ {ECOUNTERS_STATS_TYPES_FLAG_IFACE, 0x0, WL_IFSTATS_XTLV_GENERIC},
+ {ECOUNTERS_STATS_TYPES_FLAG_IFACE, 0x0, WL_IFSTATS_XTLV_INFRA_SPECIFIC},
+ {ECOUNTERS_STATS_TYPES_FLAG_IFACE, 0x0, WL_IFSTATS_XTLV_MGT_CNT},
+
+ /* secondary interface */
+};
+
+static event_ecounters_cfg_t event_ecounters_cfg_tbl[] = {
+ /* Interface specific event ecounters */
+ {WLC_E_DEAUTH_IND, ECOUNTERS_STATS_TYPES_FLAG_IFACE, 0x0, WL_IFSTATS_XTLV_IF_EVENT_STATS},
+};
+
+/* Accepts an argument to -s, -g or -f and creates an XTLV */
+int
+dhd_create_ecounters_params(dhd_pub_t *dhd, uint16 type, uint16 if_slice_idx,
+ uint16 stats_rep, uint8 **xtlv)
+{
+ uint8 *req_xtlv = NULL;
+ ecounters_stats_types_report_req_t *req;
+ bcm_xtlvbuf_t xtlvbuf, container_xtlvbuf;
+ ecountersv2_xtlv_list_elt_t temp;
+ uint16 xtlv_len = 0, total_len = 0;
+ int rc = BCME_OK;
+
+ /* fill in the stat type XTLV. For now there is no explicit TLV for the stat type. */
+ temp.id = stats_rep;
+ temp.len = 0;
+
+ /* Hence len/data = 0/NULL */
+ xtlv_len += temp.len + BCM_XTLV_HDR_SIZE;
+
+ /* Total length of the container */
+ total_len = BCM_XTLV_HDR_SIZE +
+ OFFSETOF(ecounters_stats_types_report_req_t, stats_types_req) + xtlv_len;
+
+ /* Now allocate a structure for the entire request */
+ if ((req_xtlv = (uint8 *)MALLOCZ(dhd->osh, total_len)) == NULL) {
+ rc = BCME_NOMEM;
+ goto fail;
+ }
+
+ /* container XTLV context */
+ bcm_xtlv_buf_init(&container_xtlvbuf, (uint8 *)req_xtlv, total_len,
+ BCM_XTLV_OPTION_ALIGN32);
+
+ /* Fill other XTLVs in the container. Leave space for XTLV headers */
+ req = (ecounters_stats_types_report_req_t *)(req_xtlv + BCM_XTLV_HDR_SIZE);
+ req->flags = type;
+ if (type == ECOUNTERS_STATS_TYPES_FLAG_SLICE) {
+ req->slice_mask = 0x1 << if_slice_idx;
+ } else if (type == ECOUNTERS_STATS_TYPES_FLAG_IFACE) {
+ req->if_index = if_slice_idx;
+ }
+
+ /* Fill remaining XTLVs */
+ bcm_xtlv_buf_init(&xtlvbuf, (uint8*) req->stats_types_req, xtlv_len,
+ BCM_XTLV_OPTION_ALIGN32);
+ if (bcm_xtlv_put_data(&xtlvbuf, temp.id, NULL, temp.len)) {
+ DHD_ERROR(("Error creating XTLV for requested stats type = %d\n", temp.id));
+ rc = BCME_ERROR;
+ goto fail;
+ }
+
+ /* fill the top level container and get done with the XTLV container */
+ rc = bcm_xtlv_put_data(&container_xtlvbuf, WL_ECOUNTERS_XTLV_REPORT_REQ, NULL,
+ bcm_xtlv_buf_len(&xtlvbuf) + OFFSETOF(ecounters_stats_types_report_req_t,
+ stats_types_req));
+
+ if (rc) {
+ DHD_ERROR(("Error creating parent XTLV for type = %d\n", req->flags));
+ goto fail;
+ }
+
+fail:
+ if (rc && req_xtlv) {
+ MFREE(dhd->osh, req_xtlv, total_len);
+ req_xtlv = NULL;
+ }
+
+ /* update the xtlv pointer */
+ *xtlv = req_xtlv;
+ return rc;
+}
+
+int
+dhd_get_preserve_log_numbers(dhd_pub_t *dhd, uint32 *logset_mask)
+{
+ wl_el_set_type_t logset_type, logset_op;
+ int ret = BCME_ERROR;
+ int i = 0, err = 0;
+
+ if (!dhd || !logset_mask)
+ return BCME_BADARG;
+
+ *logset_mask = 0;
+ memset(&logset_type, 0, sizeof(logset_type));
+ memset(&logset_op, 0, sizeof(logset_op));
+ logset_type.version = htod16(EVENT_LOG_SET_TYPE_CURRENT_VERSION);
+ logset_type.len = htod16(sizeof(wl_el_set_type_t));
+ for (i = 0; i < dhd->event_log_max_sets; i++) {
+ logset_type.set = i;
+ err = dhd_iovar(dhd, 0, "event_log_set_type", (char *)&logset_type,
+ sizeof(logset_type), (char *)&logset_op, sizeof(logset_op), FALSE);
+ /* the iovar may return 'unsupported' error if a log set number is not present
+ * in the fw, so we should not return on error !
+ */
+ if (err == BCME_OK &&
+ logset_op.type == EVENT_LOG_SET_TYPE_PRSRV) {
+ *logset_mask |= 0x01u << i;
+ ret = BCME_OK;
+ DHD_ERROR(("[INIT] logset:%d is preserve/chatty\n", i));
+ }
+ }
+
+ return ret;
+}
+
+static int
+dhd_ecounter_autoconfig(dhd_pub_t *dhd)
+{
+ int rc = BCME_OK;
+ uint32 buf;
+ rc = dhd_iovar(dhd, 0, "ecounters_autoconfig", NULL, 0, (char *)&buf, sizeof(buf), FALSE);
+
+ if (rc != BCME_OK) {
+
+ if (rc != BCME_UNSUPPORTED) {
+ rc = BCME_OK;
+ DHD_ERROR(("%s Ecounter autoconfig in fw failed : %d\n", __FUNCTION__, rc));
+ } else {
+ DHD_ERROR(("%s Ecounter autoconfig in FW not supported\n", __FUNCTION__));
+ }
+ }
+
+ return rc;
+}
+
+int
+dhd_ecounter_configure(dhd_pub_t *dhd, bool enable)
+{
+ int rc = BCME_OK;
+ if (enable) {
+ if (dhd_ecounter_autoconfig(dhd) != BCME_OK) {
+ if ((rc = dhd_start_ecounters(dhd)) != BCME_OK) {
+ DHD_ERROR(("%s Ecounters start failed\n", __FUNCTION__));
+ } else if ((rc = dhd_start_event_ecounters(dhd)) != BCME_OK) {
+ DHD_ERROR(("%s Event_Ecounters start failed\n", __FUNCTION__));
+ }
+ }
+ } else {
+ if ((rc = dhd_stop_ecounters(dhd)) != BCME_OK) {
+ DHD_ERROR(("%s Ecounters stop failed\n", __FUNCTION__));
+ } else if ((rc = dhd_stop_event_ecounters(dhd)) != BCME_OK) {
+ DHD_ERROR(("%s Event_Ecounters stop failed\n", __FUNCTION__));
+ }
+ }
+ return rc;
+}
+
+int
+dhd_start_ecounters(dhd_pub_t *dhd)
+{
+ uint8 i = 0;
+ uint8 *start_ptr;
+ int rc = BCME_OK;
+ bcm_xtlv_t *elt;
+ ecounters_config_request_v2_t *req = NULL;
+ ecountersv2_processed_xtlv_list_elt *list_elt, *tail = NULL;
+ ecountersv2_processed_xtlv_list_elt *processed_containers_list = NULL;
+ uint16 total_processed_containers_len = 0;
+
+ for (i = 0; i < ARRAYSIZE(ecounters_cfg_tbl); i++) {
+ ecounters_cfg_t *ecounter_stat = &ecounters_cfg_tbl[i];
+
+ if ((list_elt = (ecountersv2_processed_xtlv_list_elt *)
+ MALLOCZ(dhd->osh, sizeof(*list_elt))) == NULL) {
+ DHD_ERROR(("Ecounters v2: No memory to process\n"));
+ goto fail;
+ }
+
+ rc = dhd_create_ecounters_params(dhd, ecounter_stat->type,
+ ecounter_stat->if_slice_idx, ecounter_stat->stats_rep, &list_elt->data);
+
+ if (rc) {
+ DHD_ERROR(("Ecounters v2: Could not process: stat: %d return code: %d\n",
+ ecounter_stat->stats_rep, rc));
+
+ /* Free allocated memory and go to fail to release any memories allocated
+ * in previous iterations. Note that list_elt->data gets populated in
+ * dhd_create_ecounters_params() and gets freed there itself.
+ */
+ MFREE(dhd->osh, list_elt, sizeof(*list_elt));
+ list_elt = NULL;
+ goto fail;
+ }
+ elt = (bcm_xtlv_t *) list_elt->data;
+
+ /* Put the elements in the order they are processed */
+ if (processed_containers_list == NULL) {
+ processed_containers_list = list_elt;
+ } else {
+ tail->next = list_elt;
+ }
+ tail = list_elt;
+ /* Size of the XTLV returned */
+ total_processed_containers_len += BCM_XTLV_LEN(elt) + BCM_XTLV_HDR_SIZE;
+ }
+
+ /* Now create ecounters config request with totallength */
+ req = (ecounters_config_request_v2_t *)MALLOCZ(dhd->osh, sizeof(*req) +
+ total_processed_containers_len);
+
+ if (req == NULL) {
+ rc = BCME_NOMEM;
+ goto fail;
+ }
+
+ req->version = ECOUNTERS_VERSION_2;
+ req->logset = EVENT_LOG_SET_ECOUNTERS;
+ req->reporting_period = ECOUNTERS_DEFAULT_PERIOD;
+ req->num_reports = ECOUNTERS_NUM_REPORTS;
+ req->len = total_processed_containers_len +
+ OFFSETOF(ecounters_config_request_v2_t, ecounters_xtlvs);
+
+ /* Copy config */
+ start_ptr = req->ecounters_xtlvs;
+
+ /* Now go element by element in the list */
+ while (processed_containers_list) {
+ list_elt = processed_containers_list;
+
+ elt = (bcm_xtlv_t *)list_elt->data;
+
+ memcpy(start_ptr, list_elt->data, BCM_XTLV_LEN(elt) + BCM_XTLV_HDR_SIZE);
+ start_ptr += (size_t)(BCM_XTLV_LEN(elt) + BCM_XTLV_HDR_SIZE);
+ processed_containers_list = processed_containers_list->next;
+
+ /* Free allocated memories */
+ MFREE(dhd->osh, elt, elt->len + BCM_XTLV_HDR_SIZE);
+ MFREE(dhd->osh, list_elt, sizeof(*list_elt));
+ }
+
+ if ((rc = dhd_iovar(dhd, 0, "ecounters", (char *)req, req->len, NULL, 0, TRUE)) < 0) {
+ DHD_ERROR(("failed to start ecounters\n"));
+ }
+
+fail:
+ if (req) {
+ MFREE(dhd->osh, req, sizeof(*req) + total_processed_containers_len);
+ }
+
+ /* Now go element by element in the list */
+ while (processed_containers_list) {
+ list_elt = processed_containers_list;
+ elt = (bcm_xtlv_t *)list_elt->data;
+ processed_containers_list = processed_containers_list->next;
+
+ /* Free allocated memories */
+ MFREE(dhd->osh, elt, elt->len + BCM_XTLV_HDR_SIZE);
+ MFREE(dhd->osh, list_elt, sizeof(*list_elt));
+ }
+ return rc;
+}
+
+int
+dhd_stop_ecounters(dhd_pub_t *dhd)
+{
+ int rc = BCME_OK;
+ ecounters_config_request_v2_t *req;
+
+ /* Now create ecounters config request with totallength */
+ req = (ecounters_config_request_v2_t *)MALLOCZ(dhd->osh, sizeof(*req));
+
+ if (req == NULL) {
+ rc = BCME_NOMEM;
+ goto fail;
+ }
+
+ req->version = ECOUNTERS_VERSION_2;
+ req->len = OFFSETOF(ecounters_config_request_v2_t, ecounters_xtlvs);
+
+ if ((rc = dhd_iovar(dhd, 0, "ecounters", (char *)req, req->len, NULL, 0, TRUE)) < 0) {
+ DHD_ERROR(("failed to stop ecounters\n"));
+ }
+
+fail:
+ if (req) {
+ MFREE(dhd->osh, req, sizeof(*req));
+ }
+ return rc;
+}
+
+/* configured event_id_array for event ecounters */
+typedef struct event_id_array {
+ uint8 event_id;
+ uint8 str_idx;
+} event_id_array_t;
+
+/* get event id array only from event_ecounters_cfg_tbl[] */
+static inline int __dhd_event_ecounters_get_event_id_array(event_id_array_t *event_array)
+{
+ uint8 i;
+ uint8 idx = 0;
+ int32 prev_evt_id = -1;
+
+ for (i = 0; i < (uint8)ARRAYSIZE(event_ecounters_cfg_tbl); i++) {
+ if (prev_evt_id != event_ecounters_cfg_tbl[i].event_id) {
+ if (prev_evt_id >= 0)
+ idx++;
+ event_array[idx].event_id = event_ecounters_cfg_tbl[i].event_id;
+ event_array[idx].str_idx = i;
+ }
+ prev_evt_id = event_ecounters_cfg_tbl[i].event_id;
+ }
+ return idx;
+}
+
+/* One event id has limit xtlv num to request based on wl_ifstats_xtlv_id * 2 interface */
+#define ECNTRS_MAX_XTLV_NUM (31 * 2)
+
+int
+dhd_start_event_ecounters(dhd_pub_t *dhd)
+{
+ uint8 i, j = 0;
+ uint8 event_id_cnt = 0;
+ uint16 processed_containers_len = 0;
+ uint16 max_xtlv_len = 0;
+ int rc = BCME_OK;
+ uint8 *ptr;
+ uint8 *data;
+ event_id_array_t *id_array;
+ bcm_xtlv_t *elt = NULL;
+ event_ecounters_config_request_v2_t *req = NULL;
+
+ id_array = (event_id_array_t *)MALLOCZ(dhd->osh, sizeof(event_id_array_t) *
+ ARRAYSIZE(event_ecounters_cfg_tbl));
+
+ if (id_array == NULL) {
+ rc = BCME_NOMEM;
+ goto fail;
+ }
+ event_id_cnt = __dhd_event_ecounters_get_event_id_array(id_array);
+
+ max_xtlv_len = ((BCM_XTLV_HDR_SIZE +
+ OFFSETOF(event_ecounters_config_request_v2_t, ecounters_xtlvs)) *
+ ECNTRS_MAX_XTLV_NUM);
+
+ /* Now create ecounters config request with max allowed length */
+ req = (event_ecounters_config_request_v2_t *)MALLOCZ(dhd->osh,
+ sizeof(event_ecounters_config_request_v2_t *) + max_xtlv_len);
+
+ if (req == NULL) {
+ rc = BCME_NOMEM;
+ goto fail;
+ }
+
+ for (i = 0; i <= event_id_cnt; i++) {
+ /* req initialization by event id */
+ req->version = ECOUNTERS_VERSION_2;
+ req->logset = EVENT_LOG_SET_ECOUNTERS;
+ req->event_id = id_array[i].event_id;
+ req->flags = EVENT_ECOUNTERS_FLAGS_ADD;
+ req->len = 0;
+ processed_containers_len = 0;
+
+ /* Copy config */
+ ptr = req->ecounters_xtlvs;
+
+ for (j = id_array[i].str_idx; j < (uint8)ARRAYSIZE(event_ecounters_cfg_tbl); j++) {
+ event_ecounters_cfg_t *event_ecounter_stat = &event_ecounters_cfg_tbl[j];
+ if (id_array[i].event_id != event_ecounter_stat->event_id)
+ break;
+
+ rc = dhd_create_ecounters_params(dhd, event_ecounter_stat->type,
+ event_ecounter_stat->if_slice_idx, event_ecounter_stat->stats_rep,
+ &data);
+
+ if (rc) {
+ DHD_ERROR(("%s: Could not process: stat: %d return code: %d\n",
+ __FUNCTION__, event_ecounter_stat->stats_rep, rc));
+ goto fail;
+ }
+
+ elt = (bcm_xtlv_t *)data;
+
+ memcpy(ptr, elt, BCM_XTLV_LEN(elt) + BCM_XTLV_HDR_SIZE);
+ ptr += (size_t)(BCM_XTLV_LEN(elt) + BCM_XTLV_HDR_SIZE);
+ processed_containers_len += BCM_XTLV_LEN(elt) + BCM_XTLV_HDR_SIZE;
+
+ /* Free allocated memories alloced by dhd_create_ecounters_params */
+ MFREE(dhd->osh, elt, elt->len + BCM_XTLV_HDR_SIZE);
+
+ if (processed_containers_len > max_xtlv_len) {
+ DHD_ERROR(("%s XTLV NUM IS OVERFLOWED THAN ALLOWED!!\n",
+ __FUNCTION__));
+ rc = BCME_BADLEN;
+ goto fail;
+ }
+ }
+
+ req->len = processed_containers_len +
+ OFFSETOF(event_ecounters_config_request_v2_t, ecounters_xtlvs);
+
+ DHD_INFO(("%s req version %d logset %d event_id %d flags %d len %d\n",
+ __FUNCTION__, req->version, req->logset, req->event_id,
+ req->flags, req->len));
+
+ rc = dhd_iovar(dhd, 0, "event_ecounters", (char *)req, req->len, NULL, 0, TRUE);
+
+ if (rc < 0) {
+ DHD_ERROR(("failed to start event_ecounters(event id %d) with rc %d\n",
+ req->event_id, rc));
+ goto fail;
+ }
+ }
+
+fail:
+ /* Free allocated memories */
+ if (req) {
+ MFREE(dhd->osh, req, sizeof(event_ecounters_config_request_v2_t *) + max_xtlv_len);
+ }
+ if (id_array) {
+ MFREE(dhd->osh, id_array, sizeof(event_id_array_t) *
+ ARRAYSIZE(event_ecounters_cfg_tbl));
+ }
+
+ return rc;
+}
+
+int
+dhd_stop_event_ecounters(dhd_pub_t *dhd)
+{
+ int rc = BCME_OK;
+ event_ecounters_config_request_v2_t *req;
+
+ /* Now create ecounters config request with totallength */
+ req = (event_ecounters_config_request_v2_t *)MALLOCZ(dhd->osh, sizeof(*req));
+
+ if (req == NULL) {
+ rc = BCME_NOMEM;
+ goto fail;
+ }
+
+ req->version = ECOUNTERS_VERSION_2;
+ req->flags = EVENT_ECOUNTERS_FLAGS_DEL_ALL;
+ req->len = OFFSETOF(event_ecounters_config_request_v2_t, ecounters_xtlvs);
+
+ if ((rc = dhd_iovar(dhd, 0, "event_ecounters", (char *)req, req->len, NULL, 0, TRUE)) < 0) {
+ DHD_ERROR(("failed to stop event_ecounters\n"));
+ }
+
+fail:
+ if (req) {
+ MFREE(dhd->osh, req, sizeof(*req));
+ }
+ return rc;
+}
+
+#ifdef DHD_LOG_DUMP
+int
+dhd_dump_debug_ring(dhd_pub_t *dhdp, void *ring_ptr, const void *user_buf,
+ log_dump_section_hdr_t *sec_hdr,
+ char *text_hdr, int buflen, uint32 sec_type)
+{
+ uint32 rlen = 0;
+ uint32 data_len = 0;
+ void *data = NULL;
+ unsigned long flags = 0;
+ int ret = 0;
+ dhd_dbg_ring_t *ring = (dhd_dbg_ring_t *)ring_ptr;
+ int pos = 0;
+ int fpos_sechdr = 0;
+
+ if (!dhdp || !ring || !user_buf || !sec_hdr || !text_hdr) {
+ return BCME_BADARG;
+ }
+ /* do not allow further writes to the ring
+ * till we flush it
+ */
+ DHD_DBG_RING_LOCK(ring->lock, flags);
+ ring->state = RING_SUSPEND;
+ DHD_DBG_RING_UNLOCK(ring->lock, flags);
+
+ if (dhdp->concise_dbg_buf) {
+ /* re-use concise debug buffer temporarily
+ * to pull ring data, to write
+ * record by record to file
+ */
+ data_len = CONCISE_DUMP_BUFLEN;
+ data = dhdp->concise_dbg_buf;
+ ret = dhd_export_debug_data(text_hdr, NULL, user_buf, strlen(text_hdr), &pos);
+ /* write the section header now with zero length,
+ * once the correct length is found out, update
+ * it later
+ */
+ fpos_sechdr = pos;
+ sec_hdr->type = sec_type;
+ sec_hdr->length = 0;
+ ret = dhd_export_debug_data((char *)sec_hdr, NULL, user_buf,
+ sizeof(*sec_hdr), &pos);
+ do {
+ rlen = dhd_dbg_ring_pull_single(ring, data, data_len, TRUE);
+ if (rlen > 0) {
+ /* write the log */
+ ret = dhd_export_debug_data(data, NULL, user_buf, rlen, &pos);
+ }
+ DHD_DBGIF(("%s: rlen : %d\n", __FUNCTION__, rlen));
+ } while ((rlen > 0));
+ /* now update the section header length in the file */
+ /* Complete ring size is dumped by HAL, hence updating length to ring size */
+ sec_hdr->length = ring->ring_size;
+ ret = dhd_export_debug_data((char *)sec_hdr, NULL, user_buf,
+ sizeof(*sec_hdr), &fpos_sechdr);
+ } else {
+ DHD_ERROR(("%s: No concise buffer available !\n", __FUNCTION__));
+ }
+ DHD_DBG_RING_LOCK(ring->lock, flags);
+ ring->state = RING_ACTIVE;
+ /* Resetting both read and write pointer,
+ * since all items are read.
+ */
+ ring->rp = ring->wp = 0;
+ DHD_DBG_RING_UNLOCK(ring->lock, flags);
+
+ return ret;
+}
+
+int
+dhd_log_dump_ring_to_file(dhd_pub_t *dhdp, void *ring_ptr, void *file,
+ unsigned long *file_posn, log_dump_section_hdr_t *sec_hdr,
+ char *text_hdr, uint32 sec_type)
+{
+ uint32 rlen = 0;
+ uint32 data_len = 0, total_len = 0;
+ void *data = NULL;
+ unsigned long fpos_sechdr = 0;
+ unsigned long flags = 0;
+ int ret = 0;
+ dhd_dbg_ring_t *ring = (dhd_dbg_ring_t *)ring_ptr;
+
+ if (!dhdp || !ring || !file || !sec_hdr ||
+ !file_posn || !text_hdr)
+ return BCME_BADARG;
+
+ /* do not allow further writes to the ring
+ * till we flush it
+ */
+ DHD_DBG_RING_LOCK(ring->lock, flags);
+ ring->state = RING_SUSPEND;
+ DHD_DBG_RING_UNLOCK(ring->lock, flags);
+
+ if (dhdp->concise_dbg_buf) {
+ /* re-use concise debug buffer temporarily
+ * to pull ring data, to write
+ * record by record to file
+ */
+ data_len = CONCISE_DUMP_BUFLEN;
+ data = dhdp->concise_dbg_buf;
+ dhd_os_write_file_posn(file, file_posn, text_hdr,
+ strlen(text_hdr));
+ /* write the section header now with zero length,
+ * once the correct length is found out, update
+ * it later
+ */
+ dhd_init_sec_hdr(sec_hdr);
+ fpos_sechdr = *file_posn;
+ sec_hdr->type = sec_type;
+ sec_hdr->length = 0;
+ dhd_os_write_file_posn(file, file_posn, (char *)sec_hdr,
+ sizeof(*sec_hdr));
+ do {
+ rlen = dhd_dbg_ring_pull_single(ring, data, data_len, TRUE);
+ if (rlen > 0) {
+ /* write the log */
+ ret = dhd_os_write_file_posn(file, file_posn, data, rlen);
+ if (ret < 0) {
+ DHD_ERROR(("%s: write file error !\n", __FUNCTION__));
+ DHD_DBG_RING_LOCK(ring->lock, flags);
+ ring->state = RING_ACTIVE;
+ DHD_DBG_RING_UNLOCK(ring->lock, flags);
+ return BCME_ERROR;
+ }
+ }
+ total_len += rlen;
+ } while (rlen > 0);
+ /* now update the section header length in the file */
+ sec_hdr->length = total_len;
+ dhd_os_write_file_posn(file, &fpos_sechdr, (char *)sec_hdr, sizeof(*sec_hdr));
+ } else {
+ DHD_ERROR(("%s: No concise buffer available !\n", __FUNCTION__));
+ }
+
+ DHD_DBG_RING_LOCK(ring->lock, flags);
+ ring->state = RING_ACTIVE;
+ /* Resetting both read and write pointer,
+ * since all items are read.
+ */
+ ring->rp = ring->wp = 0;
+ DHD_DBG_RING_UNLOCK(ring->lock, flags);
+ return BCME_OK;
+}
+
+/* logdump cookie */
+#define MAX_LOGUDMP_COOKIE_CNT 10u
+#define LOGDUMP_COOKIE_STR_LEN 50u
+int
+dhd_logdump_cookie_init(dhd_pub_t *dhdp, uint8 *buf, uint32 buf_size)
+{
+ uint32 ring_size;
+
+ if (!dhdp || !buf) {
+ DHD_ERROR(("INVALID PTR: dhdp:%p buf:%p\n", dhdp, buf));
+ return BCME_ERROR;
+ }
+
+ ring_size = dhd_ring_get_hdr_size() + LOGDUMP_COOKIE_STR_LEN * MAX_LOGUDMP_COOKIE_CNT;
+ if (buf_size < ring_size) {
+ DHD_ERROR(("BUF SIZE IS TO SHORT: req:%d buf_size:%d\n",
+ ring_size, buf_size));
+ return BCME_ERROR;
+ }
+
+ dhdp->logdump_cookie = dhd_ring_init(dhdp, buf, buf_size,
+ LOGDUMP_COOKIE_STR_LEN, MAX_LOGUDMP_COOKIE_CNT,
+ DHD_RING_TYPE_FIXED);
+ if (!dhdp->logdump_cookie) {
+ DHD_ERROR(("FAIL TO INIT COOKIE RING\n"));
+ return BCME_ERROR;
+ }
+
+ return BCME_OK;
+}
+
+void
+dhd_logdump_cookie_deinit(dhd_pub_t *dhdp)
+{
+ if (!dhdp) {
+ return;
+ }
+ if (dhdp->logdump_cookie) {
+ dhd_ring_deinit(dhdp, dhdp->logdump_cookie);
+ }
+
+ return;
+}
+
+void
+dhd_logdump_cookie_save(dhd_pub_t *dhdp, char *cookie, char *type)
+{
+ char *ptr;
+
+ if (!dhdp || !cookie || !type || !dhdp->logdump_cookie) {
+ DHD_ERROR(("%s: At least one buffer ptr is NULL dhdp=%p cookie=%p"
+ " type = %p, cookie_cfg:%p\n", __FUNCTION__,
+ dhdp, cookie, type, dhdp?dhdp->logdump_cookie: NULL));
+ return;
+ }
+ ptr = (char *)dhd_ring_get_empty(dhdp->logdump_cookie);
+ if (ptr == NULL) {
+ DHD_ERROR(("%s : Skip to save due to locking\n", __FUNCTION__));
+ return;
+ }
+ scnprintf(ptr, LOGDUMP_COOKIE_STR_LEN, "%s: %s\n", type, cookie);
+ return;
+}
+
+int
+dhd_logdump_cookie_get(dhd_pub_t *dhdp, char *ret_cookie, uint32 buf_size)
+{
+ char *ptr;
+
+ if (!dhdp || !ret_cookie || !dhdp->logdump_cookie) {
+ DHD_ERROR(("%s: At least one buffer ptr is NULL dhdp=%p"
+ "cookie=%p cookie_cfg:%p\n", __FUNCTION__,
+ dhdp, ret_cookie, dhdp?dhdp->logdump_cookie: NULL));
+ return BCME_ERROR;
+ }
+ ptr = (char *)dhd_ring_get_first(dhdp->logdump_cookie);
+ if (ptr == NULL) {
+ DHD_ERROR(("%s : Skip to save due to locking\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+ memcpy(ret_cookie, ptr, MIN(buf_size, strlen(ptr)));
+ dhd_ring_free_first(dhdp->logdump_cookie);
+ return BCME_OK;
+}
+
+int
+dhd_logdump_cookie_count(dhd_pub_t *dhdp)
+{
+ if (!dhdp || !dhdp->logdump_cookie) {
+ DHD_ERROR(("%s: At least one buffer ptr is NULL dhdp=%p cookie=%p\n",
+ __FUNCTION__, dhdp, dhdp?dhdp->logdump_cookie: NULL));
+ return 0;
+ }
+ return dhd_ring_get_cur_size(dhdp->logdump_cookie);
+}
+
+static inline int
+__dhd_log_dump_cookie_to_file(
+ dhd_pub_t *dhdp, void *fp, const void *user_buf, unsigned long *f_pos,
+ char *buf, uint32 buf_size)
+{
+
+ uint32 remain = buf_size;
+ int ret = BCME_ERROR;
+ char tmp_buf[LOGDUMP_COOKIE_STR_LEN];
+ log_dump_section_hdr_t sec_hdr;
+ uint32 read_idx;
+ uint32 write_idx;
+
+ read_idx = dhd_ring_get_read_idx(dhdp->logdump_cookie);
+ write_idx = dhd_ring_get_write_idx(dhdp->logdump_cookie);
+ while (dhd_logdump_cookie_count(dhdp) > 0) {
+ memset(tmp_buf, 0, sizeof(tmp_buf));
+ ret = dhd_logdump_cookie_get(dhdp, tmp_buf, LOGDUMP_COOKIE_STR_LEN);
+ if (ret != BCME_OK) {
+ return ret;
+ }
+ remain -= scnprintf(&buf[buf_size - remain], remain, "%s", tmp_buf);
+ }
+ dhd_ring_set_read_idx(dhdp->logdump_cookie, read_idx);
+ dhd_ring_set_write_idx(dhdp->logdump_cookie, write_idx);
+
+ ret = dhd_export_debug_data(COOKIE_LOG_HDR, fp, user_buf, strlen(COOKIE_LOG_HDR), f_pos);
+ if (ret < 0) {
+ DHD_ERROR(("%s : Write file Error for cookie hdr\n", __FUNCTION__));
+ return ret;
+ }
+ sec_hdr.magic = LOG_DUMP_MAGIC;
+ sec_hdr.timestamp = local_clock();
+ sec_hdr.type = LOG_DUMP_SECTION_COOKIE;
+ sec_hdr.length = buf_size - remain;
+
+ ret = dhd_export_debug_data((char *)&sec_hdr, fp, user_buf, sizeof(sec_hdr), f_pos);
+ if (ret < 0) {
+ DHD_ERROR(("%s : Write file Error for section hdr\n", __FUNCTION__));
+ return ret;
+ }
+
+ ret = dhd_export_debug_data(buf, fp, user_buf, sec_hdr.length, f_pos);
+ if (ret < 0) {
+ DHD_ERROR(("%s : Write file Error for cookie data\n", __FUNCTION__));
+ }
+
+ return ret;
+}
+
+uint32
+dhd_log_dump_cookie_len(dhd_pub_t *dhdp)
+{
+ int len = 0;
+ char tmp_buf[LOGDUMP_COOKIE_STR_LEN];
+ log_dump_section_hdr_t sec_hdr;
+ char *buf = NULL;
+ int ret = BCME_ERROR;
+ uint32 buf_size = MAX_LOGUDMP_COOKIE_CNT * LOGDUMP_COOKIE_STR_LEN;
+ uint32 read_idx;
+ uint32 write_idx;
+ uint32 remain;
+
+ remain = buf_size;
+
+ if (!dhdp || !dhdp->logdump_cookie) {
+ DHD_ERROR(("%s At least one ptr is NULL "
+ "dhdp = %p cookie %p\n",
+ __FUNCTION__, dhdp, dhdp?dhdp->logdump_cookie:NULL));
+ goto exit;
+ }
+
+ buf = (char *)MALLOCZ(dhdp->osh, buf_size);
+ if (!buf) {
+ DHD_ERROR(("%s Fail to malloc buffer\n", __FUNCTION__));
+ goto exit;
+ }
+
+ read_idx = dhd_ring_get_read_idx(dhdp->logdump_cookie);
+ write_idx = dhd_ring_get_write_idx(dhdp->logdump_cookie);
+ while (dhd_logdump_cookie_count(dhdp) > 0) {
+ memset(tmp_buf, 0, sizeof(tmp_buf));
+ ret = dhd_logdump_cookie_get(dhdp, tmp_buf, LOGDUMP_COOKIE_STR_LEN);
+ if (ret != BCME_OK) {
+ goto exit;
+ }
+ remain -= (uint32)strlen(tmp_buf);
+ }
+ dhd_ring_set_read_idx(dhdp->logdump_cookie, read_idx);
+ dhd_ring_set_write_idx(dhdp->logdump_cookie, write_idx);
+ len += strlen(COOKIE_LOG_HDR);
+ len += sizeof(sec_hdr);
+ len += (buf_size - remain);
+exit:
+ if (buf)
+ MFREE(dhdp->osh, buf, buf_size);
+ return len;
+}
+
+int
+dhd_log_dump_cookie(dhd_pub_t *dhdp, const void *user_buf)
+{
+ int ret = BCME_ERROR;
+ char tmp_buf[LOGDUMP_COOKIE_STR_LEN];
+ log_dump_section_hdr_t sec_hdr;
+ char *buf = NULL;
+ uint32 buf_size = MAX_LOGUDMP_COOKIE_CNT * LOGDUMP_COOKIE_STR_LEN;
+ int pos = 0;
+ uint32 read_idx;
+ uint32 write_idx;
+ uint32 remain;
+
+ remain = buf_size;
+
+ if (!dhdp || !dhdp->logdump_cookie) {
+ DHD_ERROR(("%s At least one ptr is NULL "
+ "dhdp = %p cookie %p\n",
+ __FUNCTION__, dhdp, dhdp?dhdp->logdump_cookie:NULL));
+ goto exit;
+ }
+
+ buf = (char *)MALLOCZ(dhdp->osh, buf_size);
+ if (!buf) {
+ DHD_ERROR(("%s Fail to malloc buffer\n", __FUNCTION__));
+ goto exit;
+ }
+
+ read_idx = dhd_ring_get_read_idx(dhdp->logdump_cookie);
+ write_idx = dhd_ring_get_write_idx(dhdp->logdump_cookie);
+ while (dhd_logdump_cookie_count(dhdp) > 0) {
+ memset(tmp_buf, 0, sizeof(tmp_buf));
+ ret = dhd_logdump_cookie_get(dhdp, tmp_buf, LOGDUMP_COOKIE_STR_LEN);
+ if (ret != BCME_OK) {
+ goto exit;
+ }
+ remain -= scnprintf(&buf[buf_size - remain], remain, "%s", tmp_buf);
+ }
+ dhd_ring_set_read_idx(dhdp->logdump_cookie, read_idx);
+ dhd_ring_set_write_idx(dhdp->logdump_cookie, write_idx);
+ ret = dhd_export_debug_data(COOKIE_LOG_HDR, NULL, user_buf, strlen(COOKIE_LOG_HDR), &pos);
+ sec_hdr.magic = LOG_DUMP_MAGIC;
+ sec_hdr.timestamp = local_clock();
+ sec_hdr.type = LOG_DUMP_SECTION_COOKIE;
+ sec_hdr.length = buf_size - remain;
+ ret = dhd_export_debug_data((char *)&sec_hdr, NULL, user_buf, sizeof(sec_hdr), &pos);
+ ret = dhd_export_debug_data(buf, NULL, user_buf, sec_hdr.length, &pos);
+exit:
+ if (buf)
+ MFREE(dhdp->osh, buf, buf_size);
+ return ret;
+}
+
+int
+dhd_log_dump_cookie_to_file(dhd_pub_t *dhdp, void *fp, const void *user_buf, unsigned long *f_pos)
+{
+ char *buf;
+ int ret = BCME_ERROR;
+ uint32 buf_size = MAX_LOGUDMP_COOKIE_CNT * LOGDUMP_COOKIE_STR_LEN;
+
+ if (!dhdp || !dhdp->logdump_cookie || (!fp && !user_buf) || !f_pos) {
+ DHD_ERROR(("%s At least one ptr is NULL "
+ "dhdp = %p cookie %p fp = %p f_pos = %p\n",
+ __FUNCTION__, dhdp, dhdp?dhdp->logdump_cookie:NULL, fp, f_pos));
+ return ret;
+ }
+
+ buf = (char *)MALLOCZ(dhdp->osh, buf_size);
+ if (!buf) {
+ DHD_ERROR(("%s Fail to malloc buffer\n", __FUNCTION__));
+ return ret;
+ }
+ ret = __dhd_log_dump_cookie_to_file(dhdp, fp, user_buf, f_pos, buf, buf_size);
+ MFREE(dhdp->osh, buf, buf_size);
+
+ return ret;
+}
+
+#endif /* DHD_LOG_DUMP */
+
+#ifdef DHD_LOG_DUMP
+#define DEBUG_DUMP_TRIGGER_INTERVAL_SEC 4
+void
+dhd_log_dump_trigger(dhd_pub_t *dhdp, int subcmd)
+{
+#if defined(DHD_DUMP_FILE_WRITE_FROM_KERNEL)
+ log_dump_type_t *flush_type;
+#endif /* DHD_DUMP_FILE_WRITE_FROM_KERNEL */
+ uint64 current_time_sec;
+
+ if (!dhdp) {
+ DHD_ERROR(("dhdp is NULL !\n"));
+ return;
+ }
+
+ if (subcmd >= CMD_MAX || subcmd < CMD_DEFAULT) {
+ DHD_ERROR(("%s : Invalid subcmd \n", __FUNCTION__));
+ return;
+ }
+
+ current_time_sec = DIV_U64_BY_U32(OSL_LOCALTIME_NS(), NSEC_PER_SEC);
+
+ DHD_ERROR(("%s: current_time_sec=%lld debug_dump_time_sec=%lld interval=%d\n",
+ __FUNCTION__, current_time_sec, dhdp->debug_dump_time_sec,
+ DEBUG_DUMP_TRIGGER_INTERVAL_SEC));
+
+ if ((current_time_sec - dhdp->debug_dump_time_sec) < DEBUG_DUMP_TRIGGER_INTERVAL_SEC) {
+ DHD_ERROR(("%s : Last debug dump triggered(%lld) within %d seconds, so SKIP\n",
+ __FUNCTION__, dhdp->debug_dump_time_sec, DEBUG_DUMP_TRIGGER_INTERVAL_SEC));
+ return;
+ }
+
+ clear_debug_dump_time(dhdp->debug_dump_time_str);
+#ifdef DHD_PCIE_RUNTIMEPM
+ /* wake up RPM if SYSDUMP is triggered */
+ dhdpcie_runtime_bus_wake(dhdp, TRUE, __builtin_return_address(0));
+#endif /* DHD_PCIE_RUNTIMEPM */
+ /* */
+ dhdp->debug_dump_subcmd = subcmd;
+
+ dhdp->debug_dump_time_sec = DIV_U64_BY_U32(OSL_LOCALTIME_NS(), NSEC_PER_SEC);
+
+#if defined(DHD_DUMP_FILE_WRITE_FROM_KERNEL)
+ /* flush_type is freed at do_dhd_log_dump function */
+ flush_type = MALLOCZ(dhdp->osh, sizeof(log_dump_type_t));
+ if (flush_type) {
+ *flush_type = DLD_BUF_TYPE_ALL;
+ dhd_schedule_log_dump(dhdp, flush_type);
+ } else {
+ DHD_ERROR(("%s Fail to malloc flush_type\n", __FUNCTION__));
+ return;
+ }
+#endif /* DHD_DUMP_FILE_WRITE_FROM_KERNEL */
+
+ /* Inside dhd_mem_dump, event notification will be sent to HAL and
+ * from other context DHD pushes memdump, debug_dump and pktlog dump
+ * to HAL and HAL will write into file
+ */
+#if (defined(BCMPCIE) || defined(BCMSDIO)) && defined(DHD_FW_COREDUMP)
+ dhdp->memdump_type = DUMP_TYPE_BY_SYSDUMP;
+ dhd_bus_mem_dump(dhdp);
+#endif /* BCMPCIE && DHD_FW_COREDUMP */
+
+#if defined(DHD_PKT_LOGGING) && defined(DHD_DUMP_FILE_WRITE_FROM_KERNEL)
+ dhd_schedule_pktlog_dump(dhdp);
+#endif /* DHD_PKT_LOGGING && DHD_DUMP_FILE_WRITE_FROM_KERNEL */
+}
+#endif /* DHD_LOG_DUMP */
+
+#ifdef EWP_EDL
+/* For now we are allocating memory for EDL ring using DMA_ALLOC_CONSISTENT
+* The reason being that, in hikey, if we try to DMA_MAP prealloced memory
+* it is failing with an 'out of space in SWIOTLB' error
+*/
+int
+dhd_edl_mem_init(dhd_pub_t *dhd)
+{
+ int ret = 0;
+
+ memset(&dhd->edl_ring_mem, 0, sizeof(dhd->edl_ring_mem));
+ ret = dhd_dma_buf_alloc(dhd, &dhd->edl_ring_mem, DHD_EDL_RING_SIZE);
+ if (ret != BCME_OK) {
+ DHD_ERROR(("%s: alloc of edl_ring_mem failed\n",
+ __FUNCTION__));
+ return BCME_ERROR;
+ }
+ return BCME_OK;
+}
+
+/* NOTE:- that dhd_edl_mem_deinit need NOT be called explicitly, because the dma_buf
+* for EDL is freed during 'dhd_prot_detach_edl_rings' which is called during de-init.
+*/
+void
+dhd_edl_mem_deinit(dhd_pub_t *dhd)
+{
+ if (dhd->edl_ring_mem.va != NULL)
+ dhd_dma_buf_free(dhd, &dhd->edl_ring_mem);
+}
+
+int
+dhd_event_logtrace_process_edl(dhd_pub_t *dhdp, uint8 *data,
+ void *evt_decode_data)
+{
+ msg_hdr_edl_t *msg = NULL;
+ cmn_msg_hdr_t *cmn_msg_hdr = NULL;
+ uint8 *buf = NULL;
+
+ if (!data || !dhdp || !evt_decode_data) {
+ DHD_ERROR(("%s: invalid args ! \n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ /* format of data in each work item in the EDL ring:
+ * |cmn_msg_hdr_t |payload (var len)|cmn_msg_hdr_t|
+ * payload = |infobuf_ver(u32)|info_buf_payload_hdr_t|msgtrace_hdr_t|<var len data>|
+ */
+ cmn_msg_hdr = (cmn_msg_hdr_t *)data;
+ msg = (msg_hdr_edl_t *)(data + sizeof(cmn_msg_hdr_t));
+ buf = (uint8 *)msg;
+ /* validate the fields */
+ if (ltoh32(msg->infobuf_ver) != PCIE_INFOBUF_V1) {
+ DHD_ERROR(("%s: Skipping msg with invalid infobuf ver (0x%x)"
+ " expected (0x%x)\n", __FUNCTION__,
+ msg->infobuf_ver, PCIE_INFOBUF_V1));
+ return BCME_VERSION;
+ }
+
+ /* in EDL, the request_id field of cmn_msg_hdr is overloaded to carry payload length */
+ if (sizeof(info_buf_payload_hdr_t) > cmn_msg_hdr->request_id) {
+ DHD_ERROR(("%s: infobuf too small for v1 type/length fields\n",
+ __FUNCTION__));
+ return BCME_BUFTOOLONG;
+ }
+
+ if (ltoh16(msg->pyld_hdr.type) != PCIE_INFOBUF_V1_TYPE_LOGTRACE) {
+ DHD_ERROR(("%s: payload_hdr_type %d is not V1_TYPE_LOGTRACE\n",
+ __FUNCTION__, ltoh16(msg->pyld_hdr.type)));
+ return BCME_BADOPTION;
+ }
+
+ if (ltoh16(msg->pyld_hdr.length) > cmn_msg_hdr->request_id) {
+ DHD_ERROR(("%s: infobuf logtrace length %u is bigger"
+ " than available buffer size %u\n", __FUNCTION__,
+ ltoh16(msg->pyld_hdr.length), cmn_msg_hdr->request_id));
+ return BCME_BADLEN;
+ }
+
+ /* dhd_dbg_trace_evnt_handler expects the data to start from msgtrace_hdr_t */
+ buf += sizeof(msg->infobuf_ver) + sizeof(msg->pyld_hdr);
+ dhd_dbg_trace_evnt_handler(dhdp, buf, evt_decode_data,
+ ltoh16(msg->pyld_hdr.length));
+
+ /* check 'dhdp->logtrace_pkt_sendup' and if true alloc an skb
+ * copy the event data to the skb and send it up the stack
+ */
+#ifdef BCMPCIE
+ if (dhdp->logtrace_pkt_sendup) {
+ DHD_INFO(("%s: send up event log, len %u bytes\n", __FUNCTION__,
+ (uint32)(ltoh16(msg->pyld_hdr.length) +
+ sizeof(info_buf_payload_hdr_t) + 4)));
+ dhd_sendup_info_buf(dhdp, (uint8 *)msg);
+ }
+#endif /* BCMPCIE */
+
+ return BCME_OK;
+}
+#endif /* EWP_EDL */
+
+#if defined(SHOW_LOGTRACE)
+int
+dhd_print_fw_ver_from_file(dhd_pub_t *dhdp, char *fwpath)
+{
+ void *file = NULL;
+ int size = 0;
+ char buf[FW_VER_STR_LEN];
+ char *str = NULL;
+ int ret = BCME_OK;
+
+ if (!fwpath)
+ return BCME_BADARG;
+
+ file = dhd_os_open_image1(dhdp, fwpath);
+ if (!file) {
+ ret = BCME_ERROR;
+ goto exit;
+ }
+ size = dhd_os_get_image_size(file);
+ if (!size) {
+ ret = BCME_ERROR;
+ goto exit;
+ }
+
+ /* seek to the last 'X' bytes in the file */
+ if (dhd_os_seek_file(file, size - FW_VER_STR_LEN) != BCME_OK) {
+ ret = BCME_ERROR;
+ goto exit;
+ }
+
+ /* read the last 'X' bytes of the file to a buffer */
+ memset(buf, 0, FW_VER_STR_LEN);
+ if (dhd_os_get_image_block(buf, FW_VER_STR_LEN - 1, file) < 0) {
+ ret = BCME_ERROR;
+ goto exit;
+ }
+ /* search for 'Version' in the buffer */
+ str = bcmstrnstr(buf, FW_VER_STR_LEN, FW_VER_STR, strlen(FW_VER_STR));
+ if (!str) {
+ ret = BCME_ERROR;
+ goto exit;
+ }
+ /* go back in the buffer to the last ascii character */
+ while (str != buf &&
+ (*str >= ' ' && *str <= '~')) {
+ --str;
+ }
+ /* reverse the final decrement, so that str is pointing
+ * to the first ascii character in the buffer
+ */
+ ++str;
+
+ if (strlen(str) > (FW_VER_STR_LEN - 1)) {
+ ret = BCME_BADLEN;
+ goto exit;
+ }
+
+ DHD_ERROR(("FW version in file '%s': %s\n", fwpath, str));
+ /* copy to global variable, so that in case FW load fails, the
+ * core capture logs will contain FW version read from the file
+ */
+ memset(fw_version, 0, FW_VER_STR_LEN);
+ strlcpy(fw_version, str, FW_VER_STR_LEN);
+
+exit:
+ if (file)
+ dhd_os_close_image1(dhdp, file);
+
+ return ret;
+}
+#endif // endif
+
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+
+/* Ignore compiler warnings due to -Werror=cast-qual */
+#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif // endif
+
+static void
+copy_hang_info_ioctl_timeout(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc)
+{
+ int remain_len;
+ int i;
+ int *cnt;
+ char *dest;
+ int bytes_written;
+ uint32 ioc_dwlen = 0;
+
+ if (!dhd || !dhd->hang_info) {
+ DHD_ERROR(("%s dhd=%p hang_info=%p\n",
+ __FUNCTION__, dhd, (dhd ? dhd->hang_info : NULL)));
+ return;
+ }
+
+ cnt = &dhd->hang_info_cnt;
+ dest = dhd->hang_info;
+
+ memset(dest, 0, VENDOR_SEND_HANG_EXT_INFO_LEN);
+ (*cnt) = 0;
+
+ bytes_written = 0;
+ remain_len = VENDOR_SEND_HANG_EXT_INFO_LEN - bytes_written;
+
+ get_debug_dump_time(dhd->debug_dump_time_hang_str);
+ copy_debug_dump_time(dhd->debug_dump_time_str, dhd->debug_dump_time_hang_str);
+
+ bytes_written += scnprintf(&dest[bytes_written], remain_len, "%d %d %s %d %d %d %d %d %d ",
+ HANG_REASON_IOCTL_RESP_TIMEOUT, VENDOR_SEND_HANG_EXT_INFO_VER,
+ dhd->debug_dump_time_hang_str,
+ ifidx, ioc->cmd, ioc->len, ioc->set, ioc->used, ioc->needed);
+ (*cnt) = HANG_FIELD_IOCTL_RESP_TIMEOUT_CNT;
+
+ clear_debug_dump_time(dhd->debug_dump_time_hang_str);
+
+ /* Access ioc->buf only if the ioc->len is more than 4 bytes */
+ ioc_dwlen = (uint32)(ioc->len / sizeof(uint32));
+ if (ioc_dwlen > 0) {
+ const uint32 *ioc_buf = (const uint32 *)ioc->buf;
+
+ remain_len = VENDOR_SEND_HANG_EXT_INFO_LEN - bytes_written;
+ bytes_written += scnprintf(&dest[bytes_written], remain_len,
+ "%08x", *(uint32 *)(ioc_buf++));
+ (*cnt)++;
+ if ((*cnt) >= HANG_FIELD_CNT_MAX) {
+ return;
+ }
+
+ for (i = 1; i < ioc_dwlen && *cnt <= HANG_FIELD_CNT_MAX;
+ i++, (*cnt)++) {
+ remain_len = VENDOR_SEND_HANG_EXT_INFO_LEN - bytes_written;
+ bytes_written += scnprintf(&dest[bytes_written], remain_len, "%c%08x",
+ HANG_RAW_DEL, *(uint32 *)(ioc_buf++));
+ }
+ }
+
+ DHD_INFO(("%s hang info len: %d data: %s\n",
+ __FUNCTION__, (int)strlen(dhd->hang_info), dhd->hang_info));
+}
+
+#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif // endif
+
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
+
+#if defined(DHD_H2D_LOG_TIME_SYNC)
+/*
+ * Helper function:
+ * Used for Dongle console message time syncing with Host printk
+ */
+void dhd_h2d_log_time_sync(dhd_pub_t *dhd)
+{
+ uint64 ts;
+
+ /*
+ * local_clock() returns time in nano seconds.
+ * Dongle understand only milli seconds time.
+ */
+ ts = local_clock();
+ /* Nano seconds to milli seconds */
+ do_div(ts, 1000000);
+ if (dhd_wl_ioctl_set_intiovar(dhd, "rte_timesync", ts, WLC_SET_VAR, TRUE, 0)) {
+ DHD_ERROR(("%s rte_timesync **** FAILED ****\n", __FUNCTION__));
+ /* Stopping HOST Dongle console time syncing */
+ dhd->dhd_rte_time_sync_ms = 0;
+ }
+}
+#endif /* DHD_H2D_LOG_TIME_SYNC */
+
+#if defined(DISABLE_HE_ENAB) || defined(CUSTOM_CONTROL_HE_ENAB)
+int
+dhd_control_he_enab(dhd_pub_t * dhd, uint8 he_enab)
+{
+ int ret = BCME_OK;
+ bcm_xtlv_t *pxtlv = NULL;
+ uint8 mybuf[DHD_IOVAR_BUF_SIZE];
+ uint16 mybuf_len = sizeof(mybuf);
+ pxtlv = (bcm_xtlv_t *)mybuf;
+
+ ret = bcm_pack_xtlv_entry((uint8**)&pxtlv, &mybuf_len, WL_HE_CMD_ENAB, sizeof(he_enab),
+ &he_enab, BCM_XTLV_OPTION_ALIGN32);
+
+ if (ret != BCME_OK) {
+ ret = -EINVAL;
+ DHD_ERROR(("%s failed to pack he enab, err: %s\n", __FUNCTION__, bcmerrorstr(ret)));
+ return ret;
+ }
+
+ ret = dhd_iovar(dhd, 0, "he", (char *)&mybuf, sizeof(mybuf), NULL, 0, TRUE);
+ if (ret < 0) {
+ DHD_ERROR(("%s he_enab (%d) set failed, err: %s\n",
+ __FUNCTION__, he_enab, bcmerrorstr(ret)));
+ } else {
+ DHD_ERROR(("%s he_enab (%d) set successed\n", __FUNCTION__, he_enab));
+ }
+
+ return ret;
+}
+#endif /* DISABLE_HE_ENAB || CUSTOM_CONTROL_HE_ENAB */
--
Gitblit v1.6.2