samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: change qcn9100 to qcn6122 in hif and umac

Browse Source 
Change the name of target type qcn9100
to qcn6122 in hif and umac.

Change-Id: Ia473c531a0903fd514dacf645d23bec3886fd719
CRs-Fixed: 2849577
This commit is contained in:
Pavankumar Nandeshwar
2021-01-06 08:02:02 -08:00
committed by snandini
parent d6c9f3ad8a
commit 1adba0a413
16 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hif/inc/hif.h
View File

@@ -68,7 +68,7 @@ typedef void *hif_handle_t;
#define HIF_TYPE_QCA6490 22
#define HIF_TYPE_QCA6750 23
#define HIF_TYPE_QCA5018 24
#define HIF_TYPE_QCN9100 25
#define HIF_TYPE_QCN6122 25
#define DMA_COHERENT_MASK_DEFAULT 37

4
hif/inc/hostdef.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016,2018-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2016,2018-2021 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
@@ -46,5 +46,5 @@ extern struct hostdef_s *QCA8074V2_HOSTDEF;
extern struct hostdef_s *QCA6018_HOSTDEF;
extern struct hostdef_s *QCA5018_HOSTDEF;
extern struct hostdef_s *QCN9000_HOSTDEF;
extern struct hostdef_s *QCN9100_HOSTDEF;
extern struct hostdef_s *QCN6122_HOSTDEF;
#endif

6
hif/inc/target_type.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2021 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
@@ -66,8 +66,8 @@ extern "C" {
#define TARGET_TYPE_QCA5018 29
#endif
#ifndef TARGET_TYPE_QCN9100
#define TARGET_TYPE_QCN9100 30
#ifndef TARGET_TYPE_QCN6122
#define TARGET_TYPE_QCN6122 30
#endif
#ifdef __cplusplus

6
hif/inc/targetdef.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2016,2018-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2016,2018-2021 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
@@ -46,7 +46,7 @@ extern struct targetdef_s *QCA8074V2_TARGETDEF;
extern struct targetdef_s *QCA6018_TARGETDEF;
extern struct targetdef_s *QCA5018_TARGETDEF;
extern struct targetdef_s *QCN9000_TARGETDEF;
extern struct targetdef_s *QCN9100_TARGETDEF;
extern struct targetdef_s *QCN6122_TARGETDEF;
extern struct ce_reg_def *AR6002_CE_TARGETdef;
extern struct ce_reg_def *AR6003_CE_TARGETdef;
@@ -69,7 +69,7 @@ extern struct ce_reg_def *QCA8074V2_CE_TARGETDEF;
extern struct ce_reg_def *QCA6018_CE_TARGETDEF;
extern struct ce_reg_def *QCA5018_CE_TARGETDEF;
extern struct ce_reg_def *QCN9000_CE_TARGETDEF;
extern struct ce_reg_def *QCN9100_CE_TARGETDEF;
extern struct ce_reg_def *QCN6122_CE_TARGETDEF;
#endif

6
hif/src/ath_procfs.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2014, 2016-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2014, 2016-2021 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
@@ -105,7 +105,7 @@ static ssize_t ath_procfs_diag_read_legacy(struct file *file,
(tgt_info->target_type == TARGET_TYPE_QCA8074) ||
(tgt_info->target_type == TARGET_TYPE_QCA8074V2) ||
(tgt_info->target_type == TARGET_TYPE_QCN9000) ||
(tgt_info->target_type == TARGET_TYPE_QCN9100) ||
(tgt_info->target_type == TARGET_TYPE_QCN6122) ||
(tgt_info->target_type == TARGET_TYPE_QCA5018) ||
(tgt_info->target_type == TARGET_TYPE_QCA6018) ||
(tgt_info->target_type == TARGET_TYPE_QCN7605))) ||
@@ -184,7 +184,7 @@ static ssize_t ath_procfs_diag_write_legacy(struct file *file,
(tgt_info->target_type == TARGET_TYPE_QCA8074) ||
(tgt_info->target_type == TARGET_TYPE_QCA8074V2) ||
(tgt_info->target_type == TARGET_TYPE_QCN9000) ||
(tgt_info->target_type == TARGET_TYPE_QCN9100) ||
(tgt_info->target_type == TARGET_TYPE_QCN6122) ||
(tgt_info->target_type == TARGET_TYPE_QCA5018) ||
(tgt_info->target_type == TARGET_TYPE_QCA6018) ||
(tgt_info->target_type == TARGET_TYPE_QCN7605))) ||

