package/kernel/mac80211/patches/ath11k/0055-wifi-ath11k-Remove-redundant-pci_clear_master.patch

   1 From f812e2a9f85d6bea78957ccb5197e4491316848b Mon Sep 17 00:00:00 2001
   2 From: Cai Huoqing <cai.huoqing@linux.dev>
   3 Date: Thu, 23 Mar 2023 19:26:09 +0800
   4 Subject: [PATCH] wifi: ath11k: Remove redundant pci_clear_master
   5
   6 Remove pci_clear_master to simplify the code,
   7 the bus-mastering is also cleared in do_pci_disable_device,
   8 like this:
   9 ./drivers/pci/pci.c:2197
  10 static void do_pci_disable_device(struct pci_dev *dev)
  11 {
  12         u16 pci_command;
  13
  14         pci_read_config_word(dev, PCI_COMMAND, &pci_command);
  15         if (pci_command & PCI_COMMAND_MASTER) {
  16                 pci_command &= ~PCI_COMMAND_MASTER;
  17                 pci_write_config_word(dev, PCI_COMMAND, pci_command);
  18         }
  19
  20         pcibios_disable_device(dev);
  21 }.
  22 And dev->is_busmaster is set to 0 in pci_disable_device.
  23
  24 Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
  25 Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
  26 Link: https://lore.kernel.org/r/20230323112613.7550-1-cai.huoqing@linux.dev
  27 ---
  28  drivers/net/wireless/ath/ath11k/pci.c | 5 +----
  29  1 file changed, 1 insertion(+), 4 deletions(-)
  30
  31 --- a/drivers/net/wireless/ath/ath11k/pci.c
  32 +++ b/drivers/net/wireless/ath/ath11k/pci.c
  33 @@ -540,7 +540,7 @@ static int ath11k_pci_claim(struct ath11
  34         if (!ab->mem) {
  35                 ath11k_err(ab, "failed to map pci bar %d\n", ATH11K_PCI_BAR_NUM);
  36                 ret = -EIO;
  37 -               goto clear_master;
  38 +               goto release_region;
  39         }
  40
  41         ab->mem_ce = ab->mem;
  42 @@ -548,8 +548,6 @@ static int ath11k_pci_claim(struct ath11
  43         ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot pci_mem 0x%pK\n", ab->mem);
  44         return 0;
  45
  46 -clear_master:
  47 -       pci_clear_master(pdev);
  48  release_region:
  49         pci_release_region(pdev, ATH11K_PCI_BAR_NUM);
  50  disable_device:
  51 @@ -565,7 +563,6 @@ static void ath11k_pci_free_region(struc
  52
  53         pci_iounmap(pci_dev, ab->mem);
  54         ab->mem = NULL;
  55 -       pci_clear_master(pci_dev);
  56         pci_release_region(pci_dev, ATH11K_PCI_BAR_NUM);
  57         if (pci_is_enabled(pci_dev))
  58                 pci_disable_device(pci_dev);