| From 52fbe133cf7e0d5090dee68ab044ad5f0fb57e60 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 23 Aug 2018 14:47:08 +0300 |
| Subject: wil6210: set edma variables only for Talyn-MB devices |
| |
| From: Maya Erez <merez@codeaurora.org> |
| |
| [ Upstream commit 596bdbcce90fa93f43ebcb99cefea34bd2e27707 ] |
| |
| use_rx_hw_reordering is already set to true in wil_set_capabilities |
| for Talyn-MB devices. Remove its setting from wil_priv_init to |
| prevent its activation for older chips. |
| Similarly, move the setting of use_compressed_rx_status to |
| wil_set_capabilities. |
| |
| Signed-off-by: Maya Erez <merez@codeaurora.org> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/ath/wil6210/main.c | 2 -- |
| drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 + |
| 2 files changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c |
| index a0fe8cbad104f..d186b6886c6bf 100644 |
| --- a/drivers/net/wireless/ath/wil6210/main.c |
| +++ b/drivers/net/wireless/ath/wil6210/main.c |
| @@ -653,8 +653,6 @@ int wil_priv_init(struct wil6210_priv *wil) |
| |
| /* edma configuration can be updated via debugfs before allocation */ |
| wil->num_rx_status_rings = WIL_DEFAULT_NUM_RX_STATUS_RINGS; |
| - wil->use_compressed_rx_status = true; |
| - wil->use_rx_hw_reordering = true; |
| wil->tx_status_ring_order = WIL_TX_SRING_SIZE_ORDER_DEFAULT; |
| |
| /* Rx status ring size should be bigger than the number of RX buffers |
| diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c |
| index 89119e7facd00..c8c6613371d1b 100644 |
| --- a/drivers/net/wireless/ath/wil6210/pcie_bus.c |
| +++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c |
| @@ -108,6 +108,7 @@ int wil_set_capabilities(struct wil6210_priv *wil) |
| set_bit(hw_capa_no_flash, wil->hw_capa); |
| wil->use_enhanced_dma_hw = true; |
| wil->use_rx_hw_reordering = true; |
| + wil->use_compressed_rx_status = true; |
| wil_fw_name = ftm_mode ? WIL_FW_NAME_FTM_TALYN : |
| WIL_FW_NAME_TALYN; |
| if (wil_fw_verify_file_exists(wil, wil_fw_name)) |
| -- |
| 2.20.1 |
| |
