qcacmn: Reduce MSI count for DP from 9 to 7

Currently, we are assigning 9 MSI Vector to DP.
But in some target available MSI Vector are less 
because of which they are unable to assign 9 MSI
Vector to DP.

So, to fix the issue reduces MSI requirement for
DP from 9 to 7 and mux DP interrupts.

Change-Id: I48da2d0e8921db3298903a398f981e5b45a60987
CRs-Fixed: 3111170
This commit is contained in:
Amit Mehta
2022-01-13 02:37:13 -08:00
committed by Madan Koyyalamudi
parent ede155309e
commit bfe03e92a3
2 changed files with 7 additions and 11 deletions

View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -146,8 +146,8 @@ static const uint8_t tx_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = {
#ifdef TX_MULTI_TCL #ifdef TX_MULTI_TCL
static const uint8_t multi_tx_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = { static const uint8_t multi_tx_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = {
[0] = WLAN_CFG_TX_RING_MASK_0, [7] = WLAN_CFG_TX_RING_MASK_2, [0] = WLAN_CFG_TX_RING_MASK_0, [4] = WLAN_CFG_TX_RING_MASK_2,
[8] = WLAN_CFG_TX_RING_MASK_4}; [5] = WLAN_CFG_TX_RING_MASK_4};
#ifdef IPA_OFFLOAD #ifdef IPA_OFFLOAD
static inline const static inline const
@@ -195,7 +195,7 @@ static const uint8_t rx_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = {
#else #else
static const uint8_t rx_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = { static const uint8_t rx_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = {
[1] = WLAN_CFG_RX_RING_MASK_0, [2] = WLAN_CFG_RX_RING_MASK_1, [1] = WLAN_CFG_RX_RING_MASK_0, [2] = WLAN_CFG_RX_RING_MASK_1,
[3] = WLAN_CFG_RX_RING_MASK_2, [4] = WLAN_CFG_RX_RING_MASK_3}; [3] = WLAN_CFG_RX_RING_MASK_2 | WLAN_CFG_RX_RING_MASK_3};
#endif #endif
#endif /* CONFIG_BERYLLIUM */ #endif /* CONFIG_BERYLLIUM */
@@ -204,8 +204,8 @@ static const uint8_t rxdma2host_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = {
[13] = WLAN_CFG_RXDMA2HOST_RING_MASK_0}; [13] = WLAN_CFG_RXDMA2HOST_RING_MASK_0};
#else #else
static const uint8_t rxdma2host_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = { static const uint8_t rxdma2host_ring_mask_msi[WLAN_CFG_INT_NUM_CONTEXTS] = {
[5] = WLAN_CFG_RXDMA2HOST_RING_MASK_0, [6] = WLAN_CFG_RXDMA2HOST_RING_MASK_0 |
[6] = WLAN_CFG_RXDMA2HOST_RING_MASK_1}; WLAN_CFG_RXDMA2HOST_RING_MASK_1};
#endif /* CONFIG_BERYLLIUM */ #endif /* CONFIG_BERYLLIUM */
#ifdef CONFIG_BERYLLIUM #ifdef CONFIG_BERYLLIUM

View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2021 The Linux Foundation. All rights reserved. * Copyright (c) 2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -33,11 +33,7 @@
#define WLAN_CFG_INT_NUM_CONTEXTS 18 #define WLAN_CFG_INT_NUM_CONTEXTS 18
#define WLAN_CFG_INT_NUM_CONTEXTS_MAX 18 #define WLAN_CFG_INT_NUM_CONTEXTS_MAX 18
#else #else
#if defined(TX_MULTI_TCL)
#define WLAN_CFG_INT_NUM_CONTEXTS 9
#else
#define WLAN_CFG_INT_NUM_CONTEXTS 7 #define WLAN_CFG_INT_NUM_CONTEXTS 7
#endif
#define WLAN_CFG_INT_NUM_CONTEXTS_MAX 14 #define WLAN_CFG_INT_NUM_CONTEXTS_MAX 14
#endif #endif
#define WLAN_CFG_RXDMA1_ENABLE 1 #define WLAN_CFG_RXDMA1_ENABLE 1