From 5312595f75a3a8a8715f862144f45efac9de4b4c Mon Sep 17 00:00:00 2001 From: Hong Shi Date: Wed, 25 Mar 2020 16:12:06 +0800 Subject: [PATCH] qcacmn: enable athdiag access for QCN7605 Currently, athdiag can't work with QCN7605. Thus made below change to make it work: 1. Skip pci address boundary check for QCN7605 as QCA6390. 2. Make QCN7605 access target memory via QMI. Change-Id: Ibfcccb57486c99d78c02e322c4e2ae1a7c8dab81 CRs-Fixed: 2653814 --- hif/src/ath_procfs.c | 6 ++++-- hif/src/pcie/if_pci.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hif/src/ath_procfs.c b/hif/src/ath_procfs.c index ffc5bf54ced6..82baacb1de48 100644 --- a/hif/src/ath_procfs.c +++ b/hif/src/ath_procfs.c @@ -88,7 +88,8 @@ static ssize_t ath_procfs_diag_read(struct file *file, char __user *buf, (tgt_info->target_type == TARGET_TYPE_QCA8074V2) || (tgt_info->target_type == TARGET_TYPE_QCN9000) || (tgt_info->target_type == TARGET_TYPE_QCA5018) || - (tgt_info->target_type == TARGET_TYPE_QCA6018))) || + (tgt_info->target_type == TARGET_TYPE_QCA6018) || + (tgt_info->target_type == TARGET_TYPE_QCN7605))) || (scn->bus_type == QDF_BUS_TYPE_IPCI && (tgt_info->target_type == TARGET_TYPE_QCA6750)) || ((scn->bus_type == QDF_BUS_TYPE_USB) && @@ -170,7 +171,8 @@ static ssize_t ath_procfs_diag_write(struct file *file, (tgt_info->target_type == TARGET_TYPE_QCA8074V2) || (tgt_info->target_type == TARGET_TYPE_QCN9000) || (tgt_info->target_type == TARGET_TYPE_QCA5018) || - (tgt_info->target_type == TARGET_TYPE_QCA6018))) || + (tgt_info->target_type == TARGET_TYPE_QCA6018) || + (tgt_info->target_type == TARGET_TYPE_QCN7605))) || (scn->bus_type == QDF_BUS_TYPE_IPCI && (tgt_info->target_type == TARGET_TYPE_QCA6750)) || ((scn->bus_type == QDF_BUS_TYPE_USB) && diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 92aea885ed8d..68c385035bc1 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -4895,6 +4895,7 @@ int hif_pci_addr_in_boundary(struct hif_softc *scn, uint32_t offset) if (tgt_info->target_type == TARGET_TYPE_QCA6290 || tgt_info->target_type == TARGET_TYPE_QCA6390 || tgt_info->target_type == TARGET_TYPE_QCA6490 || + tgt_info->target_type == TARGET_TYPE_QCN7605 || tgt_info->target_type == TARGET_TYPE_QCA8074) { /* * Need to consider offset's memtype for QCA6290/QCA8074,