6
hif/src/ce/ce_assignment.h
View File

@@ -931,8 +931,8 @@ static struct CE_pipe_config target_ce_config_wlan_adrastea[] = {
{ /* CE11 */ 11, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,},
};
#define QCN_9100_CE_COUNT 6
static struct CE_attr host_ce_config_wlan_qcn9100[] = {
#define QCN_6122_CE_COUNT 6
static struct CE_attr host_ce_config_wlan_qcn6122[] = {
/* host->target HTC control and raw streams */
{/*CE0*/ (CE_ATTR_FLAGS), 0, 16, 2048, 0, NULL,},
/* target->host HTT + HTC control */
@@ -958,7 +958,7 @@ static struct CE_attr host_ce_config_wlan_qcn9100[] = {
/* CE 9, 10, 11 belong to CoreBsp & MHI driver */
};
static struct CE_pipe_config target_ce_config_wlan_qcn9100[] = {
static struct CE_pipe_config target_ce_config_wlan_qcn6122[] = {
/* host->target HTC control and raw streams */
{ /* CE0 */ 0, PIPEDIR_OUT, 32, 2048, CE_ATTR_FLAGS, 0,},
/* target->host HTT */

16
hif/src/ce/ce_main.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2021 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
@@ -919,7 +919,7 @@ static void hif_select_service_to_pipe_map(struct hif_softc *scn,
sizeof(target_service_to_ce_map_qcn9000);
break;
case TARGET_TYPE_QCA5018:
case TARGET_TYPE_QCN9100:
case TARGET_TYPE_QCN6122:
*tgt_svc_map_to_use =
target_service_to_ce_map_qca5018;
*sz_tgt_svc_map_to_use =
@@ -1150,7 +1150,7 @@ bool ce_srng_based(struct hif_softc *scn)
case TARGET_TYPE_QCA6750:
case TARGET_TYPE_QCA6018:
case TARGET_TYPE_QCN9000:
case TARGET_TYPE_QCN9100:
case TARGET_TYPE_QCN6122:
case TARGET_TYPE_QCA5018:
return true;
default:
@@ -3355,12 +3355,12 @@ void hif_ce_prepare_config(struct hif_softc *scn)
scn->ce_count = QCN_9000_CE_COUNT;
scn->disable_wake_irq = 1;
break;
case TARGET_TYPE_QCN9100:
hif_state->host_ce_config = host_ce_config_wlan_qcn9100;
hif_state->target_ce_config = target_ce_config_wlan_qcn9100;
case TARGET_TYPE_QCN6122:
hif_state->host_ce_config = host_ce_config_wlan_qcn6122;
hif_state->target_ce_config = target_ce_config_wlan_qcn6122;
hif_state->target_ce_config_sz =
sizeof(target_ce_config_wlan_qcn9100);
scn->ce_count = QCN_9100_CE_COUNT;
sizeof(target_ce_config_wlan_qcn6122);
scn->ce_count = QCN_6122_CE_COUNT;
scn->disable_wake_irq = 1;
break;
case TARGET_TYPE_QCA5018:

4
hif/src/dispatcher/multibus_pci.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2021 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
@@ -101,7 +101,7 @@ QDF_STATUS hif_initialize_pci_ops(struct hif_softc *hif_sc)
/**
* hif_update_irq_ops_with_pci() - reinitialize the pci ops
* for hybrid bus type device qcn9100 ie.connected to pci slot
* for hybrid bus type device qcn6122 ie.connected to pci slot
* but act as ahb bus device from host perspective
*
* @hif_sc: hif_softc to get bus ops

8
hif/src/hif_main.c
View File

@@ -1179,10 +1179,10 @@ int hif_get_device_type(uint32_t device_id,
hif_info(" *********** QCN9000 *************");
break;
case QCN9100_DEVICE_ID:
*hif_type = HIF_TYPE_QCN9100;
*target_type = TARGET_TYPE_QCN9100;
hif_info(" *********** QCN9100 *************");
case QCN6122_DEVICE_ID:
*hif_type = HIF_TYPE_QCN6122;
*target_type = TARGET_TYPE_QCN6122;
hif_info(" *********** QCN6122 *************");
break;
case QCN7605_DEVICE_ID:

2
hif/src/hif_main.h
View File

@@ -89,7 +89,7 @@
#define QCA6290_EMULATION_DEVICE_ID (0xabcd)
#define QCA6290_DEVICE_ID (0x1100)
#define QCN9000_DEVICE_ID (0x1104)
#define QCN9100_DEVICE_ID (0xFFFB)
#define QCN6122_DEVICE_ID (0xFFFB)
#define QCA6390_EMULATION_DEVICE_ID (0x0108)
#define QCA6390_DEVICE_ID (0x1101)
/* TODO: change IDs for HastingsPrime */

4
hif/src/pcie/if_pci.c
View File

@@ -1713,7 +1713,7 @@ int hif_pci_bus_configure(struct hif_softc *hif_sc)
if (((hif_sc->target_info.target_type == TARGET_TYPE_QCA8074) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCA8074V2) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCA5018) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCN9100) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCN6122) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCA6018)) &&
(hif_sc->bus_type == QDF_BUS_TYPE_AHB)) {
hif_sc->per_ce_irq = true;
@@ -1735,7 +1735,7 @@ int hif_pci_bus_configure(struct hif_softc *hif_sc)
if (((hif_sc->target_info.target_type == TARGET_TYPE_QCA8074) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCA8074V2) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCA5018) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCN9100) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCN6122) ||
(hif_sc->target_info.target_type == TARGET_TYPE_QCA6018)) &&
(hif_sc->bus_type == QDF_BUS_TYPE_PCI))
hif_debug("Skip irq config for PCI based 8074 target");

