1 files changed, 24 insertions, 30 deletions

diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index f9308c2f22e6..64d8a17f8094 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * Test driver to test endpoint functionality
  *
  * Copyright (C) 2017 Texas Instruments
  * Author: Kishon Vijay Abraham I <kishon@ti.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/crc32.h>
@@ -104,7 +93,8 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)
                 goto err;
         }
 
-        ret = pci_epc_map_addr(epc, src_phys_addr, reg->src_addr, reg->size);
+        ret = pci_epc_map_addr(epc, epf->func_no, src_phys_addr, reg->src_addr,
+                               reg->size);
         if (ret) {
                 dev_err(dev, "failed to map source address\n");
                 reg->status = STATUS_SRC_ADDR_INVALID;
@@ -119,7 +109,8 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)
                 goto err_src_map_addr;
         }
 
-        ret = pci_epc_map_addr(epc, dst_phys_addr, reg->dst_addr, reg->size);
+        ret = pci_epc_map_addr(epc, epf->func_no, dst_phys_addr, reg->dst_addr,
+                               reg->size);
         if (ret) {
                 dev_err(dev, "failed to map destination address\n");
                 reg->status = STATUS_DST_ADDR_INVALID;
@@ -128,13 +119,13 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)
 
         memcpy(dst_addr, src_addr, reg->size);
 
-        pci_epc_unmap_addr(epc, dst_phys_addr);
+        pci_epc_unmap_addr(epc, epf->func_no, dst_phys_addr);
 
 err_dst_addr:
         pci_epc_mem_free_addr(epc, dst_phys_addr, dst_addr, reg->size);
 
 err_src_map_addr:
-        pci_epc_unmap_addr(epc, src_phys_addr);
+        pci_epc_unmap_addr(epc, epf->func_no, src_phys_addr);
 
 err_src_addr:
         pci_epc_mem_free_addr(epc, src_phys_addr, src_addr, reg->size);
@@ -164,7 +155,8 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test)
                 goto err;
         }
 
-        ret = pci_epc_map_addr(epc, phys_addr, reg->src_addr, reg->size);
+        ret = pci_epc_map_addr(epc, epf->func_no, phys_addr, reg->src_addr,
+                               reg->size);
         if (ret) {
                 dev_err(dev, "failed to map address\n");
                 reg->status = STATUS_SRC_ADDR_INVALID;
@@ -186,7 +178,7 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test)
         kfree(buf);
 
 err_map_addr:
-        pci_epc_unmap_addr(epc, phys_addr);
+        pci_epc_unmap_addr(epc, epf->func_no, phys_addr);
 
 err_addr:
         pci_epc_mem_free_addr(epc, phys_addr, src_addr, reg->size);
@@ -215,7 +207,8 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test)
                 goto err;
         }
 
-        ret = pci_epc_map_addr(epc, phys_addr, reg->dst_addr, reg->size);
+        ret = pci_epc_map_addr(epc, epf->func_no, phys_addr, reg->dst_addr,
+                               reg->size);
         if (ret) {
                 dev_err(dev, "failed to map address\n");
                 reg->status = STATUS_DST_ADDR_INVALID;
@@ -242,7 +235,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test)
         kfree(buf);
 
 err_map_addr:
-        pci_epc_unmap_addr(epc, phys_addr);
+        pci_epc_unmap_addr(epc, epf->func_no, phys_addr);
 
 err_addr:
         pci_epc_mem_free_addr(epc, phys_addr, dst_addr, reg->size);
@@ -260,11 +253,11 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test, u8 irq)
         struct pci_epf_test_reg *reg = epf_test->reg[test_reg_bar];
 
         reg->status |= STATUS_IRQ_RAISED;
-        msi_count = pci_epc_get_msi(epc);
+        msi_count = pci_epc_get_msi(epc, epf->func_no);
         if (irq > msi_count || msi_count <= 0)
-                pci_epc_raise_irq(epc, PCI_EPC_IRQ_LEGACY, 0);
+                pci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_LEGACY, 0);
         else
-                pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSI, irq);
+                pci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSI, irq);
 }
 
 static void pci_epf_test_cmd_handler(struct work_struct *work)
@@ -291,7 +284,7 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
 
         if (command & COMMAND_RAISE_LEGACY_IRQ) {
                 reg->status = STATUS_IRQ_RAISED;
-                pci_epc_raise_irq(epc, PCI_EPC_IRQ_LEGACY, 0);
+                pci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_LEGACY, 0);
                 goto reset_handler;
         }
 
@@ -326,11 +319,11 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
         }
 
         if (command & COMMAND_RAISE_MSI_IRQ) {
-                msi_count = pci_epc_get_msi(epc);
+                msi_count = pci_epc_get_msi(epc, epf->func_no);
                 if (irq > msi_count || msi_count <= 0)
                         goto reset_handler;
                 reg->status = STATUS_IRQ_RAISED;
-                pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSI, irq);
+                pci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSI, irq);
                 goto reset_handler;
         }
 
@@ -358,7 +351,7 @@ static void pci_epf_test_unbind(struct pci_epf *epf)
         for (bar = BAR_0; bar <= BAR_5; bar++) {
                 if (epf_test->reg[bar]) {
                         pci_epf_free_space(epf, epf_test->reg[bar], bar);
-                        pci_epc_clear_bar(epc, bar);
+                        pci_epc_clear_bar(epc, epf->func_no, bar);
                 }
         }
 }
@@ -380,7 +373,8 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)
 
         for (bar = BAR_0; bar <= BAR_5; bar++) {
                 epf_bar = &epf->bar[bar];
-                ret = pci_epc_set_bar(epc, bar, epf_bar->phys_addr,
+                ret = pci_epc_set_bar(epc, epf->func_no, bar,
+                                      epf_bar->phys_addr,
                                       epf_bar->size, flags);
                 if (ret) {
                         pci_epf_free_space(epf, epf_test->reg[bar], bar);
@@ -433,7 +427,7 @@ static int pci_epf_test_bind(struct pci_epf *epf)
         if (WARN_ON_ONCE(!epc))
                 return -EINVAL;
 
-        ret = pci_epc_write_header(epc, header);
+        ret = pci_epc_write_header(epc, epf->func_no, header);
         if (ret) {
                 dev_err(dev, "configuration header write failed\n");
                 return ret;
@@ -447,7 +441,7 @@ static int pci_epf_test_bind(struct pci_epf *epf)
         if (ret)
                 return ret;
 
-        ret = pci_epc_set_msi(epc, epf->msi_interrupts);
+        ret = pci_epc_set_msi(epc, epf->func_no, epf->msi_interrupts);
         if (ret)
                 return ret;