ath11k: initial PCI support
cover ath11k: initial PCI support
ath11k: initial PCI support
QCA6390 is a Wi-Fi 6 device using PCI bus but which accessed using Modem Host Interface (MHI) protocol. As the first step to get QCA6390 working in ath11k add basic support for PCI and MHI.
With this patchset only the simple PCI initialisation works with QCA6390. More patches will follow to get more features working with QCA6390.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
Please review.
Kalle
Carl Huang (2):
ath11k: do not depend on ARCH_QCOM for ath11k
ath11k: add hw_params entry for QCA6390
Govind Singh (6):
ath11k: add simple PCI client driver for QCA6390 chipset
ath11k: pci: setup resources
ath11k: pci: add MSI config initialisation
ath11k: register MHI controller device for QCA6390
ath11k: pci: add HAL, CE and core initialisation
ath11k: use remoteproc only with AHB devices
Kalle Valo (2):
ath11k: move ring mask definitions to hw_params
ath11k: implement ath11k_core_pre_init()
drivers/net/wireless/ath/ath11k/Kconfig | 18 +- drivers/net/wireless/ath/ath11k/Makefile | 7 +- drivers/net/wireless/ath/ath11k/ahb.c | 100 +---- drivers/net/wireless/ath/ath11k/ce.c | 4 + drivers/net/wireless/ath/ath11k/core.c | 59 ++- drivers/net/wireless/ath/ath11k/core.h | 22 +- drivers/net/wireless/ath/ath11k/debug.c | 5 + drivers/net/wireless/ath/ath11k/debug.h | 1 + drivers/net/wireless/ath/ath11k/dp.c | 23 +- drivers/net/wireless/ath/ath11k/hal.c | 2 + drivers/net/wireless/ath/ath11k/hif.h | 4 + drivers/net/wireless/ath/ath11k/hw.c | 72 +++ drivers/net/wireless/ath/ath11k/hw.h | 19 + drivers/net/wireless/ath/ath11k/mhi.c | 423 ++++++++++++++++++ drivers/net/wireless/ath/ath11k/mhi.h | 28 ++ drivers/net/wireless/ath/ath11k/pci.c | 738 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/pci.h | 44 ++ 17 files changed, 1459 insertions(+), 110 deletions(-) create mode 100644 drivers/net/wireless/ath/ath11k/mhi.c create mode 100644 drivers/net/wireless/ath/ath11k/mhi.h create mode 100644 drivers/net/wireless/ath/ath11k/pci.c create mode 100644 drivers/net/wireless/ath/ath11k/pci.h
Signature · 1 line
2.7.4
PATCH 1/10 ath11k: do not depend on ARCH_QCOM for ath11k
From: Carl Huang <[email protected]>
With only IPQ8074 supported ath11k was only usable on Qualcomm architectures. But now that we are adding QCA6390 PCI support to ath11k that's not the case anymore and it can be used on any architecture supporting PCI. So remove the dependency on ARCH_QCOM. After that there is also no need to depend on COMPILE_TEST.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/ath/ath11k/Kconfig +0 -1
@@ -4,7 +4,6 @@ config ATH11K depends on MAC80211 && HAS_DMA depends on REMOTEPROC depends on CRYPTO_MICHAEL_MIC - depends on ARCH_QCOM || COMPILE_TEST select ATH_COMMON select QCOM_QMI_HELPERS help
Signature · 1 line
2.7.4
Re: [PATCH 01/10] ath11k: do not depend on ARCH_QCOM for ath11k
Quoted 11 lines · Kalle Valo
With only IPQ8074 supported ath11k was only usable on Qualcomm architectures. But now that we are adding QCA6390 PCI support to ath11k that's not the case anymore and it can be used on any architecture supporting PCI. So remove the dependency on
ARCH_QCOM. After that there is also no need to depend onCOMPILE_TEST.Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2Signed-off-by Carl Huang <[email protected]>Signed-off-by Kalle Valo <[email protected]>
10 patches applied to ath-next branch of ath.git, thanks.
322b60ceb0f3 ath11k: do not depend on ARCH_QCOM for ath11k 9de2ad43d46c ath11k: add hw_params entry for QCA6390 34d5a3a88436 ath11k: move ring mask definitions to hw_params 6e0355afaeb2 ath11k: add simple PCI client driver for QCA6390 chipset 5762613ededb ath11k: pci: setup resources5697a564d369 ath11k: pci: add MSI config initialisation b8246f884684 ath11k: implement ath11k_core_pre_init() 1399fb87ea3e ath11k: register MHI controller device for QCA6390 7f4beda2ba03 ath11k: pci: add HAL, CE and core initialisation 1ff8ed786d5d ath11k: use remoteproc only with AHB devices
Signature · 9 lines
https://patchwork.kernel.org/patch/11712273/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH 01/10] ath11k: do not depend on ARCH_QCOM for ath11k
In reply to Kalle ValoQuoted 11 lines · Kalle Valo
With only IPQ8074 supported ath11k was only usable on Qualcomm architectures. But now that we are adding QCA6390 PCI support to ath11k that's not the case anymore and it can be used on any architecture supporting PCI. So remove the dependency on
ARCH_QCOM. After that there is also no need to depend onCOMPILE_TEST.Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2Signed-off-by Carl Huang <[email protected]>Signed-off-by Kalle Valo <[email protected]>
10 patches applied to ath-next branch of ath.git, thanks.
322b60ceb0f3 ath11k: do not depend on ARCH_QCOM for ath11k 9de2ad43d46c ath11k: add hw_params entry for QCA6390 34d5a3a88436 ath11k: move ring mask definitions to hw_params 6e0355afaeb2 ath11k: add simple PCI client driver for QCA6390 chipset 5762613ededb ath11k: pci: setup resources5697a564d369 ath11k: pci: add MSI config initialisation b8246f884684 ath11k: implement ath11k_core_pre_init() 1399fb87ea3e ath11k: register MHI controller device for QCA6390 7f4beda2ba03 ath11k: pci: add HAL, CE and core initialisation 1ff8ed786d5d ath11k: use remoteproc only with AHB devices
Signature · 3 lines
https://patchwork.kernel.org/patch/11712273/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/10 ath11k: add hw_params entry for QCA6390
In reply to Kalle ValoFrom: Carl Huang <[email protected]>
Define own firmware directory and settings for QCA6390.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/core.c | 12 ++++++++++++ drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/hw.c | 4 ++++ drivers/net/wireless/ath/ath11k/hw.h | 1 + 4 files changed, 18 insertions(+)
drivers/net/wireless/ath/ath11k/core.c +12 -0
@@ -30,6 +30,18 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .bdf_addr = 0x4B0C0000, .hw_ops = &ipq8074_ops, }, + { + .name = "qca6390 hw2.0", + .hw_rev = ATH11K_HW_QCA6390_HW20, + .fw = { + .dir = "QCA6390/hw2.0", + .board_size = 256 * 1024, + .cal_size = 256 * 1024, + }, + .max_radios = 3, + .bdf_addr = 0x4B0C0000, + .hw_ops = &qca6390_ops, + }, }; static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -90,6 +90,7 @@ struct ath11k_skb_rxcb {enum ath11k_hw_rev {ATH11K_HW_IPQ8074 , +ATH11K_HW_QCA6390_HW20 , };enum ath11k_firmware_mode {
drivers/net/wireless/ath/ath11k/hw.c +4 -0
@@ -32,3 +32,7 @@ const struct ath11k_hw_ops ipq8074_ops = {const struct ath11k_hw_ops ipq6018_ops = { .get_hw_mac_from_pdev_id = ath11k_hw_ipq6018_mac_from_pdev_id, }; + +const struct ath11k_hw_ops qca6390_ops = { + .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id, +};
drivers/net/wireless/ath/ath11k/hw.h +1 -0
@@ -120,6 +120,7 @@ struct ath11k_hw_params {extern const struct ath11k_hw_ops ipq8074_ops;extern const struct ath11k_hw_ops ipq6018_ops; +extern const struct ath11k_hw_ops qca6390_ops; static inline int ath11k_hw_get_mac_from_pdev_id(struct ath11k_hw_params *hw,
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 3/10 ath11k: move ring mask definitions to hw_params
In reply to Kalle ValoThis is needed for splitting ahb and pci modules as they have different ring mask settings.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ahb.c | 88 ++++------------------------------ drivers/net/wireless/ath/ath11k/core.c | 2 + drivers/net/wireless/ath/ath11k/core.h | 10 ---- drivers/net/wireless/ath/ath11k/dp.c | 22 ++++----- drivers/net/wireless/ath/ath11k/hw.c | 68 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/hw.h | 17 +++++++ 6 files changed, 106 insertions(+), 101 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +8 -80
@@ -321,78 +321,6 @@ static const char *irq_name[ATH11K_IRQ_NUM_MAX] = { "tcl2host-status-ring", }; -#define ATH11K_TX_RING_MASK_0 0x1 -#define ATH11K_TX_RING_MASK_1 0x2 -#define ATH11K_TX_RING_MASK_2 0x4 - -#define ATH11K_RX_RING_MASK_0 0x1 -#define ATH11K_RX_RING_MASK_1 0x2 -#define ATH11K_RX_RING_MASK_2 0x4 -#define ATH11K_RX_RING_MASK_3 0x8 - -#define ATH11K_RX_ERR_RING_MASK_0 0x1 - -#define ATH11K_RX_WBM_REL_RING_MASK_0 0x1 - -#define ATH11K_REO_STATUS_RING_MASK_0 0x1 - -#define ATH11K_RXDMA2HOST_RING_MASK_0 0x1 -#define ATH11K_RXDMA2HOST_RING_MASK_1 0x2 -#define ATH11K_RXDMA2HOST_RING_MASK_2 0x4 - -#define ATH11K_HOST2RXDMA_RING_MASK_0 0x1 -#define ATH11K_HOST2RXDMA_RING_MASK_1 0x2 -#define ATH11K_HOST2RXDMA_RING_MASK_2 0x4 - -#define ATH11K_RX_MON_STATUS_RING_MASK_0 0x1 -#define ATH11K_RX_MON_STATUS_RING_MASK_1 0x2 -#define ATH11K_RX_MON_STATUS_RING_MASK_2 0x4 - -const u8 ath11k_tx_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -ATH11K_TX_RING_MASK_0 , -ATH11K_TX_RING_MASK_1 , -ATH11K_TX_RING_MASK_2 , -}; - -const u8 rx_mon_status_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -0 ,0 ,0 ,0 , -ATH11K_RX_MON_STATUS_RING_MASK_0 , -ATH11K_RX_MON_STATUS_RING_MASK_1 , -ATH11K_RX_MON_STATUS_RING_MASK_2 , -}; - -const u8 ath11k_rx_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -0 ,0 ,0 ,0 ,0 ,0 ,0 , -ATH11K_RX_RING_MASK_0 , -ATH11K_RX_RING_MASK_1 , -ATH11K_RX_RING_MASK_2 , -ATH11K_RX_RING_MASK_3 , -}; - -const u8 ath11k_rx_err_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -ATH11K_RX_ERR_RING_MASK_0 , -}; - -const u8 ath11k_rx_wbm_rel_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -ATH11K_RX_WBM_REL_RING_MASK_0 , -}; - -const u8 ath11k_reo_status_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -ATH11K_REO_STATUS_RING_MASK_0 , -}; - -const u8 ath11k_rxdma2host_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -ATH11K_RXDMA2HOST_RING_MASK_0 , -ATH11K_RXDMA2HOST_RING_MASK_1 , -ATH11K_RXDMA2HOST_RING_MASK_2 , -}; - -const u8 ath11k_host2rxdma_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ] = { -ATH11K_HOST2RXDMA_RING_MASK_0 , -ATH11K_HOST2RXDMA_RING_MASK_1 , -ATH11K_HOST2RXDMA_RING_MASK_2 , -}; -/* enum ext_irq_num - irq numbers that can be used by external modules * like datapath */
@@ -750,39 +678,39 @@ static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab) ath11k_ahb_ext_grp_napi_poll, NAPI_POLL_WEIGHT);for (j =0 ; j <ATH11K_EXT_IRQ_NUM_MAX ; j++) { -if (ath11k_tx_ring_mask[i] &BIT (j)) { +if (ab->hw_params.ring_mask->tx[i] &BIT (j)) { irq_grp->irqs[num_irq++] = wbm2host_tx_completions_ring1 - j; } -if (ath11k_rx_ring_mask[i] &BIT (j)) { +if (ab->hw_params.ring_mask->rx[i] &BIT (j)) { irq_grp->irqs[num_irq++] = reo2host_destination_ring1 - j; } -if (ath11k_rx_err_ring_mask[i] &BIT (j)) +if (ab->hw_params.ring_mask->rx_err[i] &BIT (j)) irq_grp->irqs[num_irq++] = reo2host_exception; -if (ath11k_rx_wbm_rel_ring_mask[i] &BIT (j)) +if (ab->hw_params.ring_mask->rx_wbm_rel[i] &BIT (j)) irq_grp->irqs[num_irq++] = wbm2host_rx_release; -if (ath11k_reo_status_ring_mask[i] &BIT (j)) +if (ab->hw_params.ring_mask->reo_status[i] &BIT (j)) irq_grp->irqs[num_irq++] = reo2host_status;if (j < ab->hw_params.max_radios) { -if (ath11k_rxdma2host_ring_mask[i] &BIT (j)) { +if (ab->hw_params.ring_mask->rxdma2host[i] &BIT (j)) { irq_grp->irqs[num_irq++] = rxdma2host_destination_ring_mac1 -ath11k_hw_get_mac_from_pdev_id (hw, j); } -if (ath11k_host2rxdma_ring_mask[i] &BIT (j)) { +if (ab->hw_params.ring_mask->host2rxdma[i] &BIT (j)) { irq_grp->irqs[num_irq++] = host2rxdma_host_buf_ring_mac1 -ath11k_hw_get_mac_from_pdev_id (hw, j); } -if (rx_mon_status_ring_mask[i] &BIT (j)) { +if (ab->hw_params.ring_mask->rx_mon_status[i] &BIT (j)) { irq_grp->irqs[num_irq++] = ppdu_end_interrupts_mac1 -ath11k_hw_get_mac_from_pdev_id (hw, j);
drivers/net/wireless/ath/ath11k/core.c +2 -0
@@ -29,6 +29,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .max_radios = 3, .bdf_addr = 0x4B0C0000, .hw_ops = &ipq8074_ops, + .ring_mask = &ath11k_hw_ring_mask_ipq8074, }, { .name = "qca6390 hw2.0",
@@ -41,6 +42,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { .max_radios = 3, .bdf_addr = 0x4B0C0000, .hw_ops = &qca6390_ops, + .ring_mask = &ath11k_hw_ring_mask_ipq8074, }, };
drivers/net/wireless/ath/ath11k/core.h +0 -10
@@ -102,18 +102,8 @@ enum ath11k_firmware_mode { };#define ATH11K_IRQ_NUM_MAX 52 -#define ATH11K_EXT_IRQ_GRP_NUM_MAX 11#define ATH11K_EXT_IRQ_NUM_MAX 16 -extern const u8 ath11k_reo_status_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 ath11k_tx_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 ath11k_rx_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 ath11k_rx_err_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 ath11k_rx_wbm_rel_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 ath11k_rxdma2host_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 ath11k_host2rxdma_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -extern const u8 rx_mon_status_ring_mask[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; -struct ath11k_ext_irq_grp {struct ath11k_base *ab;u32 irqs[ATH11K_EXT_IRQ_NUM_MAX ];
drivers/net/wireless/ath/ath11k/dp.c +11 -11
@@ -625,13 +625,13 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,int i =0 ;int tot_work_done =0 ; -while (ath11k_tx_ring_mask[grp_id] >> i) { -if (ath11k_tx_ring_mask[grp_id] &BIT (i)) +while (ab->hw_params.ring_mask->tx[grp_id] >> i) { +if (ab->hw_params.ring_mask->tx[grp_id] &BIT (i))ath11k_dp_tx_completion_handler (ab, i); i++; } -if (ath11k_rx_err_ring_mask[grp_id]) { +if (ab->hw_params.ring_mask->rx_err[grp_id]) { work_done =ath11k_dp_process_rx_err (ab, napi, budget); budget -= work_done; tot_work_done += work_done;
@@ -639,7 +639,7 @@ int ath11k_dp_service_srng(struct ath11k_base *ab, goto done; } -if (ath11k_rx_wbm_rel_ring_mask[grp_id]) { +if (ab->hw_params.ring_mask->rx_wbm_rel[grp_id]) { work_done =ath11k_dp_rx_process_wbm_err (ab, napi, budget);
@@ -650,8 +650,8 @@ int ath11k_dp_service_srng(struct ath11k_base *ab, goto done; } -if (ath11k_rx_ring_mask[grp_id]) { - i =fls (ath11k_rx_ring_mask[grp_id]) -1 ; +if (ab->hw_params.ring_mask->rx[grp_id]) { + i =fls (ab->hw_params.ring_mask->rx[grp_id]) -1 ; work_done =ath11k_dp_process_rx (ab, i, napi, budget); budget -= work_done;
@@ -660,9 +660,9 @@ int ath11k_dp_service_srng(struct ath11k_base *ab, goto done; } -if (rx_mon_status_ring_mask[grp_id]) { +if (ab->hw_params.ring_mask->rx_mon_status[grp_id]) {for (i =0 ; i < ab->num_radios; i++) { -if (rx_mon_status_ring_mask[grp_id] &BIT (i)) { +if (ab->hw_params.ring_mask->rx_mon_status[grp_id] &BIT (i)) { work_done = ath11k_dp_rx_process_mon_rings(ab, i, napi,
@@ -675,11 +675,11 @@ int ath11k_dp_service_srng(struct ath11k_base *ab, } } -if (ath11k_reo_status_ring_mask[grp_id]) +if (ab->hw_params.ring_mask->reo_status[grp_id])ath11k_dp_process_reo_status (ab);for (i =0 ; i < ab->num_radios; i++) { -if (ath11k_rxdma2host_ring_mask[grp_id] &BIT (i)) { +if (ab->hw_params.ring_mask->rxdma2host[grp_id] &BIT (i)) { work_done =ath11k_dp_process_rxdma_err (ab, i, budget); budget -= work_done; tot_work_done += work_done;
@@ -688,7 +688,7 @@ int ath11k_dp_service_srng(struct ath11k_base *ab,if (budget <=0 ) goto done; -if (ath11k_host2rxdma_ring_mask[grp_id] &BIT (i)) { +if (ab->hw_params.ring_mask->host2rxdma[grp_id] &BIT (i)) {struct ath11k_pdev_dp *dp = &ab->pdevs[i].ar->dp;struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring;
drivers/net/wireless/ath/ath11k/hw.c +68 -0
71 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/hw.h +17 -0
@@ -99,6 +99,19 @@ enum ath11k_bus { ATH11K_BUS_PCI, }; +#define ATH11K_EXT_IRQ_GRP_NUM_MAX 11 + +struct ath11k_hw_ring_mask { +u8 tx[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 rx_mon_status[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 rx[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 rx_err[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 rx_wbm_rel[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 reo_status[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 rxdma2host[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +u8 host2rxdma[ATH11K_EXT_IRQ_GRP_NUM_MAX ]; +}; +struct ath11k_hw_ops {u8 (*get_hw_mac_from_pdev_id)(int pdev_id); };
@@ -116,12 +129,16 @@ struct ath11k_hw_params { } fw;const struct ath11k_hw_ops *hw_ops; + +const struct ath11k_hw_ring_mask *ring_mask; };extern const struct ath11k_hw_ops ipq8074_ops;extern const struct ath11k_hw_ops ipq6018_ops;extern const struct ath11k_hw_ops qca6390_ops; +extern const struct ath11k_hw_ring_mask ath11k_hw_ring_mask_ipq8074; +static inline int ath11k_hw_get_mac_from_pdev_id (struct ath11k_hw_params *hw,int pdev_idx)
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 4/10 ath11k: add simple PCI client driver for QCA6390 chipset
In reply to Kalle ValoFrom: Govind Singh <[email protected]>
QCA6390 is a PCI based 11ax chipset, split AHB into own kernel module ath11k_ahb.ko and add ath11k_pci.ko for PCI devices.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/Kconfig | 12 +++++ drivers/net/wireless/ath/ath11k/Makefile | 7 ++- drivers/net/wireless/ath/ath11k/ahb.c | 2 +- drivers/net/wireless/ath/ath11k/ce.c | 2 + drivers/net/wireless/ath/ath11k/core.c | 7 +++ drivers/net/wireless/ath/ath11k/debug.c | 5 ++ drivers/net/wireless/ath/ath11k/dp.c | 1 + drivers/net/wireless/ath/ath11k/hal.c | 1 + drivers/net/wireless/ath/ath11k/hif.h | 4 ++ drivers/net/wireless/ath/ath11k/pci.c | 88 ++++++++++++++++++++++++++++++++ 10 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 drivers/net/wireless/ath/ath11k/pci.c
drivers/net/wireless/ath/ath11k/Kconfig +12 -0
@@ -12,6 +12,18 @@ config ATH11K If you choose to build a module, it'll be called ath11k. +config ATH11K_AHB + tristate "Atheros ath11k AHB support" + depends on ATH11K + help + This module adds support for AHB bus + +config ATH11K_PCI + tristate "Atheros ath11k PCI support" + depends on ATH11K && PCI + help + This module adds support for PCIE bus + config ATH11K_DEBUG bool "QCA ath11k debugging" depends on ATH11K
drivers/net/wireless/ath/ath11k/Makefile +6 -1
@@ -4,7 +4,6 @@ ath11k-y += core.o \ hal.o \ hal_tx.o \ hal_rx.o \ - ahb.o \ wmi.o \ mac.o \ reg.o \
@@ -25,5 +24,11 @@ ath11k-$(CONFIG_ATH11K_TRACING) += trace.o ath11k-$(CONFIG_THERMAL) += thermal.o ath11k-$(CONFIG_ATH11K_SPECTRAL) += spectral.o +obj-$(CONFIG_ATH11K_AHB) += ath11k_ahb.o +ath11k_ahb-y += ahb.o + +obj-$(CONFIG_ATH11K_PCI) += ath11k_pci.o +ath11k_pci-y += pci.o + # for tracing framework to find trace.h CFLAGS_trace.o := -I$(src)
drivers/net/wireless/ath/ath11k/ahb.c +1 -1
@@ -952,5 +952,5 @@ static void ath11k_ahb_exit(void) }module_exit (ath11k_ahb_exit); -MODULE_DESCRIPTION ("Driver support for Qualcomm Technologies 802.11ax wireless chip" ); +MODULE_DESCRIPTION ("Driver support for Qualcomm Technologies 802.11ax WLAN AHB devices" );MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/ath/ath11k/ce.c +2 -0
@@ -752,6 +752,7 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab) } } } +EXPORT_SYMBOL (ath11k_ce_free_pipes);int ath11k_ce_alloc_pipes (struct ath11k_base *ab) {
@@ -806,3 +807,4 @@ int ath11k_ce_get_attr_flags(int ce_id)return host_ce_config_wlan[ce_id].flags; } +EXPORT_SYMBOL (ath11k_ce_get_attr_flags);
drivers/net/wireless/ath/ath11k/core.c +7 -0
@@ -14,6 +14,7 @@#include "hif.h" unsigned int ath11k_debug_mask; +EXPORT_SYMBOL (ath11k_debug_mask);module_param_named (debug_mask, ath11k_debug_mask, uint,0644 );MODULE_PARM_DESC (debug_mask,"Debugging mask" );
@@ -788,11 +789,13 @@ void ath11k_core_deinit(struct ath11k_base *ab)ath11k_mac_destroy (ab);ath11k_core_soc_destroy (ab); } +EXPORT_SYMBOL (ath11k_core_deinit);void ath11k_core_free (struct ath11k_base *ab) {kfree (ab); } +EXPORT_SYMBOL (ath11k_core_free);struct ath11k_base *ath11k_core_alloc (struct device *dev,size_t priv_size,enum ath11k_bus bus)
@@ -825,3 +828,7 @@ struct ath11k_base *ath11k_core_alloc(struct device *dev, size_t priv_size,kfree (ab);return NULL ; } +EXPORT_SYMBOL (ath11k_core_alloc); + +MODULE_DESCRIPTION ("Core module for Qualcomm Atheros 802.11ax wireless LAN cards." ); +MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/ath/ath11k/debug.c +5 -0
@@ -62,6 +62,7 @@ void ath11k_info(struct ath11k_base *ab, const char *fmt, ...)/* TODO: Trace the log */ va_end (args); } +EXPORT_SYMBOL (ath11k_info);void ath11k_err (struct ath11k_base *ab,const char *fmt, ...) {
@@ -76,6 +77,7 @@ void ath11k_err(struct ath11k_base *ab, const char *fmt, ...)/* TODO: Trace the log */ va_end (args); } +EXPORT_SYMBOL (ath11k_err);void ath11k_warn (struct ath11k_base *ab,const char *fmt, ...) {
@@ -90,6 +92,7 @@ void ath11k_warn(struct ath11k_base *ab, const char *fmt, ...)/* TODO: Trace the log */ va_end (args); } +EXPORT_SYMBOL (ath11k_warn);#ifdef CONFIG_ATH11K_DEBUG void __ath11k_dbg(struct ath11k_base *ab, enum ath11k_debug_mask mask,
@@ -110,6 +113,7 @@ void __ath11k_dbg(struct ath11k_base *ab, enum ath11k_debug_mask mask,va_end (args); } +EXPORT_SYMBOL (__ath11k_dbg); void ath11k_dbg_dump(struct ath11k_base *ab, enum ath11k_debug_mask mask,
@@ -138,6 +142,7 @@ void ath11k_dbg_dump(struct ath11k_base *ab, } } } +EXPORT_SYMBOL (ath11k_dbg_dump);#endif
drivers/net/wireless/ath/ath11k/dp.c +1 -0
@@ -7,6 +7,7 @@#include "core.h" #include "dp_tx.h" #include "hal_tx.h" +#include "hif.h" #include "debug.h" #include "dp_rx.h" #include "peer.h"
drivers/net/wireless/ath/ath11k/hal.c +1 -0
@@ -1133,6 +1133,7 @@ void ath11k_hal_srng_deinit(struct ath11k_base *ab)ath11k_hal_free_cont_rdp (ab);ath11k_hal_free_cont_wrp (ab); } +EXPORT_SYMBOL (ath11k_hal_srng_deinit);void ath11k_hal_dump_srng_stats (struct ath11k_base *ab) {
drivers/net/wireless/ath/ath11k/hif.h +4 -0
@@ -3,6 +3,9 @@* Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. */ +#ifndef _HIF_H_ +#define _HIF_H_ +#include "core.h" struct ath11k_hif_ops {
@@ -63,3 +66,4 @@ static inline int ath11k_hif_map_service_to_pipe(struct ath11k_base *sc, u16 ser {return sc->hif.ops->map_service_to_pipe (sc, service_id, ul_pipe, dl_pipe); } +#endif /* _HIF_H_ */
drivers/net/wireless/ath/ath11k/pci.c new file +88 -0
88 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 5/10 ath11k: pci: setup resources
In reply to Kalle ValoFrom: Govind Singh <[email protected]>
Add support for setting up pci region and dma mask.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/pci.c | 106 +++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath11k/pci.h | 17 ++++++ 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 drivers/net/wireless/ath/ath11k/pci.h
drivers/net/wireless/ath/ath11k/pci.c +105 -1
@@ -6,9 +6,13 @@#include <linux/module.h> #include <linux/pci.h> +#include "pci.h" #include "core.h" #include "debug.h" +#define ATH11K_PCI_BAR_NUM 0 +#define ATH11K_PCI_DMA_MASK 32 +#define QCA6390_DEVICE_ID 0x1101static const struct pci_device_id ath11k_pci_id_table[] = {
@@ -18,11 +22,95 @@ static const struct pci_device_id ath11k_pci_id_table[] = {MODULE_DEVICE_TABLE (pci, ath11k_pci_id_table); +static int ath11k_pci_claim (struct ath11k_pci *ab_pci,struct pci_dev *pdev) +{ +struct ath11k_base *ab = ab_pci->ab; +u16 device_id; +int ret =0 ; + +pci_read_config_word (pdev,PCI_DEVICE_ID , &device_id); +if (device_id != ab_pci->dev_id) { +ath11k_err (ab,"pci device id mismatch: 0x%x 0x%x\n" , + device_id, ab_pci->dev_id); + ret = -EIO ; + goto out; + } + + ret =pci_assign_resource (pdev,ATH11K_PCI_BAR_NUM ); +if (ret) { +ath11k_err (ab,"failed to assign pci resource: %d\n" , ret); + goto out; + } + + ret =pci_enable_device (pdev); +if (ret) { +ath11k_err (ab,"failed to enable pci device: %d\n" , ret); + goto out; + } + + ret =pci_request_region (pdev,ATH11K_PCI_BAR_NUM ,"ath11k_pci" ); +if (ret) { +ath11k_err (ab,"failed to request pci region: %d\n" , ret); + goto disable_device; + } + + ret =pci_set_dma_mask (pdev,DMA_BIT_MASK (ATH11K_PCI_DMA_MASK )); +if (ret) { +ath11k_err (ab,"failed to set pci dma mask to %d: %d\n" , +ATH11K_PCI_DMA_MASK , ret); + goto release_region; + } + + ret =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (ATH11K_PCI_DMA_MASK )); +if (ret) { +ath11k_err (ab,"failed to set pci consistent dma mask to %d: %d\n" , +ATH11K_PCI_DMA_MASK , ret); + goto release_region; + } + +pci_set_master (pdev); + + ab->mem_len =pci_resource_len (pdev,ATH11K_PCI_BAR_NUM ); + ab->mem =pci_iomap (pdev,ATH11K_PCI_BAR_NUM ,0 ); +if (!ab->mem) { +ath11k_err (ab,"failed to map pci bar %d\n" ,ATH11K_PCI_BAR_NUM ); + ret = -EIO ; + goto clear_master; + } + +ath11k_dbg (ab,ATH11K_DBG_BOOT ,"boot pci_mem 0x%pK\n" , ab->mem); +return 0 ; + +clear_master: +pci_clear_master (pdev); +release_region: +pci_release_region (pdev,ATH11K_PCI_BAR_NUM ); +disable_device: +pci_disable_device (pdev); +out: +return ret; +} + +static void ath11k_pci_free_region (struct ath11k_pci *ab_pci) +{ +struct ath11k_base *ab = ab_pci->ab; +struct pci_dev *pci_dev = ab_pci->pdev; + +pci_iounmap (pci_dev, ab->mem); + ab->mem =NULL ; +pci_clear_master (pci_dev); +pci_release_region (pci_dev,ATH11K_PCI_BAR_NUM ); +if (pci_is_enabled (pci_dev)) +pci_disable_device (pci_dev); +} +static int ath11k_pci_probe (struct pci_dev *pdev,const struct pci_device_id *pci_dev) {struct ath11k_base *ab; +struct ath11k_pci *ab_pci;enum ath11k_hw_rev hw_rev; +int ret;dev_warn (&pdev->dev,"WARNING: ath11k PCI support is experimental!\n" );
@@ -36,7 +124,7 @@ static int ath11k_pci_probe(struct pci_dev *pdev,return -ENOTSUPP ; } - ab =ath11k_core_alloc (&pdev->dev,0 ,ATH11K_BUS_PCI ); + ab =ath11k_core_alloc (&pdev->dev,sizeof (*ab_pci),ATH11K_BUS_PCI );if (!ab) {dev_err (&pdev->dev,"failed to allocate ath11k base\n" );return -ENOMEM ;
@@ -45,15 +133,31 @@ static int ath11k_pci_probe(struct pci_dev *pdev, ab->dev = &pdev->dev; ab->hw_rev = hw_rev;pci_set_drvdata (pdev, ab); + ab_pci =ath11k_pci_priv (ab); + ab_pci->dev_id = pci_dev->device; + ab_pci->ab = ab; +pci_set_drvdata (pdev, ab); + + ret =ath11k_pci_claim (ab_pci, pdev); +if (ret) { +ath11k_err (ab,"failed to claim device: %d\n" , ret); + goto err_free_core; + }return 0 ; + +err_free_core: +ath11k_core_free (ab); +return ret; }static void ath11k_pci_remove (struct pci_dev *pdev) {struct ath11k_base *ab =pci_get_drvdata (pdev); +struct ath11k_pci *ab_pci =ath11k_pci_priv (ab);set_bit (ATH11K_FLAG_UNREGISTERING , &ab->dev_flags); +ath11k_pci_free_region (ab_pci);ath11k_core_free (ab); }
drivers/net/wireless/ath/ath11k/pci.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause-Clear */ +/* +* Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +*/ + +#include "core.h" + +struct ath11k_pci { +struct pci_dev *pdev; +struct ath11k_base *ab; +u16 dev_id; +}; + +static inline struct ath11k_pci *ath11k_pci_priv (struct ath11k_base *ab) +{ +return (struct ath11k_pci *)ab->drv_priv; +}
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 6/10 ath11k: pci: add MSI config initialisation
In reply to Kalle ValoFrom: Govind Singh <[email protected]>
QCA6390 uses PCI MSI for CE/MHI/DP interrupt. Add MSI vector mapping and MSI enable/disable operations.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/debug.h | 1 + drivers/net/wireless/ath/ath11k/pci.c | 69 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/pci.h | 13 +++++++ 3 files changed, 83 insertions(+)
drivers/net/wireless/ath/ath11k/debug.h +1 -0
@@ -25,6 +25,7 @@ enum ath11k_debug_mask {ATH11K_DBG_REG =0x00000200 ,ATH11K_DBG_TESTMODE =0x00000400 , ATH11k_DBG_HAL =0x00000800 , +ATH11K_DBG_PCI =0x00001000 , ATH11K_DBG_ANY = 0xffffffff, };
drivers/net/wireless/ath/ath11k/pci.c +69 -0
103 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/pci.h +13 -0
@@ -5,10 +5,23 @@#include "core.h" +struct ath11k_msi_user { +char *name; +int num_vectors; +u32 base_vector; +}; + +struct ath11k_msi_config { +int total_vectors; +int total_users; +struct ath11k_msi_user *users; +}; +struct ath11k_pci {struct pci_dev *pdev;struct ath11k_base *ab;u16 dev_id; +u32 msi_ep_base_data; };static inline struct ath11k_pci *ath11k_pci_priv (struct ath11k_base *ab)
Signature · 1 line
2.7.4
PATCH 7/10 ath11k: implement ath11k_core_pre_init()
In reply to Kalle ValoThis is needed to initialise hw_params before MHI registration starts. MHI needs location of firmware directory and that's delivered via hw_params.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ahb.c | 4 ++++ drivers/net/wireless/ath/ath11k/core.c | 20 ++++++++++++++------ drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/pci.c | 7 +++++++ 4 files changed, 26 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +4 -0
@@ -868,6 +868,10 @@ static int ath11k_ahb_probe(struct platform_device *pdev) ab->mem_len =resource_size (mem_res);platform_set_drvdata (pdev, ab); + ret =ath11k_core_pre_init (ab); +if (ret) + goto err_core_free; + ret =ath11k_hal_srng_init (ab);if (ret) goto err_core_free;
drivers/net/wireless/ath/ath11k/core.c +14 -6
@@ -742,6 +742,20 @@ static int ath11k_init_hw_params(struct ath11k_base *ab)return 0 ; } +int ath11k_core_pre_init (struct ath11k_base *ab) +{ +int ret; + + ret =ath11k_init_hw_params (ab); +if (ret) { +ath11k_err (ab,"failed to get hw params: %d\n" , ret); +return ret; + } + +return 0 ; +} +EXPORT_SYMBOL (ath11k_core_pre_init); +int ath11k_core_init (struct ath11k_base *ab) {struct device *dev = ab->dev;
@@ -761,12 +775,6 @@ int ath11k_core_init(struct ath11k_base *ab) } ab->tgt_rproc = prproc; - ret =ath11k_init_hw_params (ab); -if (ret) { -ath11k_err (ab,"failed to get hw params %d\n" , ret); -return ret; - } - ret =ath11k_core_soc_create (ab);if (ret) {ath11k_err (ab,"failed to create soc core: %d\n" , ret);
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -841,6 +841,7 @@ struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab, const u8 *addr);struct ath11k_peer *ath11k_peer_find_by_id (struct ath11k_base *ab,int peer_id);int ath11k_core_qmi_firmware_ready (struct ath11k_base *ab); +int ath11k_core_pre_init (struct ath11k_base *ab);int ath11k_core_init (struct ath11k_base *ath11k);void ath11k_core_deinit (struct ath11k_base *ath11k); struct ath11k_base *ath11k_core_alloc(struct device *dev, size_t priv_size,
drivers/net/wireless/ath/ath11k/pci.c +7 -0
@@ -208,8 +208,15 @@ static int ath11k_pci_probe(struct pci_dev *pdev, goto err_pci_free_region; } + ret =ath11k_core_pre_init (ab); +if (ret) + goto err_pci_disable_msi; +return 0 ; +err_pci_disable_msi: +ath11k_pci_disable_msi (ab_pci); + err_pci_free_region:ath11k_pci_free_region (ab_pci);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 8/10 ath11k: register MHI controller device for QCA6390
In reply to Kalle ValoFrom: Govind Singh <[email protected]>
Modem Host Interface (MHI) is a communication protocol to communicate with external Qualcomm modems and Wi-Fi chipsets over high speed peripheral buses. Even though MHI doesn’t dictate underlying physical layer, protocol and MHI stack is structured for PCI based devices.
Register directly with MHI subsystem as a MHI device driver for firmware download to QCA6390.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/Kconfig | 3 + drivers/net/wireless/ath/ath11k/Makefile | 2 +- drivers/net/wireless/ath/ath11k/hw.h | 1 + drivers/net/wireless/ath/ath11k/mhi.c | 423 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/mhi.h | 28 ++ drivers/net/wireless/ath/ath11k/pci.c | 77 ++++++ drivers/net/wireless/ath/ath11k/pci.h | 14 + 7 files changed, 547 insertions(+), 1 deletion(-) create mode 100644 drivers/net/wireless/ath/ath11k/mhi.c create mode 100644 drivers/net/wireless/ath/ath11k/mhi.h
drivers/net/wireless/ath/ath11k/Kconfig +3 -0
@@ -21,6 +21,9 @@ config ATH11K_AHB config ATH11K_PCI tristate "Atheros ath11k PCI support" depends on ATH11K && PCI + select MHI_BUS + select QRTR + select QRTR_MHI help This module adds support for PCIE bus
drivers/net/wireless/ath/ath11k/Makefile +1 -1
@@ -28,7 +28,7 @@ obj-$(CONFIG_ATH11K_AHB) += ath11k_ahb.o ath11k_ahb-y += ahb.o obj-$(CONFIG_ATH11K_PCI) += ath11k_pci.o -ath11k_pci-y += pci.o +ath11k_pci-y += mhi.o pci.o # for tracing framework to find trace.h CFLAGS_trace.o := -I$(src)
drivers/net/wireless/ath/ath11k/hw.h +1 -0
@@ -72,6 +72,7 @@#define ATH11K_BOARD_API2_FILE "board-2.bin"#define ATH11K_DEFAULT_BOARD_FILE "board.bin"#define ATH11K_DEFAULT_CAL_FILE "caldata.bin" +#define ATH11K_AMSS_FILE "amss.bin"enum ath11k_hw_rate_cck {ATH11K_HW_RATE_CCK_LP_11M =0 ,
drivers/net/wireless/ath/ath11k/mhi.c new file +423 -0
423 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/mhi.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: BSD-3-Clause-Clear */ +/* +* Copyright (c) 2020 The Linux Foundation. All rights reserved. +*/ +#ifndef _ATH11K_MHI_H +#define _ATH11K_MHI_H + +#include "pci.h" + +enum ath11k_mhi_state { +ATH11K_MHI_INIT , +ATH11K_MHI_DEINIT , +ATH11K_MHI_POWER_ON , +ATH11K_MHI_POWER_OFF , +ATH11K_MHI_FORCE_POWER_OFF , +ATH11K_MHI_SUSPEND , +ATH11K_MHI_RESUME , +ATH11K_MHI_TRIGGER_RDDM , +ATH11K_MHI_RDDM , +ATH11K_MHI_RDDM_DONE , +}; + +int ath11k_mhi_start (struct ath11k_pci *ar_pci); +void ath11k_mhi_stop (struct ath11k_pci *ar_pci); +int ath11k_mhi_register (struct ath11k_pci *ar_pci); +void ath11k_mhi_unregister (struct ath11k_pci *ar_pci); + +#endif
drivers/net/wireless/ath/ath11k/pci.c +77 -0
117 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/pci.h +14 -0
@@ -2,6 +2,10 @@/* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. */ +#ifndef _ATH11K_PCI_H +#define _ATH11K_PCI_H + +#include <linux/mhi.h> #include "core.h"
@@ -21,10 +25,20 @@ struct ath11k_pci {struct pci_dev *pdev;struct ath11k_base *ab;u16 dev_id; +char amss_path[100 ];u32 msi_ep_base_data; +struct mhi_controller *mhi_ctrl; + unsigned long mhi_state; };static inline struct ath11k_pci *ath11k_pci_priv (struct ath11k_base *ab) {return (struct ath11k_pci *)ab->drv_priv; } + +int ath11k_pci_get_user_msi_assignment (struct ath11k_pci *ar_pci,char *user_name, +int *num_vectors,u32 *user_base_data, +u32 *base_vector); +int ath11k_pci_get_msi_irq (struct device *dev,unsigned int vector); + +#endif
Signature · 1 line
2.7.4
PATCH 9/10 ath11k: pci: add HAL, CE and core initialisation
In reply to Kalle ValoFrom: Govind Singh <[email protected]>
Define CE pipe/qmi config and setup pci irq for the same. Call ath11k_core_init().
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/ce.c | 2 + drivers/net/wireless/ath/ath11k/core.c | 1 + drivers/net/wireless/ath/ath11k/hal.c | 1 + drivers/net/wireless/ath/ath11k/pci.c | 390 ++++++++++++++++++++++++++++++++- 4 files changed, 393 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/ce.c +2 -0
@@ -619,6 +619,7 @@ void ath11k_ce_cleanup_pipes(struct ath11k_base *ab)/* NOTE: Should we also clean up tx buffer in all pipes? */ } } +EXPORT_SYMBOL (ath11k_ce_cleanup_pipes);void ath11k_ce_rx_post_buf (struct ath11k_base *ab) {
@@ -780,6 +781,7 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab)return 0 ; } +EXPORT_SYMBOL (ath11k_ce_alloc_pipes);/* For Big Endian Host, Copy Engine byte_swap is enabled * When Copy Engine does byte_swap, need to byte swap again for the
drivers/net/wireless/ath/ath11k/core.c +1 -0
@@ -783,6 +783,7 @@ int ath11k_core_init(struct ath11k_base *ab)return 0 ; } +EXPORT_SYMBOL (ath11k_core_init);void ath11k_core_deinit (struct ath11k_base *ab) {
drivers/net/wireless/ath/ath11k/hal.c +1 -0
@@ -1127,6 +1127,7 @@ int ath11k_hal_srng_init(struct ath11k_base *ab) err_hal:return ret; } +EXPORT_SYMBOL (ath11k_hal_srng_init);void ath11k_hal_srng_deinit (struct ath11k_base *ab) {
drivers/net/wireless/ath/ath11k/pci.c +389 -1
434 lines not on this page · raw message
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 10/10 ath11k: use remoteproc only with AHB devices
In reply to Kalle ValoFrom: Govind Singh <[email protected]>
QCA6390 and other PCI devices use MHI based firmware loading and do not use remoteproc, so enable it only for AHB devices.
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
--- drivers/net/wireless/ath/ath11k/Kconfig | 2 +- drivers/net/wireless/ath/ath11k/ahb.c | 6 +++++- drivers/net/wireless/ath/ath11k/core.c | 29 ++++++++++++++++++++++++++--- drivers/net/wireless/ath/ath11k/core.h | 10 +++++++++- drivers/net/wireless/ath/ath11k/pci.c | 7 ++++++- 5 files changed, 47 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath11k/Kconfig +1 -1
@@ -2,7 +2,6 @@ config ATH11K tristate "Qualcomm Technologies 802.11ax chipset support" depends on MAC80211 && HAS_DMA - depends on REMOTEPROC depends on CRYPTO_MICHAEL_MIC select ATH_COMMON select QCOM_QMI_HELPERS
@@ -15,6 +14,7 @@ config ATH11K config ATH11K_AHB tristate "Atheros ath11k AHB support" depends on ATH11K + depends on REMOTEPROC help This module adds support for AHB bus
drivers/net/wireless/ath/ath11k/ahb.c +5 -1
@@ -25,6 +25,10 @@ static const struct of_device_id ath11k_ahb_of_match[] = {MODULE_DEVICE_TABLE (of, ath11k_ahb_of_match); +static const struct ath11k_bus_params ath11k_ahb_bus_params = { + .mhi_support = false, +}; +/* Target firmware's Copy Engine configuration. */ static const struct ce_pipe_config target_ce_config_wlan[] = {/* CE0: host->target HTC control and raw streams */
@@ -855,7 +859,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev)return ret; } - ab =ath11k_core_alloc (&pdev->dev,0 ,ATH11K_BUS_AHB ); + ab =ath11k_core_alloc (&pdev->dev,0 ,ATH11K_BUS_AHB , &ath11k_ahb_bus_params);if (!ab) {dev_err (&pdev->dev,"failed to allocate ath11k base\n" );return -ENOMEM ;
drivers/net/wireless/ath/ath11k/core.c +26 -3
@@ -756,12 +756,14 @@ int ath11k_core_pre_init(struct ath11k_base *ab) }EXPORT_SYMBOL (ath11k_core_pre_init); -int ath11k_core_init (struct ath11k_base *ab) +static int ath11k_core_get_rproc (struct ath11k_base *ab) {struct device *dev = ab->dev;struct rproc *prproc;phandle rproc_phandle; -int ret; + +if (ab->bus_params.mhi_support) +return 0 ;if (of_property_read_u32 (dev->of_node,"qcom,rproc" , &rproc_phandle)) {ath11k_err (ab,"failed to get q6_rproc handle\n" );
@@ -775,6 +777,25 @@ int ath11k_core_init(struct ath11k_base *ab) } ab->tgt_rproc = prproc; +return 0 ; +} + +int ath11k_core_init (struct ath11k_base *ab) +{ +int ret; + + ret =ath11k_core_get_rproc (ab); +if (ret) { +ath11k_err (ab,"failed to get rproc: %d\n" , ret); +return ret; + } + + ret =ath11k_init_hw_params (ab); +if (ret) { +ath11k_err (ab,"failed to get hw params %d\n" , ret); +return ret; + } + ret =ath11k_core_soc_create (ab);if (ret) {ath11k_err (ab,"failed to create soc core: %d\n" , ret);
@@ -807,7 +828,8 @@ void ath11k_core_free(struct ath11k_base *ab)EXPORT_SYMBOL (ath11k_core_free);struct ath11k_base *ath11k_core_alloc (struct device *dev,size_t priv_size, -enum ath11k_bus bus) +enum ath11k_bus bus, +const struct ath11k_bus_params *bus_params) {struct ath11k_base *ab;
@@ -830,6 +852,7 @@ struct ath11k_base *ath11k_core_alloc(struct device *dev, size_t priv_size,INIT_WORK (&ab->restart_work, ath11k_core_restart);timer_setup (&ab->rx_replenish_retry, ath11k_ce_rx_replenish_retry,0 ); ab->dev = dev; + ab->bus_params = *bus_params;return ab;
drivers/net/wireless/ath/ath11k/core.h +9 -1
@@ -580,6 +580,10 @@ struct ath11k_board_data {size_t len; }; +struct ath11k_bus_params { +bool mhi_support; +}; +/* IPQ8074 HW channel counters frequency value in hertz */ #define IPQ8074_CC_FREQ_HERTZ 320000
@@ -668,7 +672,10 @@ struct ath11k_base {u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE ];bool pdevs_macaddr_valid;int bd_api; +struct ath11k_hw_params hw_params; +struct ath11k_bus_params bus_params; +const struct firmware *cal_file;/* Below regd's are protected by ab->data_lock */
@@ -845,7 +852,8 @@ int ath11k_core_pre_init(struct ath11k_base *ab);int ath11k_core_init (struct ath11k_base *ath11k);void ath11k_core_deinit (struct ath11k_base *ath11k);struct ath11k_base *ath11k_core_alloc (struct device *dev,size_t priv_size, -enum ath11k_bus bus); +enum ath11k_bus bus, +const struct ath11k_bus_params *bus_params);void ath11k_core_free (struct ath11k_base *ath11k);int ath11k_core_fetch_bdf (struct ath11k_base *ath11k,struct ath11k_board_data *bd);
drivers/net/wireless/ath/ath11k/pci.c +6 -1
@@ -27,6 +27,10 @@ static const struct pci_device_id ath11k_pci_id_table[] = {MODULE_DEVICE_TABLE (pci, ath11k_pci_id_table); +static const struct ath11k_bus_params ath11k_pci_bus_params = { + .mhi_support = true, +}; +static const struct ath11k_msi_config msi_config = { .total_vectors =32 , .total_users =4 ,
@@ -594,7 +598,8 @@ static int ath11k_pci_probe(struct pci_dev *pdev,return -ENOTSUPP ; } - ab =ath11k_core_alloc (&pdev->dev,sizeof (*ab_pci),ATH11K_BUS_PCI ); + ab =ath11k_core_alloc (&pdev->dev,sizeof (*ab_pci),ATH11K_BUS_PCI , + &ath11k_pci_bus_params);if (!ab) {dev_err (&pdev->dev,"failed to allocate ath11k base\n" );return -ENOMEM ;
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k