30
hif/src/qcn9100def.c → hif/src/qcn6122def.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2020-2021, 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 above
@@ -17,7 +17,7 @@
#include "qdf_module.h"
#if defined(QCN9100_HEADERS_DEF)
#if defined(QCN6122_HEADERS_DEF)
#undef UMAC
#define WLAN_HEADERS 1
@@ -217,23 +217,23 @@
#define A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES MISSING
#define A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_STATUS MISSING
#define QCN9100_BOARD_DATA_SZ MISSING
#define QCN9100_BOARD_EXT_DATA_SZ MISSING
#define QCN6122_BOARD_DATA_SZ MISSING
#define QCN6122_BOARD_EXT_DATA_SZ MISSING
#define MY_TARGET_DEF QCN9100_TARGETDEF
#define MY_HOST_DEF QCN9100_HOSTDEF
#define MY_CEREG_DEF QCN9100_CE_TARGETDEF
#define MY_TARGET_BOARD_DATA_SZ QCN9100_BOARD_DATA_SZ
#define MY_TARGET_BOARD_EXT_DATA_SZ QCN9100_BOARD_EXT_DATA_SZ
#define MY_TARGET_DEF QCN6122_TARGETDEF
#define MY_HOST_DEF QCN6122_HOSTDEF
#define MY_CEREG_DEF QCN6122_CE_TARGETDEF
#define MY_TARGET_BOARD_DATA_SZ QCN6122_BOARD_DATA_SZ
#define MY_TARGET_BOARD_EXT_DATA_SZ QCN6122_BOARD_EXT_DATA_SZ
#include "targetdef.h"
#include "hostdef.h"
qdf_export_symbol(QCN9100_CE_TARGETDEF);
qdf_export_symbol(QCN6122_CE_TARGETDEF);
#else
#include "common_drv.h"
#include "targetdef.h"
#include "hostdef.h"
struct targetdef_s *QCN9100_TARGETDEF;
struct hostdef_s *QCN9100_HOSTDEF;
#endif /*QCN9100_HEADERS_DEF */
qdf_export_symbol(QCN9100_TARGETDEF);
qdf_export_symbol(QCN9100_HOSTDEF);
struct targetdef_s *QCN6122_TARGETDEF;
struct hostdef_s *QCN6122_HOSTDEF;
#endif /*QCN6122_HEADERS_DEF */
qdf_export_symbol(QCN6122_TARGETDEF);
qdf_export_symbol(QCN6122_HOSTDEF);

18
hif/src/regtable.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2021 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
@@ -134,11 +134,11 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
break;
#endif
#if defined(QCN9100_HEADERS_DEF)
case TARGET_TYPE_QCN9100:
scn->targetdef = QCN9100_TARGETDEF;
scn->target_ce_def = QCN9100_CE_TARGETDEF;
hif_info("TARGET_TYPE_QCN9100");
#if defined(QCN6122_HEADERS_DEF)
case TARGET_TYPE_QCN6122:
scn->targetdef = QCN6122_TARGETDEF;
scn->target_ce_def = QCN6122_CE_TARGETDEF;
hif_info("TARGET_TYPE_QCN6122");
break;
#endif
@@ -266,9 +266,9 @@ void hif_register_tbl_attach(struct hif_softc *scn, u32 hif_type)
scn->hostdef = QCN9000_HOSTDEF;
break;
#endif
#if defined(QCN9100_HEADERS_DEF)
case HIF_TYPE_QCN9100:
scn->hostdef = QCN9100_HOSTDEF;
#if defined(QCN6122_HEADERS_DEF)
case HIF_TYPE_QCN6122:
scn->hostdef = QCN6122_HOSTDEF;
break;
#endif
#if defined(QCA5018_HEADERS_DEF)

