ath11k: pci: support platforms with one MSI vector
Subsystems (2)
PATCH 1/1 ath11k: pci: support platforms with one MSI vector
From: Carl Huang <[email protected]>
Dell XPS 13 9310 has only one MSI vector available for QCA6390 device and ath11k fails with:
ath11k_pci 0000:56:00.0: failed to get 32 MSI vectors, only -28 available ath11k_pci 0000:56:00.0: failed to enable msi: -28ath11k_pci: probe of 0000:56:00.0 failed with error -28
This is a proof of concept patch for getting ath11k to work with QCA6390 using only one MSI vector, not the final solution. Testing feedback more than welcome. The patch applies to v5.10-rc2.
The idea here is to add a flag to indicate whether this ISR can be called or not as all the ISR handlers are registered with IRQF_SHARED when ath11k can only request 1 vector. This needs to be refined later.
In some scenarios, kernel crashed when the interrupt migration happens, so add IRQF_NOBALANCING.
Also add debug messages to ath11k_qmi_respond_fw_mem_request() for helping to debug mysterious firmware initialisation timeouts:
ath11k_pci 0000:05:00.0: qmi failed memory request, err = -110 ath11k_pci 0000:05:00.0: qmi failed to respond fw mem req:-110
If that happens, one way to workaround the problem is to revert this commit:
7fef431be9c9 mm/page_alloc: place pages to tail in __free_pages_core()
--- drivers/bus/mhi/core/init.c | 4 +- drivers/net/wireless/ath/ath11k/ce.c | 6 +- drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/dp.c | 8 +- drivers/net/wireless/ath/ath11k/hif.h | 1 + drivers/net/wireless/ath/ath11k/mhi.c | 11 +- drivers/net/wireless/ath/ath11k/pci.c | 178 +++++++++++++++++++++++++++------ drivers/net/wireless/ath/ath11k/pci.h | 1 + drivers/net/wireless/ath/ath11k/qmi.c | 4 + 9 files changed, 174 insertions(+), 40 deletions(-)
drivers/bus/mhi/core/init.c +2 -2
@@ -153,7 +153,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)/* Setup BHI_INTVEC IRQ */ ret =request_threaded_irq (mhi_cntrl->irq[0 ], mhi_intvec_handler, mhi_intvec_threaded_handler, -IRQF_SHARED |IRQF_NO_SUSPEND , +IRQF_SHARED |IRQF_NOBALANCING ,"bhi" , mhi_cntrl);if (ret)return ret;
@@ -171,7 +171,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) ret =request_irq (mhi_cntrl->irq[mhi_event->irq], mhi_irq_handler, -IRQF_SHARED |IRQF_NO_SUSPEND , +IRQF_SHARED |IRQF_NOBALANCING ,"mhi" , mhi_event);if (ret) { dev_err(dev, "Error requesting irq:%d for ev:%d\n",
drivers/net/wireless/ath/ath11k/ce.c +4 -2
@@ -459,20 +459,22 @@ static void ath11k_ce_srng_msi_ring_params_setup(struct ath11k_base *ab, u32 ce_u32 msi_irq_start;u32 addr_lo;u32 addr_hi; +u32 vectors_32_capability;int ret; ret =ath11k_get_user_msi_vector (ab,"CE" , &msi_data_count, &msi_data_start, &msi_irq_start); -if (ret)return ; + vectors_32_capability = ab->hif.ops->is_32_vecs_support (ab);ath11k_get_msi_address (ab, &addr_lo, &addr_hi); ring_params->msi_addr = addr_lo; ring_params->msi_addr |= (dma_addr_t)(((uint64_t )addr_hi) <<32 ); - ring_params->msi_data = (ce_id % msi_data_count) + msi_data_start; + ring_params->msi_data = vectors_32_capability ? + (ce_id % msi_data_count) + msi_data_start : msi_data_start; ring_params->flags |=HAL_SRNG_FLAGS_MSI_INTR ; }
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -683,6 +683,7 @@ struct ath11k_base {bool wmi_ready;u32 wlan_init_status;int irq_num[ATH11K_IRQ_NUM_MAX ]; +int irq_enable_flag[ATH11K_IRQ_NUM_MAX ];struct ath11k_ext_irq_grp ext_irq_grp[ATH11K_EXT_IRQ_GRP_NUM_MAX ];struct napi_struct *napi;struct ath11k_targ_cap target_caps;
drivers/net/wireless/ath/ath11k/dp.c +5 -3
@@ -180,13 +180,15 @@ static void ath11k_dp_srng_msi_setup(struct ath11k_base *ab, {int msi_group_number, msi_data_count;u32 msi_data_start, msi_irq_start, addr_lo, addr_hi; -int ret; +u32 vectors_32_capability; +int ret = -EINVAL ; ret =ath11k_get_user_msi_vector (ab,"DP" , &msi_data_count, &msi_data_start, &msi_irq_start);if (ret)return ; + vectors_32_capability = ab->hif.ops->is_32_vecs_support (ab); msi_group_number =ath11k_dp_srng_calculate_msi_group (ab, type, ring_num);
@@ -209,8 +211,8 @@ static void ath11k_dp_srng_msi_setup(struct ath11k_base *ab, ring_params->msi_addr = addr_lo; ring_params->msi_addr |= (dma_addr_t)(((uint64_t )addr_hi) <<32 ); - ring_params->msi_data = (msi_group_number % msi_data_count) - + msi_data_start; + ring_params->msi_data = vectors_32_capability ? + (msi_group_number % msi_data_count) + msi_data_start : msi_data_start; ring_params->flags |=HAL_SRNG_FLAGS_MSI_INTR ; }
drivers/net/wireless/ath/ath11k/hif.h +1 -0
@@ -24,6 +24,7 @@ struct ath11k_hif_ops { u32 *base_vector);void (*get_msi_address)(struct ath11k_base *ab,u32 *msi_addr_lo,u32 *msi_addr_hi); +int (*is_32_vecs_support)(struct ath11k_base *ab); };static inline int ath11k_hif_start (struct ath11k_base *sc)
drivers/net/wireless/ath/ath11k/mhi.c +9 -2
@@ -156,14 +156,17 @@ static int ath11k_mhi_get_msi(struct ath11k_pci *ab_pci) {struct ath11k_base *ab = ab_pci->ab;u32 user_base_data, base_vector; +u32 vectors_32_capability;int ret, num_vectors, i;int *irq; +unsigned int msi_data; ret =ath11k_pci_get_user_msi_assignment (ab_pci,"MHI" , &num_vectors, &user_base_data, &base_vector);if (ret)return ret; + vectors_32_capability = ab_pci->vectors_32_capability;ath11k_dbg (ab,ATH11K_DBG_PCI ,"Number of assigned MSI for MHI is %d, base vector is %d\n" , num_vectors, base_vector);
@@ -172,9 +175,13 @@ static int ath11k_mhi_get_msi(struct ath11k_pci *ab_pci)if (!irq)return -ENOMEM ; -for (i =0 ; i < num_vectors; i++) +for (i =0 ; i < num_vectors; i++) { + msi_data = vectors_32_capability ? + i + base_vector : base_vector; + irq[i] =ath11k_pci_get_msi_irq (ab->dev, - base_vector + i); + msi_data); + } ab_pci->mhi_ctrl->irq = irq; ab_pci->mhi_ctrl->nr_irqs = num_vectors;
drivers/net/wireless/ath/ath11k/pci.c +147 -31
365 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/pci.h +1 -0
@@ -46,6 +46,7 @@ struct ath11k_pci {u16 dev_id;char amss_path[100 ];u32 msi_ep_base_data; +u32 vectors_32_capability;struct mhi_controller *mhi_ctrl;unsigned long mhi_state;u32 register_window;
drivers/net/wireless/ath/ath11k/qmi.c +4 -0
@@ -1675,6 +1675,10 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab) req->mem_seg[i].addr = ab->qmi.target_mem[i].paddr; req->mem_seg[i].size = ab->qmi.target_mem[i].size; req->mem_seg[i].type = ab->qmi.target_mem[i].type; +ath11k_info (ab,"req mem_seg[%d] 0x%llx %u %u\n" , i, + ab->qmi.target_mem[i].paddr, + ab->qmi.target_mem[i].size, + ab->qmi.target_mem[i].type); } }
Signature · 1 line
2.7.4
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Kalle,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.10-rc3 next-20201111]
[cannot apply to ath6kl/ath-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kalle-Valo/ath11k-pci-support-platforms-with-one-MSI-vector/20201112-030041 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git eccc876724927ff3b9ff91f36f7b6b159e948f0c config: m68k-allmodconfig (attached as .config) compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/e2c4c01cee2e8ce50345b8f70f192921a4875e18
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalle-Valo/ath11k-pci-support-platforms-with-one-MSI-vector/20201112-030041 git checkout e2c4c01cee2e8ce50345b8f70f192921a4875e18
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from include/linux/kernel.h:11,
from include/linux/list.h:9,
from include/linux/mutex.h:15,
from drivers/net/wireless/ath/ath11k/qmi.h:9,
from drivers/net/wireless/ath/ath11k/qmi.c:8:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
drivers/net/wireless/ath/ath11k/qmi.c: In function 'ath11k_qmi_respond_fw_mem_request':
>> drivers/net/wireless/ath/ath11k/qmi.c:1678:42: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'dma_addr_t' {aka 'unsigned int'} [-Wformat=]
1678 | ath11k_info(ab, "req mem_seg[%d] 0x%llx %u %u\n", i,
| ~~~^
| |
| long long unsigned int
| %x
1679 | ab->qmi.target_mem[i].paddr,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| dma_addr_t {aka unsigned int}vim +1678 drivers/net/wireless/ath/ath11k/qmi.c
1648
1649 static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)
1650 {
1651 struct qmi_wlanfw_respond_mem_req_msg_v01 *req;
1652 struct qmi_wlanfw_respond_mem_resp_msg_v01 resp;
1653 struct qmi_txn txn = {};
1654 int ret = 0, i;
1655
1656 req = kzalloc(sizeof(*req), GFP_KERNEL);
1657 if (!req)
1658 return -ENOMEM;
1659
1660 memset(&resp, 0, sizeof(resp));
1661
1662 /* For QCA6390 by default FW requests a block of ~4M contiguous
1663 * DMA memory, it's hard to allocate from OS. So host returns
1664 * failure to FW and FW will then request mulitple blocks of small
1665 * chunk size memory.
1666 */
1667 if (!ab->bus_params.fixed_mem_region && ab->qmi.mem_seg_count <= 2) {
1668 ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi delays mem_request %d\n",
1669 ab->qmi.mem_seg_count);
1670 memset(req, 0, sizeof(*req));
1671 } else {
1672 req->mem_seg_len = ab->qmi.mem_seg_count;
1673
1674 for (i = 0; i < req->mem_seg_len ; i++) {
1675 req->mem_seg[i].addr = ab->qmi.target_mem[i].paddr;
1676 req->mem_seg[i].size = ab->qmi.target_mem[i].size;
1677 req->mem_seg[i].type = ab->qmi.target_mem[i].type;
> 1678 ath11k_info(ab, "req mem_seg[%d] 0x%llx %u %u\n", i, 1679 ab->qmi.target_mem[i].paddr, 1680 ab->qmi.target_mem[i].size, 1681 ab->qmi.target_mem[i].type); 1682 } 1683 } 1684 1685 ret = qmi_txn_init(&ab->qmi.handle, &txn, 1686 qmi_wlanfw_respond_mem_resp_msg_v01_ei, &resp); 1687 if (ret < 0) 1688 goto out; 1689 1690 ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, 1691 QMI_WLANFW_RESPOND_MEM_REQ_V01, 1692 QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN, 1693 qmi_wlanfw_respond_mem_req_msg_v01_ei, req);
1694 if (ret < 0) {
1695 ath11k_warn(ab, "qmi failed to respond memory request, err = %d\n",
1696 ret);
1697 goto out;
1698 }
1699
1700 ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS));
1701 if (ret < 0) {
1702 ath11k_warn(ab, "qmi failed memory request, err = %d\n", ret);
1703 goto out;
1704 }
1705
1706 if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
1707 ath11k_warn(ab, "Respond mem req failed, result: %d, err: %d\n",
1708 resp.resp.result, resp.resp.error);
1709 ret = -EINVAL;
1710 goto out;
1711 }
1712 out:
1713 kfree(req);
1714 return ret;
1715 }
1716
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]