ath11k: add 64bit check before reading msi high addr

In QCN9074 ath11k boot, firmware crash is observed in 64-bit
builds and is due to wrong 64 bit MSI address size. This patch
fixes the firmware crash. Read msi high addr if 64-bit addresses
allowed on MSI.

Tested-On: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1.r1-00026-QCAHKSWPL_SILICONZ-2

Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1606199334-18206-1-git-send-email-akolli@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index b75f47dc36deb109ee443f57194ecf4245eda59b..a297e77d6b56c3a3c1f26df367d58503b33a2368 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -264,13 +264,18 @@ int ath11k_pci_get_msi_irq(struct device *dev, unsigned int vector)
 static void ath11k_pci_get_msi_address(struct ath11k_base *ab, u32 *msi_addr_lo,
                                       u32 *msi_addr_hi)
 {
+       struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);
        struct pci_dev *pci_dev = to_pci_dev(ab->dev);
 
        pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_LO,
                              msi_addr_lo);
 
-       pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_HI,
-                             msi_addr_hi);
+       if (test_bit(ATH11K_PCI_FLAG_IS_MSI_64, &ab_pci->flags)) {
+               pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_HI,
+                                     msi_addr_hi);
+       } else {
+               *msi_addr_hi = 0;
+       }
 }
 
 int ath11k_pci_get_user_msi_assignment(struct ath11k_pci *ab_pci, char *user_name,
@@ -658,6 +663,8 @@ static int ath11k_pci_enable_msi(struct ath11k_pci *ab_pci)
        }
 
        ab_pci->msi_ep_base_data = msi_desc->msg.data;
+       if (msi_desc->msi_attrib.is_64)
+               set_bit(ATH11K_PCI_FLAG_IS_MSI_64, &ab_pci->flags);
 
        ath11k_dbg(ab, ATH11K_DBG_PCI, "msi base data is %d\n", ab_pci->msi_ep_base_data);
 

diff --git a/drivers/net/wireless/ath/ath11k/pci.h b/drivers/net/wireless/ath/ath11k/pci.h
index 43562f774a3746f198b037578321962d901bff44..9c503a17c23786ec63a4f3b3b4b2c3a89137753a 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/pci.h
+++ b/drivers/net/wireless/ath/ath11k/pci.h
@@ -38,6 +38,7 @@ struct ath11k_msi_config {
 
 enum ath11k_pci_flags {
        ATH11K_PCI_FLAG_INIT_DONE,
+       ATH11K_PCI_FLAG_IS_MSI_64,
 };
 
 struct ath11k_pci {