10
hif/src/snoc/if_ahb.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2021 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
@@ -519,7 +519,7 @@ void hif_ahb_disable_bus(struct hif_softc *scn)
if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
(tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
(tgt_info->target_type != TARGET_TYPE_QCA5018) &&
(tgt_info->target_type != TARGET_TYPE_QCN9100) &&
(tgt_info->target_type != TARGET_TYPE_QCN6122) &&
(tgt_info->target_type != TARGET_TYPE_QCA6018)) {
hif_ahb_clk_enable_disable(&pdev->dev, 0);
@@ -583,7 +583,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
return QDF_STATUS_E_FAILURE;
}
if (target_type == TARGET_TYPE_QCN9100) {
if (target_type == TARGET_TYPE_QCN6122) {
hif_ahb_get_soc_info_pld(sc, dev);
hif_update_irq_ops_with_pci(ol_sc);
} else {
@@ -664,7 +664,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
(tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
(tgt_info->target_type != TARGET_TYPE_QCA5018) &&
(tgt_info->target_type != TARGET_TYPE_QCN9100) &&
(tgt_info->target_type != TARGET_TYPE_QCN6122) &&
(tgt_info->target_type != TARGET_TYPE_QCA6018)) {
if (hif_ahb_enable_radio(sc, pdev, id) != 0) {
hif_err("error in enabling soc");
@@ -683,7 +683,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
err_target_sync:
if ((tgt_info->target_type != TARGET_TYPE_QCA8074) &&
(tgt_info->target_type != TARGET_TYPE_QCA8074V2) &&
(tgt_info->target_type != TARGET_TYPE_QCN9100) &&
(tgt_info->target_type != TARGET_TYPE_QCN6122) &&
(tgt_info->target_type != TARGET_TYPE_QCA5018) &&
(tgt_info->target_type != TARGET_TYPE_QCA6018)) {
hif_err("Disabling target");

6
umac/dfs/core/src/misc/dfs.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2002-2006, Atheros Communications Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -873,8 +873,8 @@ bool dfs_is_true_160mhz_supported(struct wlan_dfs *dfs)
tgt_tx_ops->tgt_is_tgt_type_qcn9000(target_type))
return true;
if (tgt_tx_ops->tgt_is_tgt_type_qcn9100 &&
tgt_tx_ops->tgt_is_tgt_type_qcn9100(target_type))
if (tgt_tx_ops->tgt_is_tgt_type_qcn6122 &&
tgt_tx_ops->tgt_is_tgt_type_qcn6122(target_type))
return true;
return false;

4
umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
View File

@@ -963,7 +963,7 @@ struct wlan_lmac_if_dfs_tx_ops {
* @tgt_is_tgt_type_qca9888: To check QCA9888 target type.
* @tgt_is_tgt_type_adrastea: To check QCS40X target type.
* @tgt_is_tgt_type_qcn9000: To check QCN9000 (Pine) target type.
* @tgt_is_tgt_type_qcn9100: To check QCN9100 (Spruce) target type.
* @tgt_is_tgt_type_qcn6122: To check QCN6122 (Spruce) target type.
* @tgt_get_tgt_type: Get target type
* @tgt_get_tgt_version: Get target version
* @tgt_get_tgt_revision: Get target revision
@@ -975,7 +975,7 @@ struct wlan_lmac_if_target_tx_ops {
bool (*tgt_is_tgt_type_qca9888)(uint32_t);
bool (*tgt_is_tgt_type_adrastea)(uint32_t);
bool (*tgt_is_tgt_type_qcn9000)(uint32_t);
bool (*tgt_is_tgt_type_qcn9100)(uint32_t);
bool (*tgt_is_tgt_type_qcn6122)(uint32_t);
uint32_t (*tgt_get_tgt_type)(struct wlan_objmgr_psoc *psoc);
uint32_t (*tgt_get_tgt_version)(struct wlan_objmgr_psoc *psoc);
uint32_t (*tgt_get_tgt_revision)(struct wlan_objmgr_psoc *psoc);