From 2107a96e376af3188d8fd810fdd3f5685af7e1f8 Mon Sep 17 00:00:00 2001 From: Alok Kumar Date: Mon, 13 Jan 2020 15:35:29 +0530 Subject: [PATCH] qcacld-3.0: Add driver support for QCA6750 Add driver support for QCA6750 Change-Id: I9e6716d5ed9f91532aba422c32b46b43760a0e88 CRs-Fixed: 2602141 --- components/ipa/core/inc/wlan_ipa_priv.h | 6 +++--- components/ipa/core/src/wlan_ipa_core.c | 4 ++-- core/cds/src/cds_api.c | 8 +++++--- core/dp/htt/htt_monitor_rx.c | 4 ++-- core/dp/ol/inc/ol_htt_rx_api.h | 4 ++-- core/dp/txrx/ol_tx_ll_fastpath.c | 5 +++-- core/hdd/src/wlan_hdd_lro.c | 4 ++-- core/hdd/src/wlan_hdd_rx_monitor.h | 4 ++-- core/hdd/src/wlan_hdd_softap_tx_rx.c | 4 ++-- core/mac/src/pe/lim/lim_send_management_frames.c | 4 ++-- core/wma/src/wma_main.c | 3 ++- core/wma/src/wma_mgmt.c | 2 +- 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/components/ipa/core/inc/wlan_ipa_priv.h b/components/ipa/core/inc/wlan_ipa_priv.h index d45c7c0dd5d6..57756ce533f6 100644 --- a/components/ipa/core/inc/wlan_ipa_priv.h +++ b/components/ipa/core/inc/wlan_ipa_priv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -187,7 +187,7 @@ struct wlan_ipa_tx_hdr { * @reserved2: Reserved not used */ #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) struct frag_header { uint8_t reserved[0]; }; @@ -213,7 +213,7 @@ struct frag_header { */ #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) struct ipa_header { uint8_t reserved[0]; }; diff --git a/components/ipa/core/src/wlan_ipa_core.c b/components/ipa/core/src/wlan_ipa_core.c index 4ad88d81375e..90c52bb20065 100644 --- a/components/ipa/core/src/wlan_ipa_core.c +++ b/components/ipa/core/src/wlan_ipa_core.c @@ -466,7 +466,7 @@ drop_pkt: * TODO: Get WDI version through FW capabilities */ #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) static inline void wlan_ipa_wdi_get_wdi_version(struct wlan_ipa_priv *ipa_ctx) { ipa_ctx->wdi_version = IPA_WDI_3; @@ -1609,7 +1609,7 @@ end: } #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) /** * wlan_ipa_uc_handle_first_con() - Handle first uC IPA connection * @ipa_ctx: IPA context diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 056854112330..ad5ec94c1217 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -661,16 +661,18 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc) goto err_wma_close; } - cds_debug("target_type %d 8074:%d 6290:%d 6390: %d 6490: %d", + cds_debug("target_type %d 8074:%d 6290:%d 6390: %d 6490: %d 6750: %d", hdd_ctx->target_type, TARGET_TYPE_QCA8074, TARGET_TYPE_QCA6290, TARGET_TYPE_QCA6390, - TARGET_TYPE_QCA6490); + TARGET_TYPE_QCA6490, + TARGET_TYPE_QCA6750); if (TARGET_TYPE_QCA6290 == hdd_ctx->target_type || TARGET_TYPE_QCA6390 == hdd_ctx->target_type || - TARGET_TYPE_QCA6490 == hdd_ctx->target_type) + TARGET_TYPE_QCA6490 == hdd_ctx->target_type || + TARGET_TYPE_QCA6750 == hdd_ctx->target_type) gp_cds_context->dp_soc = cdp_soc_attach(LITHIUM_DP, gp_cds_context->hif_context, htcInfo.target_psoc, gp_cds_context->htc_ctx, gp_cds_context->qdf_ctx, diff --git a/core/dp/htt/htt_monitor_rx.c b/core/dp/htt/htt_monitor_rx.c index 6818bcd6b49a..d76521279ddc 100644 --- a/core/dp/htt/htt_monitor_rx.c +++ b/core/dp/htt/htt_monitor_rx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -730,7 +730,7 @@ next_pop: #if defined(FEATURE_MONITOR_MODE_SUPPORT) #if !defined(QCA6290_HEADERS_DEF) && !defined(QCA6390_HEADERS_DEF) && \ - !defined(QCA6490_HEADERS_DEF) + !defined(QCA6490_HEADERS_DEF) && !defined(QCA6750_HEADERS_DEF) static void htt_rx_parse_ppdu_start_status(struct htt_host_rx_desc_base *rx_desc, struct ieee80211_rx_status *rs) diff --git a/core/dp/ol/inc/ol_htt_rx_api.h b/core/dp/ol/inc/ol_htt_rx_api.h index fae61969af80..4f39903ae354 100644 --- a/core/dp/ol/inc/ol_htt_rx_api.h +++ b/core/dp/ol/inc/ol_htt_rx_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -920,7 +920,7 @@ int htt_rx_msdu_buff_in_order_replenish(htt_pdev_handle pdev, uint32_t num) */ #if defined(FEATURE_MONITOR_MODE_SUPPORT) #if !defined(QCA6290_HEADERS_DEF) && !defined(QCA6390_HEADERS_DEF) && \ - !defined(QCA6490_HEADERS_DEF) + !defined(QCA6490_HEADERS_DEF) && !defined(QCA6750_HEADERS_DEF) qdf_nbuf_t htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, qdf_nbuf_t head_msdu, diff --git a/core/dp/txrx/ol_tx_ll_fastpath.c b/core/dp/txrx/ol_tx_ll_fastpath.c index 3841c02742a2..f2cbaee06215 100644 --- a/core/dp/txrx/ol_tx_ll_fastpath.c +++ b/core/dp/txrx/ol_tx_ll_fastpath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -48,7 +48,8 @@ #include #include -#if defined(HIF_PCI) || defined(HIF_SNOC) || defined(HIF_AHB) +#if defined(HIF_PCI) || defined(HIF_SNOC) || defined(HIF_AHB) || \ + defined(HIF_IPCI) #include #endif diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 5289737e55fd..97972ecd063d 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -39,7 +39,7 @@ LRO_TCP_DATA_CSUM | LRO_TCP_SEQ_NUM | LRO_TCP_WIN) #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) static qdf_lro_ctx_t wlan_hdd_get_lro_ctx(struct sk_buff *skb) { return (qdf_lro_ctx_t)QDF_NBUF_CB_RX_LRO_CTX(skb); diff --git a/core/hdd/src/wlan_hdd_rx_monitor.h b/core/hdd/src/wlan_hdd_rx_monitor.h index 29fb05cf1e6e..49a8cb07b8c2 100644 --- a/core/hdd/src/wlan_hdd_rx_monitor.h +++ b/core/hdd/src/wlan_hdd_rx_monitor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -22,7 +22,7 @@ struct ol_txrx_ops; #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) void hdd_monitor_set_rx_monitor_cb(struct ol_txrx_ops *txrx, ol_txrx_rx_mon_fp rx_monitor_cb); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index bd5ea4f161da..c7bd6842c18c 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -857,7 +857,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *adapter_context, qdf_nbuf_t rx_buf) /* Debug code, remove later */ #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: skb %pK skb->len %d\n", __func__, skb, skb->len); #endif diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 16ec52e990a9..8245887582db 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -4947,7 +4947,7 @@ returnAfterError: #endif #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) #ifdef WLAN_FEATURE_11AX #define IS_PE_SESSION_HE_MODE(_session) ((_session)->he_capable) #else diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 9d473867482b..4716ff9e620c 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -7112,7 +7112,8 @@ static void wma_set_wifi_start_packet_stats(void *wma_handle, log_state = ATH_PKTLOG_ANI | ATH_PKTLOG_RCUPDATE | ATH_PKTLOG_RCFIND | ATH_PKTLOG_RX | ATH_PKTLOG_TX | ATH_PKTLOG_TEXT | ATH_PKTLOG_SW_EVENT; -#elif defined(QCA_WIFI_QCA6390) || defined(QCA_WIFI_QCA6490) +#elif defined(QCA_WIFI_QCA6390) || defined(QCA_WIFI_QCA6490) || \ + defined(QCA_WIFI_QCA6750) log_state = ATH_PKTLOG_RCFIND | ATH_PKTLOG_RCUPDATE | ATH_PKTLOG_TX | ATH_PKTLOG_LITE_T2H | ATH_PKTLOG_SW_EVENT | ATH_PKTLOG_RX; diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 039d2474ad43..612bd02b2fd5 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -1907,7 +1907,7 @@ void wma_update_frag_params(tp_wma_handle wma, uint32_t value) #ifdef FEATURE_WLAN_WAPI #define WPI_IV_LEN 16 #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \ - defined(QCA_WIFI_QCA6490) + defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750) /** * wma_fill_in_wapi_key_params() - update key parameters about wapi * @key_params: wma key parameters